X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=toolchain%2Fgcc%2FConfig.in;h=d8141815fb802d075fb0ff542ce19206445aafc4;hb=a7780603923fddec225c9f4b0990fede4c2695a9;hp=18899c9d0fb6eb8e9734ef842ab96a3767a035f0;hpb=0b5ddcb9cfd2e5ffbc4a2e06b7d8fb33c06403ec;p=openwrt%2Fstaging%2Fchunkeey.git

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 18899c9d0f..d8141815fb 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -2,68 +2,34 @@
 
 choice
 	prompt "GCC compiler Version" if TOOLCHAINOPTS
-	default GCC_VERSION_3_4_6 if LINUX_2_4
-	default GCC_VERSION_4_2_4 if avr32
-	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) && !TARGET_gemini
-	default GCC_VERSION_4_4_3 if powerpc
-	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_3_4_6
-		bool "gcc 3.4.6"
+	config GCC_USE_VERSION_4_6_LINARO
+		select GCC_VERSION_4_6_LINARO
+		bool "gcc 4.6.x with Linaro enhancements"
 
-if !LINUX_2_4
-	config GCC_VERSION_4_1_2
-		bool "gcc 4.1.2"
+	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_2_4
-		bool "gcc 4.2.4"
-
-	config GCC_VERSION_4_3_3
-		bool "gcc 4.3.3"
-
-	config GCC_VERSION_4_3_4
-		bool "gcc 4.3.4"
-
-	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_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
-
-endif
+	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_1 || GCC_VERSION_4_4_2 || GCC_VERSION_4_4_3
+
+config GCC_USE_SYSTEM_PPL_CLOOG
+	bool
+	prompt "Use the system versions of PPL and CLooG"
+	depends on GCC_USE_GRAPHITE
+	default n
 
 config EXTRA_GCC_CONFIG_OPTIONS
 	string
@@ -74,18 +40,19 @@ 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
 	    Enable Stack-Smashing Protection support
 
-config INSTALL_LIBSTDCPP
+config SJLJ_EXCEPTIONS
 	bool
-	prompt "Build/install c++ compiler and libstdc++?" if TOOLCHAINOPTS
-	default y
+	prompt "Use setjump()/longjump() exceptions" if TOOLCHAINOPTS
+	default n
 	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
@@ -93,3 +60,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 ?