X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=toolchain%2Fgcc%2FConfig.in;h=b027953c1f43c65127f3da79917f33d804e56d3e;hb=909abe499921709e37cefbed4bd9932d803c36b0;hp=41943c8cc8733abc06bac62459bd1d05232b8972;hpb=5a8a22bdc2d8e5dfd14b37a72d78b08864777011;p=openwrt%2Fstaging%2Fmkresin.git

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 41943c8cc8..b027953c1f 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -2,66 +2,70 @@
 
 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_3_3 if TARGET_ps3_petitboot
-	default GCC_VERSION_4_3_3 if TARGET_pxcab
-	default GCC_VERSION_4_3_3 if TARGET_etrax
-	default GCC_VERSION_4_3_3 if TARGET_coldfire
-	default GCC_VERSION_4_1_2
+	default GCC_VERSION_4_4_6 if GCC_DEFAULT_VERSION_4_4_6
+	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_6
+		bool "gcc 4.4.6"
+		depends (avr32 || ubicom32)
 
-if !LINUX_2_4
-	config GCC_VERSION_4_1_2
-		bool "gcc 4.1.2"
+	config GCC_VERSION_4_6_1
+		bool "gcc 4.6.1"
 
-	config GCC_VERSION_4_2_4
-		bool "gcc 4.2.4"
+	config GCC_VERSION_4_5_LINARO
+		bool "gcc 4.5.x with Linaro enhancements"
 
-	config GCC_VERSION_4_3_3
-		bool "gcc 4.3.3"
+	config GCC_VERSION_4_6_LINARO
+		bool "gcc 4.6.x with Linaro enhancements"
 
-	config GCC_VERSION_4_3_4
-		bool "gcc 4.3.4"
-
-	config GCC_VERSION_4_4_0
-		bool "gcc 4.4.0"
-
-	config GCC_VERSION_4_4_1
-		bool "gcc 4.4.1"
-endif
+	config GCC_VERSION_LLVM
+		bool "llvm-gcc 4.2"
+		depends BROKEN
 
 endchoice
 
-config EABI_SUPPORT
+config GCC_USE_GRAPHITE
 	bool
-	depends arm||armeb
-	prompt "Enable EABI support" if TOOLCHAINOPTS
-	default n if TARGET_gemini
-	default y
-	help
-	  Enable ARM EABI support
+	prompt "Compile in support for the new Graphite framework in GCC 4.4+" if TOOLCHAINOPTS
+	depends !GCC_VERSION_LLVM
+
+config GCC_USE_SYSTEM_PPL_CLOOG
+	bool
+	prompt "Use the system versions of PPL and CLooG"
+	depends GCC_USE_GRAPHITE
+	default n
 
 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
-	depends !GCC_VERSION_3_4_6
-	prompt "Enable Smash Stacking Protection support" if TOOLCHAINOPTS
+	prompt "Enable Stack-Smashing Protection support" if TOOLCHAINOPTS
+	default n
+	help
+	    Enable Stack-Smashing Protection support
+
+config TLS_SUPPORT
+	bool
+	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
-	    Enable Smash Stacking Protection support
+	    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
@@ -72,7 +76,16 @@ config INSTALL_LIBSTDCPP
 
 config INSTALL_LIBGCJ
 	bool
+	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 ?