X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/0ddbef1f62f2d40139132363cb7e739d1fedb628..c3c5977bfaa6eb2795e358cb34adf1484eb3179c:/toolchain/gcc/Config.in

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index cc59c92f3..7f8a0fc31 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -2,34 +2,24 @@
 
 choice
 	prompt "GCC compiler Version" if TOOLCHAINOPTS
-	default GCC_VERSION_4_3_5 if (avr32 || powerpc64)
-	default GCC_VERSION_4_3_5 if (TARGET_coldfire || TARGET_etrax || TARGET_gemini || TARGET_cns21xx)
-	default GCC_VERSION_4_3_3_CS if (arm || armeb) && !(TARGET_gemini || TARGET_cns21xx || TARGET_omap35xx)
-	default GCC_VERSION_4_3_3_CS if (mips || mipsel) && !(TARGET_octeon || TARGET_sibyte)
-	default GCC_VERSION_4_4_5 if (powerpc || ubicom32)
-	default GCC_VERSION_4_4_5 if (TARGET_omap35xx || TARGET_octeon || TARGET_sibyte)
-	default GCC_VERSION_4_5_1_LINARO if sparc
-	default GCC_VERSION_4_1_2
+	default GCC_VERSION_4_3_3_CS if GCC_DEFAULT_VERSION_4_3_3_CS
+	default GCC_VERSION_4_3_5 if GCC_DEFAULT_VERSION_4_3_5
+	default GCC_VERSION_4_4_6 if GCC_DEFAULT_VERSION_4_4_6
+	default GCC_VERSION_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_2_4
-		bool "gcc 4.2.4"
-
 	config GCC_VERSION_4_3_5
 		bool "gcc 4.3.5"
 
-	config GCC_VERSION_4_4_5
-		bool "gcc 4.4.5"
+	config GCC_VERSION_4_4_6
+		bool "gcc 4.4.6"
 
-	config GCC_VERSION_4_5_2
-		bool "gcc 4.5.2"
+	config GCC_VERSION_4_6_1
+		bool "gcc 4.6.1"
 
-	config GCC_VERSION_4_5_1_LINARO
-		bool "gcc 4.5.1 with Linaro enhancements"
+	config GCC_VERSION_LINARO
+		bool "gcc 4.5.x with Linaro enhancements"
 
 	config GCC_VERSION_LLVM
 		bool "llvm-gcc 4.2"
@@ -46,7 +36,7 @@ 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
+	depends GCC_VERSION_4_4 || GCC_VERSION_4_5 || GCC_VERSION_4_6
 
 config GCC_USE_SYSTEM_PPL_CLOOG
 	bool
@@ -76,6 +66,15 @@ config TLS_SUPPORT
 	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
@@ -85,8 +84,16 @@ config INSTALL_LIBSTDCPP
 
 config INSTALL_LIBGCJ
 	bool
-	depends on !(GCC_VERSION_4_1||GCC_VERSION_4_2)
+	depends on !GCC_VERSION_LLVM
 	prompt "Build/install java compiler and GNU classpath ?" if TOOLCHAINOPTS
 	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 ?