gcc: move the optimized assembler helpers back into the static libgcc and skip relink...

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

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 05227d2..204219e 100644 (file)
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -1,62 +1,82 @@
 # 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_3 || BR2_GCC_VERSION_4_0_0
 
 choice
-       prompt "GCC compiler Version" if CONFIG_DEVEL
-       default BR2_GCC_VERSION_3_3_5
+       prompt "GCC compiler Version" if TOOLCHAINOPTS
+       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.
 
-       config BR2_GCC_VERSION_3_3_5
-               bool "gcc 3.3.5"
+       config GCC_VERSION_4_3_5
+               bool "gcc 4.3.5"
+
+       config GCC_VERSION_4_4_5
+               bool "gcc 4.4.5"
+
+       config GCC_VERSION_4_5_2
+               bool "gcc 4.5.2"
 
-       config BR2_GCC_VERSION_3_4_3
-               bool "gcc 3.4.3"
-               select BR2_GCC_3_4
+       config GCC_VERSION_LINARO
+               bool "gcc 4.5.2 with Linaro enhancements"
 
-       config BR2_GCC_VERSION_4_0_0
-               bool "gcc 4.0.0"
-               select BR2_GCC_3_4
+       config GCC_VERSION_LLVM
+               bool "llvm-gcc 4.2"
+               depends BROKEN
+
+       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"
 
 endchoice
 
-config BR2_GCC_VERSION
-       string
-       default "3.3.5"     if BR2_GCC_VERSION_3_3_5 || !CONFIG_DEVEL
-       default "3.4.3"     if BR2_GCC_VERSION_3_4_3 
-       default "4.0.0"     if BR2_GCC_VERSION_4_0_0
+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 BR2_GCC_USE_SJLJ_EXCEPTIONS
+config EXTRA_GCC_CONFIG_OPTIONS
        string
-#      default "--enable-sjlj-exceptions"
+       prompt "Additional gcc configure options" if TOOLCHAINOPTS
        default ""
        help
-           Currently the unwind stuff seems to work for staticly linked apps
-           but not dynamic.  So use setjmp/longjmp exceptions by default.
+           Any additional gcc options you may want to include....
 
-config BR2_EXTRA_GCC_CONFIG_OPTIONS
-       string
-       prompt "Additional gcc options" if CONFIG_DEVEL
-       default ""
+config SSP_SUPPORT
+       bool
+       prompt "Enable Stack-Smashing Protection support" if TOOLCHAINOPTS
+       default n
        help
-           Any additional gcc options you may want to include....
+           Enable Stack-Smashing Protection support
 
-config BR2_INSTALL_LIBSTDCPP
+config TLS_SUPPORT
        bool
-       prompt "Build/install c++ compiler and libstdc++?" if CONFIG_DEVEL
+       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
        default y
        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 ?