p54: fix a null pointer dereference bug

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

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 6c584db..204219e 100644 (file)
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -2,43 +2,70 @@
 
 choice
        prompt "GCC compiler Version" if TOOLCHAINOPTS
 
 choice
        prompt "GCC compiler Version" if TOOLCHAINOPTS

-       default GCC_VERSION_4_0_3 if LINUX_2_6_ARUBA
-       default GCC_VERSION_3_4_4 if LINUX_2_4_BRCM
-       default GCC_VERSION_3_4_6
+       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_5 if GCC_DEFAULT_VERSION_4_4_5
+       default GCC_VERSION_LINARO

        help
          Select the version of gcc you wish to use.
 
        help
          Select the version of gcc you wish to use.
 

+       config GCC_VERSION_4_3_5
+               bool "gcc 4.3.5"

 
 

-       config GCC_VERSION_3_4_4
-               bool "gcc 3.4.4"
+       config GCC_VERSION_4_4_5
+               bool "gcc 4.4.5"

 
 

-       config GCC_VERSION_3_4_5
-               bool "gcc 3.4.5"
+       config GCC_VERSION_4_5_2
+               bool "gcc 4.5.2"

 
 

-       config GCC_VERSION_3_4_6
-               bool "gcc 3.4.6"
+       config GCC_VERSION_LINARO
+               bool "gcc 4.5.2 with Linaro enhancements"

 
 

-       config GCC_VERSION_4_0_2
-               bool "gcc 4.0.2"
+       config GCC_VERSION_LLVM
+               bool "llvm-gcc 4.2"
+               depends BROKEN

 
 

-       config GCC_VERSION_4_0_3
-               bool "gcc 4.0.3"
+       config GCC_VERSION_4_3_3_CS
+               bool "gcc 4.3.3 with CodeSourcery enhancements"

 
 

-       config GCC_VERSION_4_1_0
-               bool "gcc 4.1.0"
-
-       config GCC_VERSION_4_1_1
-               bool "gcc 4.1.1"
+       config GCC_VERSION_4_4_1_CS
+               bool "gcc 4.4.1 with CodeSourcery enhancements"

 
 endchoice
 
 
 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
 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....
 
        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
 config INSTALL_LIBSTDCPP
        bool
        prompt "Build/install c++ compiler and libstdc++?" if TOOLCHAINOPTS


@@ -46,4 +73,10 @@ config INSTALL_LIBSTDCPP
        help
            Build/install c++ compiler and libstdc++?
 
        help
            Build/install c++ compiler and libstdc++?
 

-
+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 ?