zlib: replace -fPIC with $(FPIC)

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

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 17f2f5c..2c0f93e 100644 (file)
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -6,6 +6,11 @@ choice
        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_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.
        default GCC_VERSION_4_1_2
        help
          Select the version of gcc you wish to use.


@@ -13,53 +18,49 @@ choice
        config GCC_VERSION_3_4_6
                bool "gcc 3.4.6"
 
        config GCC_VERSION_3_4_6
                bool "gcc 3.4.6"
 

+if !LINUX_2_4

        config GCC_VERSION_4_1_2
        config GCC_VERSION_4_1_2

-               depends !LINUX_2_4

                bool "gcc 4.1.2"
 
                bool "gcc 4.1.2"
 

-       config GCC_VERSION_4_2_0
-               depends !LINUX_2_4
-               bool "gcc 4.2.0"
+       config GCC_VERSION_4_2_4
+               bool "gcc 4.2.4"

 
 

-       config GCC_VERSION_4_2_1
-               depends !LINUX_2_4
-               bool "gcc 4.2.1"
+       config GCC_VERSION_4_3_3
+               bool "gcc 4.3.3"

 
 

-       config GCC_VERSION_4_2_2
-               depends !LINUX_2_4
-               bool "gcc 4.2.2"
+       config GCC_VERSION_4_3_4
+               bool "gcc 4.3.4"

 
 

-       config GCC_VERSION_4_2_3
-               depends !LINUX_2_4
-               bool "gcc 4.2.3"
+       config GCC_VERSION_4_4_0
+               bool "gcc 4.4.0"

 
 

-       config GCC_VERSION_4_2_4
-               depends !LINUX_2_4
-               bool "gcc 4.2.4"
+       config GCC_VERSION_4_4_1
+               bool "gcc 4.4.1"

 
 

-endchoice
+       config GCC_VERSION_LLVM
+               bool "llvm-gcc 4.2"

 
 

-config EABI_SUPPORT
-       bool
-       depends arm||armeb
-       prompt "Enable EABI support" if TOOLCHAINOPTS
-       default n
-       help
-         Enable ARM EABI support
+       config GCC_VERSION_4_3_3_CS
+               bool "gcc 4.3.3 with CodeSourcery enhancements"
+
+endif
+
+endchoice

 
 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....
 
 config SSP_SUPPORT
        bool
        default ""
        help
            Any additional gcc options you may want to include....
 
 config SSP_SUPPORT
        bool

-       prompt "Enable Smash Stacking Protection support" if TOOLCHAINOPTS
+       depends !GCC_VERSION_3_4_6
+       prompt "Enable Stack-Smashing Protection support" if TOOLCHAINOPTS

        default n
        help
        default n
        help

-           Enable Smash Stacking Protection support
+           Enable Stack-Smashing Protection support

 
 config INSTALL_LIBSTDCPP
        bool
 
 config INSTALL_LIBSTDCPP
        bool