X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=toolchain%2Fgcc%2FConfig.in;h=585017586acae4a6f01bb85a1b65a161417bff05;hb=a54e305a8b9e142c57c07dbd6413aa055635a147;hp=661da9412b1b388e58951b69469431d164943bde;hpb=332227b067db434bd50e65a3f6428d262559c612;p=lede.git

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 661da9412b..585017586a 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -2,74 +2,35 @@
 
 choice
 	prompt "GCC compiler Version" if TOOLCHAINOPTS
-	default GCC_VERSION_4_2_4 if avr32
-	default GCC_VERSION_4_3_3 if powerpc64
-	default GCC_VERSION_4_3_3 if TARGET_coldfire
-	default GCC_VERSION_4_3_3 if TARGET_etrax
-	default GCC_VERSION_4_3_3_CS if (arm || armeb) && !TARGET_gemini
-	default GCC_VERSION_4_3_3_CS if (mips || mipsel) && !(TARGET_octeon || TARGET_sibyte)
-	default GCC_VERSION_4_3_4 if TARGET_gemini
-	default GCC_VERSION_4_4_1 if ubicom32
-	default GCC_VERSION_4_4_3 if powerpc
-	default GCC_VERSION_4_4_4 if (TARGET_octeon || TARGET_sibyte)
-	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_4_1_2
-		bool "gcc 4.1.2"
+	config GCC_VERSION_4_4_7
+		bool "gcc 4.4.7"
+		depends avr32
 
-	config GCC_VERSION_4_2_4
-		bool "gcc 4.2.4"
+	config GCC_VERSION_4_6_3
+		bool "gcc 4.6.3"
 
-	config GCC_VERSION_4_3_3
-		bool "gcc 4.3.3"
+	config GCC_VERSION_4_7_2
+		bool "gcc 4.7.2"
 
-	config GCC_VERSION_4_3_4
-		bool "gcc 4.3.4"
+	config GCC_VERSION_4_6_LINARO
+		bool "gcc 4.6.x with Linaro enhancements"
 
-	config GCC_VERSION_4_3_5
-		bool "gcc 4.3.5"
+	config GCC_VERSION_4_7_LINARO
+		bool "gcc 4.7.x with Linaro enhancements"
 
-	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_4_4_3
-		bool "gcc 4.4.3"
-
-	config GCC_VERSION_4_4_4
-		bool "gcc 4.4.4"
-
-	config GCC_VERSION_4_5_0
-		bool "gcc 4.5.0"
-
-	config GCC_VERSION_4_5_1
-		bool "gcc 4.5.1"
-
-	config GCC_VERSION_LLVM
-		bool "llvm-gcc 4.2"
-		depends BROKEN
-
-	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
+	config GCC_VERSION_4_8_0
+		bool "gcc 4.8.0"
 
 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 || GCC_VERSION_4_5
 
 config GCC_USE_SYSTEM_PPL_CLOOG
 	bool
@@ -86,7 +47,6 @@ config EXTRA_GCC_CONFIG_OPTIONS
 
 config SSP_SUPPORT
 	bool
-	depends !GCC_VERSION_3_4_6
 	prompt "Enable Stack-Smashing Protection support" if TOOLCHAINOPTS
 	default n
 	help
@@ -94,16 +54,24 @@ config SSP_SUPPORT
 
 config TLS_SUPPORT
 	bool
-	depends !GCC_VERSION_3_4_6 && UCLIBC_VERSION_NPTL
 	prompt "Enable Thread-local storage (TLS) support" if TOOLCHAINOPTS
 	default n
 	help
 	    Enable Thread-local storage 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++?
 
@@ -113,3 +81,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 ?