toolchain/uClibc: handle different MIPS64 ABIs

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

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 962dd9cf9db3e51b88380a7620c2f867311318b3..585017586acae4a6f01bb85a1b65a161417bff05 100644 (file)
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -9,10 +9,7 @@ choice
 
        config GCC_VERSION_4_4_7
                bool "gcc 4.4.7"
 
        config GCC_VERSION_4_4_7
                bool "gcc 4.4.7"

-               depends (avr32 || ubicom32)
-
-       config GCC_VERSION_4_6_2
-               bool "gcc 4.6.2"
+               depends avr32

 
        config GCC_VERSION_4_6_3
                bool "gcc 4.6.3"
 
        config GCC_VERSION_4_6_3
                bool "gcc 4.6.3"


@@ -20,25 +17,20 @@ choice
        config GCC_VERSION_4_7_2
                bool "gcc 4.7.2"
 
        config GCC_VERSION_4_7_2
                bool "gcc 4.7.2"
 

-       config GCC_VERSION_4_5_LINARO
-               bool "gcc 4.5.x with Linaro enhancements"
-

        config GCC_VERSION_4_6_LINARO
                bool "gcc 4.6.x with Linaro enhancements"
 
        config GCC_VERSION_4_7_LINARO
                bool "gcc 4.7.x with Linaro enhancements"
 
        config GCC_VERSION_4_6_LINARO
                bool "gcc 4.6.x with Linaro enhancements"
 
        config GCC_VERSION_4_7_LINARO
                bool "gcc 4.7.x with Linaro enhancements"
 

-       config GCC_VERSION_LLVM
-               bool "llvm-gcc 4.2"
-               depends BROKEN
+       config GCC_VERSION_4_8_0
+               bool "gcc 4.8.0"

 
 endchoice
 
 config GCC_USE_GRAPHITE
        bool
        prompt "Compile in support for the new Graphite framework in GCC 4.4+" if TOOLCHAINOPTS
 
 endchoice
 
 config GCC_USE_GRAPHITE
        bool
        prompt "Compile in support for the new Graphite framework in GCC 4.4+" if TOOLCHAINOPTS

-       depends !GCC_VERSION_LLVM

 
 config GCC_USE_SYSTEM_PPL_CLOOG
        bool
 
 config GCC_USE_SYSTEM_PPL_CLOOG
        bool


@@ -79,13 +71,12 @@ config SJLJ_EXCEPTIONS
 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

-       default y
+       default y if !USE_MUSL

        help
            Build/install c++ compiler and libstdc++?
 
 config INSTALL_LIBGCJ
        bool
        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
        prompt "Build/install java compiler and GNU classpath ?" if TOOLCHAINOPTS
        default n
        help