X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=toolchain%2Fgcc%2FConfig.in;h=d8141815fb802d075fb0ff542ce19206445aafc4;hp=cc59c92f37e57b89f46b9edf7bc6ae10ee7ace86;hb=d95e0687aa596342aa9e3851d9ce33443ca644d0;hpb=72ba27ae72480d5a23b77b5760d81d4142f8181b

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index cc59c92f37..d8141815fb 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -2,56 +2,33 @@
 
 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_USE_VERSION_4_6_LINARO if TARGET_octeon
+	default GCC_USE_VERSION_4_8_LINARO
 	help
 	  Select the version of gcc you wish to use.
 
-	config GCC_VERSION_4_1_2
-		bool "gcc 4.1.2"
+	config GCC_USE_VERSION_4_6_LINARO
+		select GCC_VERSION_4_6_LINARO
+		bool "gcc 4.6.x with Linaro enhancements"
 
-	config GCC_VERSION_4_2_4
-		bool "gcc 4.2.4"
+	config GCC_USE_VERSION_4_8_LINARO
+		select GCC_VERSION_4_8_LINARO
+		bool "gcc 4.8.x with Linaro enhancements"
 
-	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_5_2
-		bool "gcc 4.5.2"
-
-	config GCC_VERSION_4_5_1_LINARO
-		bool "gcc 4.5.1 with Linaro enhancements"
-
-	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"
+	config GCC_USE_VERSION_4_9_LINARO
+		select GCC_VERSION_4_9_LINARO
+		bool "gcc 4.9.x with Linaro enhancements"
 
 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
 	prompt "Use the system versions of PPL and CLooG"
-	depends GCC_USE_GRAPHITE
+	depends on GCC_USE_GRAPHITE
 	default n
 
 config EXTRA_GCC_CONFIG_OPTIONS
@@ -68,25 +45,26 @@ config SSP_SUPPORT
 	help
 	    Enable Stack-Smashing Protection support
 
-config TLS_SUPPORT
+config SJLJ_EXCEPTIONS
 	bool
-	depends UCLIBC_VERSION_NPTL
-	prompt "Enable Thread-local storage (TLS) support" if TOOLCHAINOPTS
+	prompt "Use setjump()/longjump() exceptions" if TOOLCHAINOPTS
 	default n
 	help
-	    Enable Thread-local storage support
-
-config INSTALL_LIBSTDCPP
-	bool
-	prompt "Build/install c++ compiler and libstdc++?" if TOOLCHAINOPTS
-	default y
-	help
-	    Build/install c++ compiler and libstdc++?
+	    Use old setjump()/longjump() exceptions instead of the newer
+	    frame unwinding exceptions handling routines.  Warning: increases
+	    code size and runtime memory usage.
 
 config INSTALL_LIBGCJ
 	bool
-	depends on !(GCC_VERSION_4_1||GCC_VERSION_4_2)
 	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 ?