fortify-headers: update to 0.7

[openwrt/openwrt.git] / toolchain / Config.in

diff --git a/toolchain/Config.in b/toolchain/Config.in
index ecd9d200f177860d693fb95360b36d480c5cb6ff..1e9460244dbf0f8e7c06b81d9dd9088c13cb688f 100644 (file)
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -211,15 +211,14 @@ comment "C Library"
 
 choice
        prompt "C Library implementation" if TOOLCHAINOPTS
-       default LIBC_USE_EGLIBC if (aarch64 || aarch64_be)
-       default LIBC_USE_UCLIBC
+       default LIBC_USE_UCLIBC if mips64 || mips64el
+       default LIBC_USE_MUSL
        help
          Select the C library implementation.
 
-       config LIBC_USE_EGLIBC
-               bool "Use eglibc"
-               select USE_EGLIBC
-               depends on !avr32
+       config LIBC_USE_GLIBC
+               bool "Use (e)glibc"
+               select USE_GLIBC
 
        config LIBC_USE_UCLIBC
                select USE_UCLIBC
@@ -229,11 +228,11 @@ choice
        config LIBC_USE_MUSL
                select USE_MUSL
                bool "Use musl"
-               depends on !(mips64 || mips64el || aarch64 || aarch64_be)
+               depends on !(mips64 || mips64el)
 
 endchoice
 
-source "toolchain/eglibc/Config.in"
+source "toolchain/glibc/Config.in"
 source "toolchain/uClibc/Config.in"
 source "toolchain/musl/Config.in"
 
@@ -242,7 +241,7 @@ comment "Debuggers"
 
 config GDB
        bool
-       depends on !(avr32 || aarch64 || aarch64_be)
+       depends on !(aarch64 || aarch64_be)
        prompt "Build gdb" if TOOLCHAINOPTS
        default y if !EXTERNAL_TOOLCHAIN
        help
@@ -256,15 +255,15 @@ config INSIGHT
        help
          Enable if you want to build insight-gdb.
 
-config USE_EGLIBC
+config USE_GLIBC
        bool
-       default y if !TOOLCHAINOPTS && !EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN && (aarch64 || aarch64_be || octeon)
 
 config USE_UCLIBC
+       default y if !TOOLCHAINOPTS && !EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN && (mips64 || mips64el)
        bool
-       default y if !TOOLCHAINOPTS && !EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN && !(aarch64 || aarch64_be || octeon)
 
 config USE_MUSL
+       default y if !TOOLCHAINOPTS && !EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN && !(mips64 || mips64el)
        bool
 
 config USE_EXTERNAL_LIBC
@@ -273,26 +272,26 @@ config USE_EXTERNAL_LIBC
 
 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 && (arm || armeb)
-       default "gnu"             if USE_EGLIBC && !(arm || armeb)
+       default "gnueabi"         if USE_GLIBC && (arm || armeb)
+       default "gnu"             if USE_GLIBC && !(arm || armeb)
        default "uclibcgnueabi"   if USE_UCLIBC && (arm || armeb)
        default "uclibc"          if USE_UCLIBC && !(arm || armeb)
        default "muslgnueabi"     if USE_MUSL && (arm || armeb)