X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=toolchain%2FConfig.in;h=82dddbc20963e81d00c067cd8eb621ec40760da3;hb=1138e0f8878fe402697fd4b8aceacec39fc28a00;hp=bf7b9c33d02c277b985d55c9a97b45c3652897db;hpb=0de93311e1575ab6f8e9e90b5023b6fb2cedcf1f;p=openwrt%2Fopenwrt.git

diff --git a/toolchain/Config.in b/toolchain/Config.in
index bf7b9c33d0..82dddbc209 100644
--- 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
@@ -262,13 +262,13 @@ choice
 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
@@ -286,6 +286,10 @@ config USE_MUSL
 	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
 	bool
 	default y if EXTERNAL_TOOLCHAIN || NATIVE_TOOLCHAIN