toolchain/gcc: clean up remaining references to the old linaro version

Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/toolchain/gcc/Config.version b/toolchain/gcc/Config.version
index 47f516d40d9138a0981035c185b62529ee0816a4..30df7235a412bb82a20a92467d0c57280dbbebfb 100644 (file)
--- a/toolchain/gcc/Config.version
+++ b/toolchain/gcc/Config.version
@@ -4,13 +4,12 @@ config GCC_VERSION_4_8_ARC
 
 config GCC_VERSION
        string
-       default "4.8-linaro"    if GCC_VERSION_4_8_LINARO
        default "arc-2016.03"   if GCC_VERSION_4_8_ARC
        default "5.4.0"
 
 config GCC_VERSION_4_8
        bool
-       default y       if (GCC_VERSION_4_8_LINARO || GCC_VERSION_4_8_ARC)
+       default y       if GCC_VERSION_4_8_ARC
 
 config GCC_VERSION_5
        default y if (!TOOLCHAINOPTS && !arc)

diff --git a/toolchain/gcc/common.mk b/toolchain/gcc/common.mk
index 5850f4363cd9efaa54558e20d1b31d7745ef29ec..58566ce8cf7f1f462117507b149cf89d15bcfc77 100644 (file)
--- a/toolchain/gcc/common.mk
+++ b/toolchain/gcc/common.mk
@@ -45,11 +45,7 @@ endif
 PATCH_DIR=../patches/$(GCC_VERSION)
 
 BUGURL=http://www.lede-project.org/bugs/
-ifeq ($(findstring linaro, $(CONFIG_GCC_VERSION)),linaro)
-  PKGVERSION=LEDE/Linaro GCC $(PKG_REV) $(REVISION)
-else
-  PKGVERSION=LEDE GCC $(PKG_VERSION) $(REVISION)
-endif
+PKGVERSION=LEDE GCC $(PKG_VERSION) $(REVISION)
 
 HOST_BUILD_PARALLEL:=1