X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fstaging%2Flynxis%2Fomap.git;a=blobdiff_plain;f=toolchain%2FConfig.in;h=2d7fcc11c850451ac26e65359a7032d6d8d010dd;hp=c8a02f3a766ad28881f42823228655a43b377733;hb=8b5d644bb36846660e1fa20d38361fec12a14b28;hpb=dfd09fc76934cb65c3ac5435e1c41b1600f58e80

diff --git a/toolchain/Config.in b/toolchain/Config.in
index c8a02f3a76..2d7fcc11c8 100644
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -211,24 +211,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 (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 +244,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 +260,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"