X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=toolchain%2FConfig.in;h=c7072fc17a583445efa5e152274505b273c9e486;hb=6f95d749d6a5c9cce47a14a926a378bc7621a049;hp=0d03a2872b205bf11068fcfae1ef2dc478822c22;hpb=3e2f57835342074a90843077c1c63c88a42e6217;p=openwrt%2Fopenwrt.git

diff --git a/toolchain/Config.in b/toolchain/Config.in
index 0d03a2872b..c7072fc17a 100644
--- 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,24 +210,27 @@ comment "C Library"
 
 choice
 	prompt "C Library implementation" if TOOLCHAINOPTS
-	default LIBC_USE_GLIBC if (aarch64 || aarch64_be)
+	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 glibc"
+		bool "Use (e)glibc"
 		select USE_GLIBC
-		depends on !avr32
+		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 || aarch64 || aarch64_be)
+		depends on !(arc || mips64 || mips64el)
 
 endchoice
 
@@ -241,7 +243,7 @@ comment "Debuggers"
 
 config GDB
 	bool
-	depends on !(avr32 || aarch64 || aarch64_be)
+	depends on !(aarch64 || aarch64_be)
 	prompt "Build gdb" if TOOLCHAINOPTS
 	default y if !EXTERNAL_TOOLCHAIN
 	help
@@ -257,19 +259,20 @@ config INSIGHT
 
 config USE_GLIBC
 	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 || mips64 || mips64el)
 	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"