X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/fcd1e536a0e58f095127be9f1e4b4ca284e8be8f..3a3c05eb9011f4bcd9bd5d3cb5f6f43b29e09ddb:/toolchain/gcc/Config.in?ds=sidebyside

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 6df266173..9562a02c9 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -3,7 +3,7 @@
 choice
 	prompt "GCC compiler Version" if TOOLCHAINOPTS
 	default GCC_VERSION_3_4_6 if LINUX_2_4
-	default GCC_VERSION_4_2_4 if TARGET_avr32
+	default GCC_VERSION_4_2_4 if avr32
 	default GCC_VERSION_4_2_4 if TARGET_ppc40x
 	default GCC_VERSION_4_2_4 if TARGET_ppc44x
 	default GCC_VERSION_4_3_3 if powerpc64
@@ -11,7 +11,7 @@ choice
 	default GCC_VERSION_4_3_3 if TARGET_coldfire
 	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
@@ -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