build: fix menuconfig submenu sorting for gcc options

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

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index a54c8d12d36c47d29a7cc236f2dbc88bab635d14..7d7f34210a6d4ee8f5a9f192525cbdc3deb8fed1 100644 (file)
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -2,28 +2,23 @@
 
 choice
        prompt "GCC compiler Version" if TOOLCHAINOPTS
-       default GCC_USE_VERSION_6_3_ARC if arc
-       default GCC_USE_VERSION_5
+       default GCC_USE_VERSION_8
        help
          Select the version of gcc you wish to use.
 
-       config GCC_USE_VERSION_6_3_ARC
-               select GCC_VERSION_6_3_ARC
-               bool "gcc 6.3.x with support of ARC cores"
-               depends on arc
-
        config GCC_USE_VERSION_5
                bool "gcc 5.x"
                depends on !arc
 
-       config GCC_USE_VERSION_6
-               bool "gcc 6.x"
-               depends on !arc
-
        config GCC_USE_VERSION_7
                bool "gcc 7.x"
                depends on !arc
 
+       config GCC_USE_VERSION_8
+               bool "gcc 8.x"
+
+       config GCC_USE_VERSION_9
+               bool "gcc 9.x"
 endchoice
 
 config GCC_USE_GRAPHITE
@@ -37,9 +32,24 @@ config EXTRA_GCC_CONFIG_OPTIONS
        help
            Any additional gcc options you may want to include....
 
-config SSP_SUPPORT
+config GCC_DEFAULT_PIE
+       bool
+       prompt "Build executable with PIE enabled by default" if TOOLCHAINOPTS
+       depends on !GCC_USE_VERSION_5
+       default n
+       help
+           Use gcc configure option --enable-default-pie to turn on -fPIE and -pie by default.
+
+config GCC_DEFAULT_SSP
+       bool
+       prompt "Build executable with Stack-Smashing Protection enabled by default" if TOOLCHAINOPTS
+       default n
+       help
+           Use gcc configure option --enable-default-ssp to turn on -fstack-protector-strong by default.
+
+config GCC_LIBSSP
        bool
-       prompt "Enable Stack-Smashing Protection support" if TOOLCHAINOPTS
+       prompt "Build gcc libssp" if TOOLCHAINOPTS
        depends on !USE_MUSL
        default y if !USE_MUSL
        help