X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=toolchain%2FConfig.in;h=13446ec9f5aab66fbd780985b48dddfb6000ef05;hb=55d4e79349b75522e4b29ea034f45583e8eeffc2;hp=a826ff531dc0ff9feba696112f0d96de91dc3864;hpb=386183ac6ece35c00b6f4d574548459e48d0e1ac;p=openwrt.git

diff --git a/toolchain/Config.in b/toolchain/Config.in
index a826ff531d..13446ec9f5 100644
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -86,15 +86,6 @@ 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
@@ -169,6 +160,7 @@ comment "Debuggers"
 
 config GDB
 	bool
+	depends !avr32
 	prompt "Build gdb" if TOOLCHAINOPTS
 	default n
 	help
@@ -184,7 +176,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"
 
@@ -206,8 +202,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)