package/apex: fix a compile issue

[openwrt.git] / toolchain / gcc / Config.in

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 55ab7e5..08c69de 100644 (file)
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -2,48 +2,80 @@
 
 choice
        prompt "GCC compiler Version" if TOOLCHAINOPTS
-       default GCC_VERSION_4_1_1 if LINUX_2_6_ARUBA
-       default GCC_VERSION_3_4_6
+       default GCC_VERSION_4_2_4 if avr32
+       default GCC_VERSION_4_3_5 if powerpc64
+       default GCC_VERSION_4_3_5 if (TARGET_coldfire || TARGET_etrax || TARGET_gemini)
+       default GCC_VERSION_4_3_3_CS if (arm || armeb) && !(TARGET_gemini || 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_1_2
        help
          Select the version of gcc you wish to use.
 
+       config GCC_VERSION_4_1_2
+               bool "gcc 4.1.2"
 
-       config GCC_VERSION_3_4_4
-               bool "gcc 3.4.4"
+       config GCC_VERSION_4_2_4
+               bool "gcc 4.2.4"
 
-       config GCC_VERSION_3_4_5
-               bool "gcc 3.4.5"
+       config GCC_VERSION_4_3_5
+               bool "gcc 4.3.5"
 
-       config GCC_VERSION_3_4_6
-               bool "gcc 3.4.6"
+       config GCC_VERSION_4_4_5
+               bool "gcc 4.4.5"
 
-       config GCC_VERSION_3_4_6_nonmips
-               bool "gcc 3.4.6-nonmips"
+       config GCC_VERSION_4_5_1
+               bool "gcc 4.5.1"
 
-       config GCC_VERSION_4_0_2
-               bool "gcc 4.0.2"
+       config GCC_VERSION_4_5_1_LINARO
+               bool "gcc 4.5.1 with Linaro enhancements"
 
-       config GCC_VERSION_4_0_3
-               bool "gcc 4.0.3"
+       config GCC_VERSION_LLVM
+               bool "llvm-gcc 4.2"
+               depends BROKEN
 
-       config GCC_VERSION_4_1_0
-               bool "gcc 4.1.0"
+       config GCC_VERSION_4_3_3_CS
+               bool "gcc 4.3.3 with CodeSourcery enhancements"
 
-       config GCC_VERSION_4_1_1
-               bool "gcc 4.1.1"
-
-       config GCC_VERSION_4_2
-               bool "gcc 4.2 (20060709)"
+       config GCC_VERSION_4_4_1_CS
+               bool "gcc 4.4.1 with CodeSourcery 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
+       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
+       prompt "Enable Stack-Smashing Protection support" if TOOLCHAINOPTS
+       default n
+       help
+           Enable Stack-Smashing Protection support
+
+config TLS_SUPPORT
+       bool
+       depends UCLIBC_VERSION_NPTL
+       prompt "Enable Thread-local storage (TLS) support" if TOOLCHAINOPTS
+       default n
+       help
+           Enable Thread-local storage support
+
 config INSTALL_LIBSTDCPP
        bool
        prompt "Build/install c++ compiler and libstdc++?" if TOOLCHAINOPTS
@@ -51,4 +83,10 @@ config INSTALL_LIBSTDCPP
        help
            Build/install c++ compiler and libstdc++?
 
-
+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 ?