X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=toolchain%2FConfig.in;h=95087b7078bbe22a838a51ef841cb2d00e5c96bc;hp=1e9460244dbf0f8e7c06b81d9dd9088c13cb688f;hb=0c9be4f76b25e1e69c878b2a7b50a17eb50bd9a6;hpb=a7780603923fddec225c9f4b0990fede4c2695a9 diff --git a/toolchain/Config.in b/toolchain/Config.in index 1e9460244d..95087b7078 100644 --- 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, the buildroot 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, the buildroot will compile using the native toolchain for your host instead of compiling one. config TARGET_NAME @@ -97,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 @@ -148,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 @@ -158,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 @@ -166,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, @@ -189,6 +206,7 @@ menuconfig EXTRA_TARGET_ARCH bool "n64" config MIPS64_ABI_N32 + depends on !LIBC_USE_MUSL bool "n32" config MIPS64_ABI_O32 @@ -206,33 +224,43 @@ comment "Compiler" source "toolchain/gcc/Config.in" +config NASM + bool + depends on ( i386 || x86_64 ) + prompt "Build nasm" if TOOLCHAINOPTS + default y + help + Enable if you want to build nasm + 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_GLIBC if powerpc64 default LIBC_USE_MUSL help Select the C library implementation. config LIBC_USE_GLIBC - bool "Use (e)glibc" + bool "Use glibc" select USE_GLIBC + depends on !arc 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 !(mips64 || mips64el) + depends on !(arc || powerpc64) endchoice -source "toolchain/glibc/Config.in" source "toolchain/uClibc/Config.in" source "toolchain/musl/Config.in" @@ -241,53 +269,40 @@ 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 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 - 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 || 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 +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)