build: fix menuconfig submenu sorting for gcc options

The hidden symbol GCC_USE_IREMAP was breaking it, move it to Config.version
instead

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

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 3882815d7f611ec6d7d80aa42dedb5ddf0da1832..7d7f34210a6d4ee8f5a9f192525cbdc3deb8fed1 100644 (file)
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -21,11 +21,6 @@ choice
                bool "gcc 9.x"
 endchoice
 
-config GCC_USE_IREMAP
-       default y if ( GCC_USE_VERSION_5 || GCC_USE_VERSION_7 )
-       default n
-       bool
-
 config GCC_USE_GRAPHITE
        bool
        prompt "Compile in support for the new Graphite framework in GCC 4.4+" if TOOLCHAINOPTS

diff --git a/toolchain/gcc/Config.version b/toolchain/gcc/Config.version
index 0658f3d52b8db33ac325bc27b6c7f52aaeb2a385..687857bd1f238caa1dd70b4f3769bf81515492f1 100644 (file)
--- a/toolchain/gcc/Config.version
+++ b/toolchain/gcc/Config.version
@@ -16,3 +16,8 @@ config GCC_VERSION
        default "7.4.0"         if GCC_VERSION_7
        default "9.2.0"         if GCC_VERSION_9
        default "8.3.0"
+
+config GCC_USE_IREMAP
+       bool
+       default y if ( GCC_USE_VERSION_5 || GCC_USE_VERSION_7 )
+       default n