glibc: update to latest 2.32 commit (bug 27256)

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

diff --git a/toolchain/Config.in b/toolchain/Config.in
index f6753ad8ba92d64c1a81b687852ad29bdcda9e05..6dda9af92d6cbf6e25cb55b2f858c875fc51c4bb 100644 (file)
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -42,7 +42,7 @@ menuconfig EXTERNAL_TOOLCHAIN
        bool
        prompt "Use external toolchain"  if DEVEL
        help
-         If enabled, LEDE will compile using an existing toolchain instead of
+         If enabled, the buildroot will compile using an existing toolchain instead of
          compiling one.
 
        config NATIVE_TOOLCHAIN
@@ -51,7 +51,7 @@ menuconfig EXTERNAL_TOOLCHAIN
                depends on EXTERNAL_TOOLCHAIN
                select NO_STRIP
                help
-                 If enabled, LEDE will compile using the native toolchain for your
+                 If enabled, the buildroot will compile using the native toolchain for your
                  host instead of compiling one.
 
        config TARGET_NAME
@@ -110,11 +110,6 @@ menuconfig EXTERNAL_TOOLCHAIN
                        bool "glibc"
                        select USE_GLIBC
 
-               config EXTERNAL_TOOLCHAIN_LIBC_USE_UCLIBC
-                       bool "uClibc"
-                       select USE_UCLIBC
-                       depends on !(aarch64 || aarch64_be)
-
                config EXTERNAL_TOOLCHAIN_LIBC_USE_MUSL
                        bool "musl"
                        select USE_MUSL
@@ -125,7 +120,6 @@ menuconfig EXTERNAL_TOOLCHAIN
                string
                depends on EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN
                default "glibc" if EXTERNAL_TOOLCHAIN_LIBC_USE_GLIBC
-               default "uclibc" if EXTERNAL_TOOLCHAIN_LIBC_USE_UCLIBC
                default "musl" if EXTERNAL_TOOLCHAIN_LIBC_USE_MUSL
 
        config TOOLCHAIN_BIN_PATH
@@ -168,7 +162,6 @@ menuconfig EXTRA_TARGET_ARCH
        bool
        prompt "Enable an extra toolchain target architecture" if TOOLCHAINOPTS
        depends on !sparc
-       default y       if powerpc64
        default n
        help
          Some builds may require a 'biarch' toolchain. This option
@@ -178,7 +171,6 @@ menuconfig EXTRA_TARGET_ARCH
 
        config EXTRA_TARGET_ARCH_NAME
                string
-               default "powerpc64"     if powerpc64
                prompt "Extra architecture name" if EXTRA_TARGET_ARCH
                help
                  Specify the cpu name (eg powerpc64 or x86_64) of the
@@ -186,7 +178,6 @@ menuconfig EXTRA_TARGET_ARCH
 
        config EXTRA_TARGET_ARCH_OPTS
                string
-               default "-m64"          if powerpc64
                prompt "Extra architecture compiler options" if EXTRA_TARGET_ARCH
                help
                  If you're specifying an addition target architecture,
@@ -227,20 +218,20 @@ comment "Compiler"
 
 source "toolchain/gcc/Config.in"
 
-config YASM
+config NASM
        bool
        depends on ( i386 || x86_64 )
-       prompt "Build yasm" if TOOLCHAINOPTS
+       prompt "Build nasm" if TOOLCHAINOPTS
        default y
        help
-         Enable if you want to build yasm
+         Enable if you want to build nasm
 
 comment "C Library"
        depends on TOOLCHAINOPTS
 
 choice
        prompt "C Library implementation" if TOOLCHAINOPTS
-       default LIBC_USE_UCLIBC if arc
+       default LIBC_USE_GLIBC if arc
        default LIBC_USE_MUSL
        help
          Select the C library implementation.
@@ -248,38 +239,27 @@ choice
        config LIBC_USE_GLIBC
                bool "Use glibc"
                select USE_GLIBC
-               depends on !arc
-
-       config LIBC_USE_UCLIBC
-               select USE_UCLIBC
-               bool "Use uClibc"
-               depends on !(aarch64 || aarch64_be)
-               depends on BROKEN || !(arm || armeb || i386 || x86_64 || mips || mipsel || mips64 || mips64el || powerpc)
 
        config LIBC_USE_MUSL
                select USE_MUSL
                bool "Use musl"
-               depends on !(arc)
+               depends on !arc
 
 endchoice
 
-source "toolchain/uClibc/Config.in"
+source "toolchain/musl/Config.in"
 
 comment "Debuggers"
        depends on TOOLCHAINOPTS
 
 config GDB
        bool
-       depends on !(aarch64 || aarch64_be)
        prompt "Build gdb" if TOOLCHAINOPTS
        default y if !EXTERNAL_TOOLCHAIN
        help
          Enable if you want to build the gdb.
 
 config USE_GLIBC
-       bool
-
-config USE_UCLIBC
        default y if !TOOLCHAINOPTS && !EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN && (arc)
        bool
 
@@ -287,6 +267,10 @@ config USE_MUSL
        default y if !TOOLCHAINOPTS && !EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN && !(arc)
        bool
 
+config SSP_SUPPORT
+       default y if !PKG_CC_STACKPROTECTOR_NONE
+       bool
+
 config USE_EXTERNAL_LIBC
        bool
        default y if EXTERNAL_TOOLCHAIN || NATIVE_TOOLCHAIN
@@ -297,15 +281,12 @@ source "toolchain/gcc/Config.version"
 config LIBC
        string
        default "glibc"   if USE_GLIBC
-       default "uClibc"  if USE_UCLIBC
        default "musl"    if USE_MUSL
 
 config TARGET_SUFFIX
        string
        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)
        default "musl"            if USE_MUSL && !(arm || armeb)