buildroot: allow specifying libc personality for external toolchains

[openwrt.git] / toolchain / Config.in

diff --git a/toolchain/Config.in b/toolchain/Config.in
index 3ff4804..8677b87 100644 (file)
--- 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
@@ -86,11 +97,6 @@ menuconfig TOOLCHAINOPTS
        bool "Toolchain Options"  if DEVEL
        depends NEED_TOOLCHAIN
 
-config EABI_SUPPORT
-       bool
-       depends arm||armeb
-       default y
-
 menuconfig EXTRA_TARGET_ARCH
        bool
        prompt "Enable an extra toolchain target architecture" if TOOLCHAINOPTS
@@ -147,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
 
@@ -180,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) && 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 && (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)