[patchteam] fix issues with pptpd server and firewall, closes #2342

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

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 07a2446..b183e36 100644 (file)
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -1,63 +1,104 @@
 # Choose gcc version.
 # Choose gcc version.

-# WARNING -- 2.95 currently only builds for i386, arm, mips*, and powerpc.
-# WARNING -- 2.95 does not currently build natively for the target.
-
-if CONFIG_DEVEL
-       comment "Gcc Options"
-endif
-
-
-config BR2_GCC_3_4
-       bool
-       default n
-       depends BR2_GCC_VERSION_3_4_4 || BR2_GCC_VERSION_4_0_0 || BR2_GCC_VERSION_4_0_1

 
 choice
 
 choice

-       prompt "GCC compiler Version" if CONFIG_DEVEL
-       default BR2_GCC_VERSION_3_4_4
+       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_3_4 if TARGET_gemini
+       default GCC_VERSION_4_4_1 if ubicom32
+       default GCC_VERSION_4_3_3_CS if (mips || mipsel) && !(TARGET_octeon || TARGET_sibyte)
+       default GCC_VERSION_4_3_3_CS if (arm || armeb) && !TARGET_gemini
+       default GCC_VERSION_4_4_3 if powerpc
+       default GCC_VERSION_4_4_3 if (TARGET_octeon || TARGET_sibyte)
+       default GCC_VERSION_4_1_2

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

-       config BR2_GCC_VERSION_3_4_4
-               bool "gcc 3.4.4"
-               select BR2_GCC_3_4
+       config GCC_VERSION_3_4_6
+               bool "gcc 3.4.6"

 
 

-       config BR2_GCC_VERSION_4_0_0
-               bool "gcc 4.0.0"
-               select BR2_GCC_3_4
+if !LINUX_2_4
+       config GCC_VERSION_4_1_2
+               bool "gcc 4.1.2"

 
 

-       config BR2_GCC_VERSION_4_0_1
-               bool "gcc 4.0.1"
-               select BR2_GCC_3_4
+       config GCC_VERSION_4_2_4
+               bool "gcc 4.2.4"

 
 

-endchoice
+       config GCC_VERSION_4_3_3
+               bool "gcc 4.3.3"

 
 

-config BR2_GCC_VERSION
-       string
-       default "3.4.4"     if BR2_GCC_VERSION_3_4_4 || !CONFIG_DEVEL
-       default "4.0.0"     if BR2_GCC_VERSION_4_0_0
-       default "4.0.1"     if BR2_GCC_VERSION_4_0_1
+       config GCC_VERSION_4_3_4
+               bool "gcc 4.3.4"

 
 

+       config GCC_VERSION_4_4_1
+               bool "gcc 4.4.1"

 
 

-config BR2_GCC_USE_SJLJ_EXCEPTIONS
-       string
-#      default "--enable-sjlj-exceptions"
-       default ""
-       help
-           Currently the unwind stuff seems to work for staticly linked apps
-           but not dynamic.  So use setjmp/longjmp exceptions by default.
+       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 BR2_EXTRA_GCC_CONFIG_OPTIONS
+       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
+
+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 EXTRA_GCC_CONFIG_OPTIONS

        string
        string

-       prompt "Additional gcc options" if CONFIG_DEVEL
+       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 BR2_INSTALL_LIBSTDCPP
+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 TLS_SUPPORT
+       bool
+       depends !GCC_VERSION_3_4_6 && UCLIBC_VERSION_NPTL
+       prompt "Enable Thread-local storage (TLS) support" if TOOLCHAINOPTS
+       default n
+       help
+           Enable Thread-local storage support
+
+config INSTALL_LIBSTDCPP

        bool
        bool

-       prompt "Build/install c++ compiler and libstdc++?" if CONFIG_DEVEL
+       prompt "Build/install c++ compiler and libstdc++?" if TOOLCHAINOPTS

        default y
        help
            Build/install c++ compiler and libstdc++?
 
        default y
        help
            Build/install c++ compiler and libstdc++?
 

+config INSTALL_LIBGCJ
+       bool
+       prompt "Build/install java compiler and GNU classpath ?" if TOOLCHAINOPTS
+       default n
+       help
+           Build/install java compiler and GNU classpath ?