zlib: replace -fPIC with $(FPIC)

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

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 55ab7e5..2c0f93e 100644 (file)
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -2,48 +2,66 @@
 
 choice
        prompt "GCC compiler Version" if TOOLCHAINOPTS
 
 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_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 powerpc64
+       default GCC_VERSION_4_3_3 if TARGET_etrax
+       default GCC_VERSION_4_3_3 if TARGET_coldfire
+       default GCC_VERSION_4_4_0 if ubicom32
+       default GCC_VERSION_4_4_1 if TARGET_octeon
+       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 GCC_VERSION_3_4_6
+               bool "gcc 3.4.6"

 
 

-       config GCC_VERSION_3_4_4
-               bool "gcc 3.4.4"
+if !LINUX_2_4
+       config GCC_VERSION_4_1_2
+               bool "gcc 4.1.2"

 
 

-       config GCC_VERSION_3_4_5
-               bool "gcc 3.4.5"
+       config GCC_VERSION_4_2_4
+               bool "gcc 4.2.4"

 
 

-       config GCC_VERSION_3_4_6
-               bool "gcc 3.4.6"
+       config GCC_VERSION_4_3_3
+               bool "gcc 4.3.3"

 
 

-       config GCC_VERSION_3_4_6_nonmips
-               bool "gcc 3.4.6-nonmips"
+       config GCC_VERSION_4_3_4
+               bool "gcc 4.3.4"

 
 

-       config GCC_VERSION_4_0_2
-               bool "gcc 4.0.2"
+       config GCC_VERSION_4_4_0
+               bool "gcc 4.4.0"

 
 

-       config GCC_VERSION_4_0_3
-               bool "gcc 4.0.3"
+       config GCC_VERSION_4_4_1
+               bool "gcc 4.4.1"

 
 

-       config GCC_VERSION_4_1_0
-               bool "gcc 4.1.0"
+       config GCC_VERSION_LLVM
+               bool "llvm-gcc 4.2"

 
 

-       config GCC_VERSION_4_1_1
-               bool "gcc 4.1.1"
+       config GCC_VERSION_4_3_3_CS
+               bool "gcc 4.3.3 with CodeSourcery enhancements"

 
 

-       config GCC_VERSION_4_2
-               bool "gcc 4.2 (20060709)"
+endif

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


@@ -51,4 +69,9 @@ config INSTALL_LIBSTDCPP
        help
            Build/install c++ compiler and libstdc++?
 
        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 ?