Author: nbd
Date: 2015-09-06 12:07:03 +0200 (Sun, 06 Sep 2015)
New Revision: 46798

Removed:
   trunk/toolchain/gcc/patches/4.9-linaro/
Modified:
   trunk/config/Config-build.in
   trunk/toolchain/gcc/Config.in
   trunk/toolchain/gcc/Config.version
   trunk/toolchain/gcc/common.mk
Log:
gcc: remove version 4.9-linaro

Signed-off-by: Felix Fietkau <[email protected]>

Modified: trunk/config/Config-build.in
===================================================================
--- trunk/config/Config-build.in        2015-09-06 09:57:02 UTC (rev 46797)
+++ trunk/config/Config-build.in        2015-09-06 10:07:03 UTC (rev 46798)
@@ -232,7 +232,7 @@
                config PKG_CC_STACKPROTECTOR_STRONG
                        bool "Strong"
                        select SSP_SUPPORT if !USE_MUSL
-                       depends on GCC_VERSION_4_9_LINARO || GCC_VERSION_5
+                       depends on GCC_VERSION_5
                        depends on KERNEL_CC_STACKPROTECTOR_STRONG
        endchoice
 
@@ -247,7 +247,7 @@
                config KERNEL_CC_STACKPROTECTOR_REGULAR
                        bool "Regular"
                config KERNEL_CC_STACKPROTECTOR_STRONG
-                       depends on GCC_VERSION_4_9_LINARO || GCC_VERSION_5
+                       depends on GCC_VERSION_5
                        bool "Strong"
        endchoice
 

Modified: trunk/toolchain/gcc/Config.in
===================================================================
--- trunk/toolchain/gcc/Config.in       2015-09-06 09:57:02 UTC (rev 46797)
+++ trunk/toolchain/gcc/Config.in       2015-09-06 10:07:03 UTC (rev 46798)
@@ -15,11 +15,6 @@
                select GCC_VERSION_4_8_LINARO
                bool "gcc 4.8.x with Linaro enhancements"
 
-       config GCC_USE_VERSION_4_9_LINARO
-               select GCC_VERSION_4_9_LINARO
-               bool "gcc 4.9.x with Linaro enhancements"
-               depends on BROKEN
-
        config GCC_USE_VERSION_5
                select GCC_VERSION_5
                bool "gcc 5.x"

Modified: trunk/toolchain/gcc/Config.version
===================================================================
--- trunk/toolchain/gcc/Config.version  2015-09-06 09:57:02 UTC (rev 46797)
+++ trunk/toolchain/gcc/Config.version  2015-09-06 10:07:03 UTC (rev 46798)
@@ -6,16 +6,12 @@
        default y if (!TOOLCHAINOPTS && !TARGET_octeon)
        bool
 
-config GCC_VERSION_4_9_LINARO
-       bool
-
 config GCC_VERSION
        string
        default "4.6.3"     if GCC_VERSION_4_6_3
        default "5.2.0"     if GCC_VERSION_5
        default "4.6-linaro"    if GCC_VERSION_4_6_LINARO
        default "4.8-linaro"    if GCC_VERSION_4_8_LINARO
-       default "4.9-linaro"    if GCC_VERSION_4_9_LINARO
        default "4.6-linaro"
 
 config GCC_VERSION_4_6
@@ -26,9 +22,5 @@
        bool
        default y       if GCC_VERSION_4_8_LINARO
 
-config GCC_VERSION_4_9
-       bool
-       default y       if GCC_VERSION_4_9_LINARO
-
 config GCC_VERSION_5
        bool

Modified: trunk/toolchain/gcc/common.mk
===================================================================
--- trunk/toolchain/gcc/common.mk       2015-09-06 09:57:02 UTC (rev 46797)
+++ trunk/toolchain/gcc/common.mk       2015-09-06 10:07:03 UTC (rev 46798)
@@ -41,14 +41,6 @@
       PKG_MD5SUM:=5ba2f3a449b1658ccc09d27cc7ab3c03
       PKG_COMP:=xz
     endif
-    ifeq ($(CONFIG_GCC_VERSION),"4.9-linaro")
-      LINARO_RELEASE:=15.03
-      PKG_REV:=4.9-2015.03
-      PKG_VERSION:=4.9.3
-      PKG_VERSION_MAJOR:=4.9
-      PKG_MD5SUM:=f9d256d120adfbb45dd3e2d22b70cba9
-      PKG_COMP:=xz
-    endif
     ifneq ($(LINARO_RELEASE),)
       
PKG_SOURCE_URL:=http://releases.linaro.org/$(LINARO_RELEASE)/components/toolchain/gcc-linaro/$(PKG_VERSION_MAJOR)
     else
_______________________________________________
openwrt-commits mailing list
[email protected]
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits

Reply via email to