X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/3dd2665c70d2d36ae1e43121678d8fa39f901876..a9a43ba6aca416dca007be5f3090401e5ba62aa2:/toolchain/gcc/Config.in

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 491290734..1f58ed8a0 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -1,66 +1,86 @@
 # Choose gcc version.
 
-if !TOOLCHAINOPTS
-	config GCC_VERSION_3_4_4
-		default y if LINUX_2_4_BRCM
-		
-	config GCC_VERSION_4_0_3
-		default y if LINUX_2_6_ARUBA
-
-endif
-
 choice
 	prompt "GCC compiler Version" if TOOLCHAINOPTS
-	default GCC_VERSION_4_0_3 if LINUX_2_6_ARUBA
-	default GCC_VERSION_3_4_4 if LINUX_2_4_BRCM
-	default GCC_VERSION_3_4_6
+	default GCC_VERSION_3_4_6 if LINUX_2_4
+	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
+	default GCC_VERSION_4_3_3 if TARGET_etrax
+	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) && !TARGET_octeon
+	default GCC_VERSION_4_3_3_CS if arm || armeb
+	default GCC_VERSION_4_1_2
 	help
 	  Select the version of gcc you wish to use.
 
+	config GCC_VERSION_3_4_6
+		bool "gcc 3.4.6"
 
-	config GCC_VERSION_3_4_4
-		bool "gcc 3.4.4"
+if !LINUX_2_4
+	config GCC_VERSION_4_1_2
+		bool "gcc 4.1.2"
 
-	config GCC_VERSION_3_4_5
-		bool "gcc 3.4.5"
+	config GCC_VERSION_4_2_4
+		bool "gcc 4.2.4"
 
-	config GCC_VERSION_3_4_6
-		bool "gcc 3.4.6"
+	config GCC_VERSION_4_3_3
+		bool "gcc 4.3.3"
 
-	config GCC_VERSION_4_0_2
-		bool "gcc 4.0.2"
+	config GCC_VERSION_4_3_4
+		bool "gcc 4.3.4"
 
-	config GCC_VERSION_4_0_3
-		bool "gcc 4.0.3"
+	config GCC_VERSION_4_4_1
+		bool "gcc 4.4.1"
 
-	config GCC_VERSION_4_1_0
-		bool "gcc 4.1.0"
+	config GCC_VERSION_4_4_2
+		bool "gcc 4.4.2"
 
-	config GCC_VERSION_4_1_1
-		bool "gcc 4.1.1"
+	config GCC_VERSION_4_4_3
+		bool "gcc 4.4.3"
 
-endchoice
+	config GCC_VERSION_LLVM
+		bool "llvm-gcc 4.2"
+		depends BROKEN
 
-config GCC_VERSION
-	string
-	prompt "GCC compiler Version" if (TOOLCHAINOPTS && NULL)
-	default "3.4.4"     if GCC_VERSION_3_4_4
-	default "3.4.5"     if GCC_VERSION_3_4_5
-	default "3.4.6"     if GCC_VERSION_3_4_6
-	default "4.0.2"     if GCC_VERSION_4_0_2
-	default "4.0.3"     if GCC_VERSION_4_0_3
-	default "4.1.0"     if GCC_VERSION_4_1_0
-	default "4.1.1"     if GCC_VERSION_4_1_1
-	default "3.4.6"
+	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 options" if TOOLCHAINOPTS
+	prompt "Additional gcc configure options" if TOOLCHAINOPTS
 	default ""
 	help
 	    Any additional gcc options you may want to include....
 
+config SSP_SUPPORT
+	bool
+	depends !GCC_VERSION_3_4_6
+	prompt "Enable Stack-Smashing Protection support" if TOOLCHAINOPTS
+	default n
+	help
+	    Enable Stack-Smashing Protection support
+
 config INSTALL_LIBSTDCPP
 	bool
 	prompt "Build/install c++ compiler and libstdc++?" if TOOLCHAINOPTS
@@ -68,3 +88,9 @@ config INSTALL_LIBSTDCPP
 	help
 	    Build/install c++ compiler and libstdc++?
 
+config INSTALL_LIBGCJ
+	bool
+	prompt "Build/install java compiler and GNU classpath ?" if TOOLCHAINOPTS
+	default n
+	help
+	    Build/install java compiler and GNU classpath ?