X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=toolchain%2FConfig.in;h=8677b87e7effffda266e8166086dbfea293580db;hb=b7c862db6e04a60a845b27d5ab8a3e674b8048b3;hp=ef11c9cbae19a618f30eaa81559cdc93ab9564b8;hpb=71d003d3823d97241d04292a66cd5fe38c5b581e;p=openwrt.git

diff --git a/toolchain/Config.in b/toolchain/Config.in
index ef11c9cbae..8677b87e7e 100644
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -50,6 +50,17 @@ menuconfig EXTERNAL_TOOLCHAIN
 		default "/opt/cross/powerpc-unknown-linux-gnu"  if powerpc
 		default "/opt/cross/x86_64-unknown-linux-gnu"   if x86_64
 
+	config TOOLCHAIN_LIBC
+		string
+		prompt "Toolchain libc"  if DEVEL
+		depends EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN
+		default "uclibc"
+		help
+		  Specify the libc type used by the external toolchain. The given value us passed as -m
+		  flag to all gcc and g++ invocations. This is mainly intended for multilib toolchains
+		  which support glibc and uclibc at the same time. If no value is specified, no -m flag
+		  is passed.
+
 	config TOOLCHAIN_BIN_PATH
 		string
 		prompt "Toolchain program path"  if DEVEL
@@ -142,26 +153,26 @@ choice
 		bool "Use eglibc"
 		depends !avr32
 	
-	config USE_GLIBC
-		bool "Use glibc"
-		depends !avr32
-	
 	config USE_UCLIBC
 		bool "Use uClibc"
 
+	config USE_MUSL
+		bool "Use musl"
+
 endchoice
 
 source "toolchain/eglibc/Config.in"
-source "toolchain/glibc/Config.in"
 source "toolchain/uClibc/Config.in"
+source "toolchain/musl/Config.in"
 
 comment "Debuggers"
 	depends TOOLCHAINOPTS
 
 config GDB
 	bool
+	depends !avr32
 	prompt "Build gdb" if TOOLCHAINOPTS
-	default n
+	default y
 	help
 		Enable if you want to build the gdb
 
@@ -175,30 +186,35 @@ 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"
+source "toolchain/musl/Config.version"
 
 config LIBC
 	string
 	default "eglibc"  if USE_EGLIBC
-	default "glibc"   if USE_GLIBC
 	default "uClibc"  if USE_UCLIBC
+	default "musl"	  if USE_MUSL
 
 config LIBC_VERSION
 	string
 	default EGLIBC_VERSION  if USE_EGLIBC
-	default GLIBC_VERSION   if USE_GLIBC
 	default UCLIBC_VERSION  if USE_UCLIBC
+	default MUSL_VERSION	if USE_MUSL
 
 config TARGET_SUFFIX
 	string
-	default "gnueabi"         if (USE_EGLIBC || USE_GLIBC) && arm
-	default "gnu"             if (USE_EGLIBC || USE_GLIBC) && !arm
-	default "uclibcgnueabi"   if USE_UCLIBC && arm
-	default "uclibc"          if USE_UCLIBC && !arm
-
+	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)
+	default "muslgnueabi"     if USE_MUSL && (arm || armeb)
+	default "musl"            if USE_MUSL && !(arm || armeb)