toolchain: use latest glibc 2.21 and 2.22 revisions

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

diff --git a/toolchain/Config.in b/toolchain/Config.in
index 7b365e4c5e613ec28306f810117dfbdcc85d3166..d1de8f37be2643405829a4bf7e4288f4321c7944 100644 (file)
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -28,7 +28,6 @@ menuconfig TARGET_OPTIONS
        config USE_MIPS16
                bool "Build packages with MIPS16 instructions" if TARGET_OPTIONS
                depends on HAS_MIPS16
-               depends on !GCC_VERSION_4_6
                default y
                help
                  If your target CPU does support the MIPS16 instruction set
@@ -211,30 +210,32 @@ comment "C Library"
 
 choice
        prompt "C Library implementation" if TOOLCHAINOPTS
-       default LIBC_USE_GLIBC if (aarch64 || aarch64_be)
-       default LIBC_USE_UCLIBC
+       default LIBC_USE_GLIBC if mips64 || mips64el
+       default LIBC_USE_UCLIBC if arc
+       default LIBC_USE_MUSL
        help
          Select the C library implementation.
 
        config LIBC_USE_GLIBC
                bool "Use (e)glibc"
                select USE_GLIBC
+               depends on !arc
 
        config LIBC_USE_UCLIBC
                select USE_UCLIBC
                bool "Use uClibc"
                depends on !(aarch64 || aarch64_be)
+               depends on BROKEN || !(arm || armeb || i386 || x86_64 || mips || mipsel || mips64 || mips64el || powerpc)
 
        config LIBC_USE_MUSL
                select USE_MUSL
                bool "Use musl"
-               depends on !(mips64 || mips64el)
+               depends on !(arc || mips64 || mips64el)
 
 endchoice
 
 source "toolchain/glibc/Config.in"
 source "toolchain/uClibc/Config.in"
-source "toolchain/musl/Config.in"
 
 comment "Debuggers"
        depends on TOOLCHAINOPTS
@@ -256,20 +257,22 @@ config INSIGHT
          Enable if you want to build insight-gdb.
 
 config USE_GLIBC
+       default y if !TOOLCHAINOPTS && !EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN && (mips64 || mips64el)
        bool
-       default y if !TOOLCHAINOPTS && !EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN && (aarch64 || aarch64_be || octeon)
 
 config USE_UCLIBC
+       default y if !TOOLCHAINOPTS && !EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN && (arc)
        bool
-       default y if !TOOLCHAINOPTS && !EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN && !(aarch64 || aarch64_be || octeon)
 
 config USE_MUSL
+       default y if !TOOLCHAINOPTS && !EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN && !(arc || mips64 || mips64el)
        bool
 
 config USE_EXTERNAL_LIBC
        bool
        default y if EXTERNAL_TOOLCHAIN || NATIVE_TOOLCHAIN
 
+source "toolchain/binutils/Config.version"
 source "toolchain/gcc/Config.version"
 
 source "toolchain/glibc/Config.version"