netifd: update to latest git HEAD

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

diff --git a/toolchain/Config.in b/toolchain/Config.in
index cb29fe5f42cd8d423ee94f6231f1bbfe45c78188..47e1c787df0d951418544f1c161c8aac2198cd76 100644 (file)
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -224,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
@@ -238,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.
@@ -250,13 +251,13 @@ 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
 
@@ -267,13 +268,13 @@ comment "Debuggers"
 
 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
+       default y if !TOOLCHAINOPTS && !EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN && (powerpc64)
        bool
 
 config USE_UCLIBC
@@ -281,7 +282,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