X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=toolchain%2Fgcc%2FConfig.in;h=99214664953eb1b823d1fe51e929ddcd4fca8406;hp=6df266173777876d889421943666da32ce88fc31;hb=5bd4c4e26de4c2607b68aec117cb6b2be3014892;hpb=97d2d1f90fe0a81fe6615c7e87f21cf6f26af4ca

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 6df2661737..9921466495 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,8 +11,8 @@ 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 arm || armeb
+	default GCC_VERSION_4_3_3_CS if (mips || mipsel) && !TARGET_octeon
+	default GCC_VERSION_4_3_3_CS if (arm || armeb) && !TARGET_gemini
 	default GCC_VERSION_4_1_2
 	help
 	  Select the version of gcc you wish to use.
@@ -39,6 +39,9 @@ if !LINUX_2_4
 	config GCC_VERSION_4_4_2
 		bool "gcc 4.4.2"
 
+	config GCC_VERSION_4_4_3
+		bool "gcc 4.4.3"
+
 	config GCC_VERSION_LLVM
 		bool "llvm-gcc 4.2"
 		depends BROKEN
@@ -46,10 +49,23 @@ if !LINUX_2_4
 	config GCC_VERSION_4_3_3_CS
 		bool "gcc 4.3.3 with CodeSourcery enhancements"
 
+	config GCC_VERSION_4_4_1_CS
+		bool "gcc 4.4.1 with CodeSourcery enhancements"
+		depends BROKEN
+
+	config GCC_VERSION_4_4_3_CS
+		bool "gcc 4.4.3 with CodeSourcery enhancements"
+		depends BROKEN
+
 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 || GCC_VERSION_4_4_3
+
 config EXTRA_GCC_CONFIG_OPTIONS
 	string
 	prompt "Additional gcc configure options" if TOOLCHAINOPTS