glibc: update to version 2.25

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

diff --git a/toolchain/Config.in b/toolchain/Config.in
index a6aa84db75a40f9cefd4db839326066c60140a26..cb645877defc1fd6c2ba7d829ccd54ee5692817d 100644 (file)
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -96,17 +96,38 @@ 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
+       choice TOOLCHAIN_LIBC_TYPE
                prompt "Toolchain libc"  if DEVEL
                depends on EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN
-               default "uclibc"
+               default EXTERNAL_TOOLCHAIN_LIBC_USE_MUSL
                help
                  Specify the libc type used by the external toolchain. The given value
                  is 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 EXTERNAL_TOOLCHAIN_LIBC_USE_GLIBC
+                       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
+
+       endchoice
+
+       config TOOLCHAIN_LIBC
+               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
                string
                prompt "Toolchain program path"  if DEVEL
@@ -206,6 +227,14 @@ comment "Compiler"
 
 source "toolchain/gcc/Config.in"
 
+config YASM
+       bool
+       depends on ( i386 || x86_64 )
+       prompt "Build yasm" if TOOLCHAINOPTS
+       default y
+       help
+         Enable if you want to build yasm
+
 comment "C Library"
        depends on TOOLCHAINOPTS
 
@@ -217,7 +246,7 @@ choice
          Select the C library implementation.
 
        config LIBC_USE_GLIBC
-               bool "Use (e)glibc"
+               bool "Use glibc"
                select USE_GLIBC
                depends on !arc
 
@@ -234,7 +263,6 @@ choice
 
 endchoice
 
-source "toolchain/glibc/Config.in"
 source "toolchain/uClibc/Config.in"
 
 comment "Debuggers"
@@ -274,22 +302,12 @@ config USE_EXTERNAL_LIBC
 source "toolchain/binutils/Config.version"
 source "toolchain/gcc/Config.version"
 
-source "toolchain/glibc/Config.version"
-source "toolchain/uClibc/Config.version"
-source "toolchain/musl/Config.version"
-
 config LIBC
        string
        default "glibc"   if USE_GLIBC
        default "uClibc"  if USE_UCLIBC
        default "musl"    if USE_MUSL
 
-config LIBC_VERSION
-       string
-       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_GLIBC && (arm || armeb)