hostap: move patches to the right place

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

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 9b284209a5057421882c172449c59d85fd4ad21b..ccaccaf0022487bff7a8f308a5a3fdb8dcf2b423 100644 (file)
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -9,9 +9,9 @@ choice
        default GCC_VERSION_4_3_3 if powerpc64
        default GCC_VERSION_4_3_3 if TARGET_etrax
        default GCC_VERSION_4_3_3 if TARGET_coldfire
-       default GCC_VERSION_4_4_0 if ubicom32
+       default GCC_VERSION_4_4_1 if ubicom32
        default GCC_VERSION_4_4_1 if TARGET_octeon
-       default GCC_VERSION_4_3_3_CS if mips || mipsel
+       default GCC_VERSION_4_3_3_CS if (mips || mipsel) && !TARGET_octeon
        default GCC_VERSION_4_3_3_CS if arm || armeb
        default GCC_VERSION_4_1_2
        help
@@ -33,9 +33,6 @@ if !LINUX_2_4
        config GCC_VERSION_4_3_4
                bool "gcc 4.3.4"
 
-       config GCC_VERSION_4_4_0
-               bool "gcc 4.4.0"
-
        config GCC_VERSION_4_4_1
                bool "gcc 4.4.1"
 
@@ -53,6 +50,11 @@ endif
 
 endchoice
 
+config GCC_USE_GRAPHITE
+       bool
+       prompt "Compile in support for the new Graphite framework in GCC 4.4+" if TOOLCHAINOPTS
+       depends GCC_VERSION_4_4_1 || GCC_VERSION_4_4_2
+
 config EXTRA_GCC_CONFIG_OPTIONS
        string
        prompt "Additional gcc configure options" if TOOLCHAINOPTS