toolchain: include yasm in x86 toolchain

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

diff --git a/toolchain/Config.in b/toolchain/Config.in
index 1e9460244dbf0f8e7c06b81d9dd9088c13cb688f..7cc51a1bb10a7990bf47c4b59e20e5f2e98acf8b 100644 (file)
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -28,7 +28,6 @@ menuconfig TARGET_OPTIONS
        config USE_MIPS16
                bool "Build packages with MIPS16 instructions" if TARGET_OPTIONS
                depends on HAS_MIPS16
-               depends on !GCC_VERSION_4_6
                default y
                help
                  If your target CPU does support the MIPS16 instruction set
@@ -43,7 +42,7 @@ menuconfig EXTERNAL_TOOLCHAIN
        bool
        prompt "Use external toolchain"  if DEVEL
        help
-         If enabled, OpenWrt will compile using an existing toolchain instead of
+         If enabled, LEDE will compile using an existing toolchain instead of
          compiling one.
 
        config NATIVE_TOOLCHAIN
@@ -52,7 +51,7 @@ menuconfig EXTERNAL_TOOLCHAIN
                depends on EXTERNAL_TOOLCHAIN
                select NO_STRIP
                help
-                 If enabled, OpenWrt will compile using the native toolchain for your
+                 If enabled, LEDE will compile using the native toolchain for your
                  host instead of compiling one.
 
        config TARGET_NAME
@@ -189,6 +188,7 @@ menuconfig EXTRA_TARGET_ARCH
                        bool "n64"
 
                config MIPS64_ABI_N32
+                       depends on !LIBC_USE_MUSL
                        bool "n32"
 
                config MIPS64_ABI_O32
@@ -206,12 +206,20 @@ 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
 
 choice
        prompt "C Library implementation" if TOOLCHAINOPTS
-       default LIBC_USE_UCLIBC if mips64 || mips64el
+       default LIBC_USE_UCLIBC if arc
        default LIBC_USE_MUSL
        help
          Select the C library implementation.
@@ -219,22 +227,23 @@ choice
        config LIBC_USE_GLIBC
                bool "Use (e)glibc"
                select USE_GLIBC
+               depends on !arc
 
        config LIBC_USE_UCLIBC
                select USE_UCLIBC
                bool "Use uClibc"
                depends on !(aarch64 || aarch64_be)
+               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 !(mips64 || mips64el)
+               depends on !(arc)
 
 endchoice
 
 source "toolchain/glibc/Config.in"
 source "toolchain/uClibc/Config.in"
-source "toolchain/musl/Config.in"
 
 comment "Debuggers"
        depends on TOOLCHAINOPTS
@@ -259,17 +268,18 @@ config USE_GLIBC
        bool
 
 config USE_UCLIBC
-       default y if !TOOLCHAINOPTS && !EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN && (mips64 || mips64el)
+       default y if !TOOLCHAINOPTS && !EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN && (arc)
        bool
 
 config USE_MUSL
-       default y if !TOOLCHAINOPTS && !EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN && !(mips64 || mips64el)
+       default y if !TOOLCHAINOPTS && !EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN && !(arc)
        bool
 
 config USE_EXTERNAL_LIBC
        bool
        default y if EXTERNAL_TOOLCHAIN || NATIVE_TOOLCHAIN
 
+source "toolchain/binutils/Config.version"
 source "toolchain/gcc/Config.version"
 
 source "toolchain/glibc/Config.version"