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 faff3c8fbb2ac0bc312df87ef3bb64bdb744ba45..6dda9af92d6cbf6e25cb55b2f858c875fc51c4bb 100644 (file)
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -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
@@ -237,7 +231,7 @@ comment "C Library"
 
 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.
@@ -245,13 +239,6 @@ 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 || powerpc64)
-               depends on BROKEN || !(arm || armeb || i386 || x86_64 || mips || mipsel || mips64 || mips64el || powerpc)
 
        config LIBC_USE_MUSL
                select USE_MUSL
@@ -260,7 +247,6 @@ choice
 
 endchoice
 
-source "toolchain/uClibc/Config.in"
 source "toolchain/musl/Config.in"
 
 comment "Debuggers"
@@ -274,9 +260,6 @@ config GDB
          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
 
@@ -285,7 +268,7 @@ config USE_MUSL
        bool
 
 config SSP_SUPPORT
-       default y if USE_MUSL || GCC_LIBSSP
+       default y if !PKG_CC_STACKPROTECTOR_NONE
        bool
 
 config USE_EXTERNAL_LIBC
@@ -298,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)