X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/62de43971065751431c7781db9b4cabaf7bf366b..a656395fe8018b9cdc0432a53e551a3af890b698:/toolchain/gcc/Config.in

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 4d87f1939..ccaccaf00 100644
--- 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,12 +33,12 @@ 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"
 
+	config GCC_VERSION_4_4_2
+		bool "gcc 4.4.2"
+
 	config GCC_VERSION_LLVM
 		bool "llvm-gcc 4.2"
 		depends BROKEN
@@ -50,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