X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=toolchain%2FConfig.in;h=49c3461a1bb647504af7a095db31d9ed4048f003;hb=0ff7597fcde5d14008f4c4c9290de485d408c679;hp=adc2b29e12d693b58ca06bfb2e01a5bed7a73024;hpb=8e97f87640a10336ac02cb0de246737bf9ed7ff9;p=openwrt.git

diff --git a/toolchain/Config.in b/toolchain/Config.in
index adc2b29e12..49c3461a1b 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
@@ -189,6 +188,7 @@ menuconfig EXTRA_TARGET_ARCH
 			bool "n64"
 
 		config MIPS64_ABI_N32
+			depends on !LIBC_USE_MUSL
 			bool "n32"
 
 		config MIPS64_ABI_O32
@@ -211,7 +211,7 @@ comment "C Library"
 
 choice
 	prompt "C Library implementation" if TOOLCHAINOPTS
-	default LIBC_USE_GLIBC if mips64 || mips64el
+	default LIBC_USE_UCLIBC if arc
 	default LIBC_USE_MUSL
 	help
 	  Select the C library implementation.
@@ -219,22 +219,23 @@ choice
 	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)
 
 endchoice
 
 source "toolchain/glibc/Config.in"
 source "toolchain/uClibc/Config.in"
-source "toolchain/musl/Config.in"
 
 comment "Debuggers"
 	depends on TOOLCHAINOPTS
@@ -259,17 +260,18 @@ config USE_GLIBC
 	bool
 
 config USE_UCLIBC
-	default y if !TOOLCHAINOPTS && !EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN && (mips64 || mips64el)
+	default y if !TOOLCHAINOPTS && !EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN && (arc)
 	bool
 
 config USE_MUSL
-	default y if !TOOLCHAINOPTS && !EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN && !(mips64 || mips64el)
+	default y if !TOOLCHAINOPTS && !EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN && !(arc)
 	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"