X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=toolchain%2Fgcc%2FConfig.in;h=811c6d47c24f629fe38b6487dfcd4c96f52d1259;hp=17f2f5cdc6efb1ebc413f72007742c30ee32610a;hb=6e8901b5b4ca17997bfc6a3533817497caa9b98a;hpb=8d6dc9074fd8b4641375061b8495736e54ac3141

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 17f2f5cdc6..811c6d47c2 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -2,69 +2,69 @@
 
 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 TARGET_ppc40x
-	default GCC_VERSION_4_2_4 if TARGET_ppc44x
-	default GCC_VERSION_4_1_2
+	default GCC_VERSION_4_4_7 if GCC_DEFAULT_VERSION_4_4_7
+	default GCC_VERSION_4_6_LINARO
 	help
 	  Select the version of gcc you wish to use.
 
-	config GCC_VERSION_3_4_6
-		bool "gcc 3.4.6"
+	config GCC_VERSION_4_4_7
+		bool "gcc 4.4.7"
+		depends avr32
 
-	config GCC_VERSION_4_1_2
-		depends !LINUX_2_4
-		bool "gcc 4.1.2"
+	config GCC_VERSION_4_6_3
+		bool "gcc 4.6.3"
 
-	config GCC_VERSION_4_2_0
-		depends !LINUX_2_4
-		bool "gcc 4.2.0"
+	config GCC_VERSION_4_7_2
+		bool "gcc 4.7.2"
 
-	config GCC_VERSION_4_2_1
-		depends !LINUX_2_4
-		bool "gcc 4.2.1"
+	config GCC_VERSION_4_6_LINARO
+		bool "gcc 4.6.x with Linaro enhancements"
 
-	config GCC_VERSION_4_2_2
-		depends !LINUX_2_4
-		bool "gcc 4.2.2"
+	config GCC_VERSION_4_7_LINARO
+		bool "gcc 4.7.x with Linaro enhancements"
 
-	config GCC_VERSION_4_2_3
-		depends !LINUX_2_4
-		bool "gcc 4.2.3"
-
-	config GCC_VERSION_4_2_4
-		depends !LINUX_2_4
-		bool "gcc 4.2.4"
+	config GCC_VERSION_4_8_0
+		bool "gcc 4.8.0"
 
 endchoice
 
-config EABI_SUPPORT
+config GCC_USE_GRAPHITE
+	bool
+	prompt "Compile in support for the new Graphite framework in GCC 4.4+" if TOOLCHAINOPTS
+
+config GCC_USE_SYSTEM_PPL_CLOOG
 	bool
-	depends arm||armeb
-	prompt "Enable EABI support" if TOOLCHAINOPTS
+	prompt "Use the system versions of PPL and CLooG"
+	depends GCC_USE_GRAPHITE
 	default n
-	help
-	  Enable ARM EABI support
 
 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
-	prompt "Enable Smash Stacking Protection support" if TOOLCHAINOPTS
+	prompt "Enable Stack-Smashing Protection support" if TOOLCHAINOPTS
 	default n
 	help
-	    Enable Smash Stacking Protection support
+	    Enable Stack-Smashing Protection support
+
+config SJLJ_EXCEPTIONS
+	bool
+	prompt "Use setjump()/longjump() exceptions" if TOOLCHAINOPTS
+	default n
+	help
+	    Use old setjump()/longjump() exceptions instead of the newer
+	    frame unwinding exceptions handling routines.  Warning: increases
+	    code size and runtime memory usage.
 
 config INSTALL_LIBSTDCPP
 	bool
 	prompt "Build/install c++ compiler and libstdc++?" if TOOLCHAINOPTS
-	default y
+	default y if !USE_MUSL
 	help
 	    Build/install c++ compiler and libstdc++?
 
@@ -74,3 +74,11 @@ config INSTALL_LIBGCJ
 	default n
 	help
 	    Build/install java compiler and GNU classpath ?
+
+
+config INSTALL_GFORTRAN
+	bool
+	prompt "Build/install fortran compiler?" if TOOLCHAINOPTS
+	default n
+	help
+	    Build/install GNU fortran compiler ?