gcc: add ARM codegen fix from PR 65932

[openwrt/openwrt.git] / toolchain / gcc / Config.in

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 2b11f8714e0dd3d10e208fac224161af495c86eb..8a68056e9acb50121376a005160f9cc227e44c4d 100644 (file)
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -2,21 +2,11 @@
 
 choice
        prompt "GCC compiler Version" if TOOLCHAINOPTS
-       default GCC_USE_VERSION_4_4_7 if avr32
        default GCC_USE_VERSION_4_6_LINARO if TARGET_octeon
        default GCC_USE_VERSION_4_8_LINARO
        help
          Select the version of gcc you wish to use.
 
-       config GCC_USE_VERSION_4_4_7
-               select GCC_VERSION_4_4_7
-               bool "gcc 4.4.7"
-               depends on avr32
-
-       config GCC_USE_VERSION_4_8_0
-               select GCC_VERSION_4_8_0
-               bool "gcc 4.8.0"
-
        config GCC_USE_VERSION_4_6_LINARO
                select GCC_VERSION_4_6_LINARO
                bool "gcc 4.6.x with Linaro enhancements"
@@ -28,6 +18,11 @@ choice
        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"
 
 endchoice
 
@@ -51,7 +46,8 @@ config EXTRA_GCC_CONFIG_OPTIONS
 config SSP_SUPPORT
        bool
        prompt "Enable Stack-Smashing Protection support" if TOOLCHAINOPTS
-       default n
+       depends on !USE_MUSL
+       default y if !USE_MUSL
        help
            Enable Stack-Smashing Protection support