musl: improve crypt() size hack

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

diff --git a/toolchain/Config.in b/toolchain/Config.in
index 75dc5361a6829621030f710f497451b33a1aa1ec..82dddbc20963e81d00c067cd8eb621ec40760da3 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
@@ -147,7 +168,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
@@ -157,7 +177,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
@@ -165,7 +184,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,
@@ -206,13 +224,13 @@ 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
@@ -220,6 +238,7 @@ comment "C Library"
 choice
        prompt "C Library implementation" if TOOLCHAINOPTS
        default LIBC_USE_UCLIBC if arc
+       default LIBC_USE_GLIBC if powerpc64
        default LIBC_USE_MUSL
        help
          Select the C library implementation.
@@ -232,39 +251,31 @@ choice
        config LIBC_USE_UCLIBC
                select USE_UCLIBC
                bool "Use uClibc"
-               depends on !(aarch64 || aarch64_be)
+               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
                bool "Use musl"
-               depends on !(arc)
+               depends on !(arc || powerpc64)
 
 endchoice
 
-source "toolchain/glibc/Config.in"
 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 INSIGHT
-       bool
-       prompt "Build insight-gdb" if TOOLCHAINOPTS
-       select GDB
-       default n
-       help
-         Enable if you want to build insight-gdb.
-
 config USE_GLIBC
+       default y if !TOOLCHAINOPTS && !EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN && (powerpc64)
        bool
 
 config USE_UCLIBC
@@ -272,7 +283,11 @@ config USE_UCLIBC
        bool
 
 config USE_MUSL
-       default y if !TOOLCHAINOPTS && !EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN && !(arc)
+       default y if !TOOLCHAINOPTS && !EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN && !(arc || powerpc64)
+       bool
+
+config SSP_SUPPORT
+       default y if USE_MUSL || GCC_LIBSSP
        bool
 
 config USE_EXTERNAL_LIBC
@@ -282,22 +297,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)