X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/dce027fbeaa892800ef9b4d2e8de01be6d4f0d91..11ca062eff1ba686248c93be0da34f1a755286c2:/toolchain/Config.in

diff --git a/toolchain/Config.in b/toolchain/Config.in
index aaf4f4700..c027be821 100644
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -86,18 +86,10 @@ menuconfig TOOLCHAINOPTS
 	bool "Toolchain Options"  if DEVEL
 	depends NEED_TOOLCHAIN
 
-config EABI_SUPPORT
-	bool
-	depends arm||armeb
-	prompt "Enable EABI support" if TOOLCHAINOPTS
-	default n if TARGET_gemini
-	default y
-	help
-	  Enable ARM EABI support
-
 menuconfig EXTRA_TARGET_ARCH
 	bool
 	prompt "Enable an extra toolchain target architecture" if TOOLCHAINOPTS
+	depends !sparc
 	default y	if powerpc64
 	default n
 	help
@@ -183,7 +175,11 @@ config INSIGHT
 
 config USE_UCLIBC
 	bool
-	default y if !TOOLCHAINOPTS
+	default y if !TOOLCHAINOPTS && !EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN
+
+config USE_EXTERNAL_LIBC
+	bool
+	default y if EXTERNAL_TOOLCHAIN || NATIVE_TOOLCHAIN
 
 source "toolchain/gcc/Config.version"
 
@@ -205,8 +201,7 @@ config LIBC_VERSION
 
 config TARGET_SUFFIX
 	string
-	default "gnueabi"         if (USE_EGLIBC || USE_GLIBC) && EABI_SUPPORT
-	default "gnu"             if (USE_EGLIBC || USE_GLIBC) && !EABI_SUPPORT
-	default "uclibcgnueabi"   if USE_UCLIBC && EABI_SUPPORT
-	default "uclibc"          if USE_UCLIBC && !EABI_SUPPORT
-
+	default "gnueabi"         if (USE_EGLIBC || USE_GLIBC) && (arm || armeb)
+	default "gnu"             if (USE_EGLIBC || USE_GLIBC) && !(arm || armeb)
+	default "uclibcgnueabi"   if USE_UCLIBC && (arm || armeb)
+	default "uclibc"          if USE_UCLIBC && !(arm || armeb)