X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=toolchain%2FConfig.in;h=d653aac5efc927f6cd1c98beaec4736baceb62a4;hb=9420ea6bf7f6aac39ec0cb088cb53e8e484b658f;hp=61a54a3532c4e309757e902d6a398094a5eecca8;hpb=9387289854f5aa1e33a21d8b787204fa19832b15;p=openwrt%2Fsvn-archive%2Farchive.git

diff --git a/toolchain/Config.in b/toolchain/Config.in
index 61a54a3532..d653aac5ef 100644
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -142,17 +142,12 @@ choice
 		bool "Use eglibc"
 		depends !avr32
 	
-	config USE_GLIBC
-		bool "Use glibc"
-		depends !avr32
-	
 	config USE_UCLIBC
 		bool "Use uClibc"
 
 endchoice
 
 source "toolchain/eglibc/Config.in"
-source "toolchain/glibc/Config.in"
 source "toolchain/uClibc/Config.in"
 
 comment "Debuggers"
@@ -160,6 +155,7 @@ comment "Debuggers"
 
 config GDB
 	bool
+	depends !avr32
 	prompt "Build gdb" if TOOLCHAINOPTS
 	default n
 	help
@@ -175,27 +171,30 @@ 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"
 
 source "toolchain/eglibc/Config.version"
-source "toolchain/glibc/Config.version"
 source "toolchain/uClibc/Config.version"
 
 config LIBC
 	string
 	default "eglibc"  if USE_EGLIBC
-	default "glibc"   if USE_GLIBC
 	default "uClibc"  if USE_UCLIBC
 
 config LIBC_VERSION
 	string
 	default EGLIBC_VERSION  if USE_EGLIBC
-	default GLIBC_VERSION   if USE_GLIBC
 	default UCLIBC_VERSION  if USE_UCLIBC
 
 config TARGET_SUFFIX
 	string
-	default "gnueabi"         if (USE_EGLIBC || USE_GLIBC)
-	default "uclibcgnueabi"   if USE_UCLIBC
+	default "gnueabi"         if (USE_EGLIBC) && (arm || armeb)
+	default "gnu"             if (USE_EGLIBC) && !(arm || armeb)
+	default "uclibcgnueabi"   if USE_UCLIBC && (arm || armeb)
+	default "uclibc"          if USE_UCLIBC && !(arm || armeb)