From f8f3c05e56959f297edebe6438bd4f8c988f1e6e Mon Sep 17 00:00:00 2001 From: jow Date: Wed, 20 Feb 2013 15:06:10 +0000 Subject: buildroot: allow specifying libc personality for external toolchains git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35703 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- toolchain/Config.in | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'toolchain/Config.in') diff --git a/toolchain/Config.in b/toolchain/Config.in index 32de4b164..8677b87e7 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -50,6 +50,17 @@ 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 + prompt "Toolchain libc" if DEVEL + depends EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN + default "uclibc" + help + Specify the libc type used by the external toolchain. The given value us 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 TOOLCHAIN_BIN_PATH string prompt "Toolchain program path" if DEVEL -- cgit v1.2.3 From f335e5894fc9cd8087ba8d48e33708fe70630229 Mon Sep 17 00:00:00 2001 From: florian Date: Fri, 5 Apr 2013 12:36:23 +0000 Subject: toolchain: allow choosing the MIPS64 user-land ABI Signed-off-by: Florian Fainelli git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36205 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- toolchain/Config.in | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'toolchain/Config.in') diff --git a/toolchain/Config.in b/toolchain/Config.in index 8677b87e7..e32364095 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -130,6 +130,25 @@ menuconfig EXTRA_TARGET_ARCH both powerpc and powerpc64 binaries, you'll need to specify -m64 here. + + choice + prompt "MIPS64 user-land ABI" if TOOLCHAINOPTS && (mips64 || mips64el) + default MIPS64_ABI_N64 + help + MIPS64 supports 3 different user-land ABIs: o32 (legacy), + n32 and n64. + + config MIPS64_ABI_N64 + bool "n64" + + config MIPS64_ABI_N32 + bool "n32" + + config MIPS64_ABI_O32 + bool "o32" + + endchoice + comment "Binary tools" depends TOOLCHAINOPTS @@ -218,3 +237,11 @@ config TARGET_SUFFIX default "uclibc" if USE_UCLIBC && !(arm || armeb) default "muslgnueabi" if USE_MUSL && (arm || armeb) default "musl" if USE_MUSL && !(arm || armeb) + +config MIPS64_ABI + depends mips64 || mips64el + string + default "64" if MIPS64_ABI_N64 + default "n32" if MIPS64_ABI_N32 + default "32" if MIPS64_ABI_O32 + default "64" -- cgit v1.2.3 From f38f3dd61288491823b088fdb3b67e084ef4afd5 Mon Sep 17 00:00:00 2001 From: florian Date: Fri, 5 Apr 2013 12:36:26 +0000 Subject: toolchain: musl is not available on MIPS64 Signed-off-by: Florian Fainelli git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36206 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- toolchain/Config.in | 1 + 1 file changed, 1 insertion(+) (limited to 'toolchain/Config.in') diff --git a/toolchain/Config.in b/toolchain/Config.in index e32364095..cbac108cd 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -177,6 +177,7 @@ choice config USE_MUSL bool "Use musl" + depends !(mips64 || mips64el) endchoice -- cgit v1.2.3 From cac6e3495f74f87646f4d177eb2c978feb5d3fdd Mon Sep 17 00:00:00 2001 From: nbd Date: Wed, 17 Apr 2013 15:36:41 +0000 Subject: build: consistently use 'depends on' instead of 'depends' make the syntax more compatible with kernel menuconfig Signed-off-by: Felix Fietkau git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36351 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- toolchain/Config.in | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'toolchain/Config.in') diff --git a/toolchain/Config.in b/toolchain/Config.in index cbac108cd..941330024 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -9,7 +9,7 @@ menuconfig EXTERNAL_TOOLCHAIN config NATIVE_TOOLCHAIN bool prompt "Use host's toolchain" if DEVEL - depends EXTERNAL_TOOLCHAIN + depends on EXTERNAL_TOOLCHAIN select NO_STRIP help If enabled, OpenWrt will compile using the native toolchain for your host instead of compiling one @@ -17,7 +17,7 @@ menuconfig EXTERNAL_TOOLCHAIN config TARGET_NAME string prompt "Target name" if DEVEL - depends EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN + depends on EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN default "arm-unknown-linux-gnu" if arm default "armeb-unknown-linux-gnu" if armeb default "i486-unknown-linux-gnu" if i386 @@ -29,7 +29,7 @@ menuconfig EXTERNAL_TOOLCHAIN config TOOLCHAIN_PREFIX string prompt "Toolchain prefix" if DEVEL - depends EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN + depends on EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN default "arm-unknown-linux-gnu-" if arm default "armeb-unknown-linux-gnu-" if armeb default "i486-unknown-linux-gnu-" if i386 @@ -41,7 +41,7 @@ menuconfig EXTERNAL_TOOLCHAIN config TOOLCHAIN_ROOT string prompt "Toolchain root" if DEVEL - depends EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN + depends on EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN default "/opt/cross/arm-unknown-linux-gnu" if arm default "/opt/cross/armeb-unknown-linux-gnu" if armeb default "/opt/cross/i486-unknown-linux-gnu" if i386 @@ -53,7 +53,7 @@ menuconfig EXTERNAL_TOOLCHAIN config TOOLCHAIN_LIBC string prompt "Toolchain libc" if DEVEL - depends EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN + depends on EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN default "uclibc" help Specify the libc type used by the external toolchain. The given value us passed as -m @@ -64,7 +64,7 @@ menuconfig EXTERNAL_TOOLCHAIN config TOOLCHAIN_BIN_PATH string prompt "Toolchain program path" if DEVEL - depends EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN + depends on EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN default "./usr/bin ./bin" help Specify additional directories searched for toolchain binaries (override PATH) @@ -73,7 +73,7 @@ menuconfig EXTERNAL_TOOLCHAIN config TOOLCHAIN_INC_PATH string prompt "Toolchain include path" if DEVEL - depends EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN + depends on EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN default "./usr/include ./include" help Specify additional directories searched for header files (override CPPFLAGS) @@ -82,7 +82,7 @@ menuconfig EXTERNAL_TOOLCHAIN config TOOLCHAIN_LIB_PATH string prompt "Toolchain library path" if DEVEL - depends EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN + depends on EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN default "./usr/lib ./lib" help Specify additional directories searched for libraries (override LDFLAGS) @@ -90,17 +90,17 @@ menuconfig EXTERNAL_TOOLCHAIN config NEED_TOOLCHAIN bool - depends DEVEL + depends on DEVEL default y if !EXTERNAL_TOOLCHAIN menuconfig TOOLCHAINOPTS bool "Toolchain Options" if DEVEL - depends NEED_TOOLCHAIN + depends on NEED_TOOLCHAIN menuconfig EXTRA_TARGET_ARCH bool prompt "Enable an extra toolchain target architecture" if TOOLCHAINOPTS - depends !sparc + depends on !sparc default y if powerpc64 default n help @@ -150,17 +150,17 @@ menuconfig EXTRA_TARGET_ARCH endchoice comment "Binary tools" - depends TOOLCHAINOPTS + depends on TOOLCHAINOPTS source "toolchain/binutils/Config.in" comment "Compiler" - depends TOOLCHAINOPTS + depends on TOOLCHAINOPTS source "toolchain/gcc/Config.in" comment "C Library" - depends TOOLCHAINOPTS + depends on TOOLCHAINOPTS choice prompt "C Library implementation" if TOOLCHAINOPTS @@ -170,14 +170,14 @@ choice config USE_EGLIBC bool "Use eglibc" - depends !avr32 + depends on !avr32 config USE_UCLIBC bool "Use uClibc" config USE_MUSL bool "Use musl" - depends !(mips64 || mips64el) + depends on !(mips64 || mips64el) endchoice @@ -186,11 +186,11 @@ source "toolchain/uClibc/Config.in" source "toolchain/musl/Config.in" comment "Debuggers" - depends TOOLCHAINOPTS + depends on TOOLCHAINOPTS config GDB bool - depends !avr32 + depends on !avr32 prompt "Build gdb" if TOOLCHAINOPTS default y help @@ -240,7 +240,7 @@ config TARGET_SUFFIX default "musl" if USE_MUSL && !(arm || armeb) config MIPS64_ABI - depends mips64 || mips64el + depends on mips64 || mips64el string default "64" if MIPS64_ABI_N64 default "n32" if MIPS64_ABI_N32 -- cgit v1.2.3 From 976215a02136bd8bbc7df77c2880ac3ce1e4eedc Mon Sep 17 00:00:00 2001 From: nbd Date: Thu, 18 Apr 2013 12:05:08 +0000 Subject: toolchain: get rid of libc implementation symbol overloading git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36360 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- toolchain/Config.in | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) (limited to 'toolchain/Config.in') diff --git a/toolchain/Config.in b/toolchain/Config.in index 941330024..05cc350f2 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -164,19 +164,22 @@ comment "C Library" choice prompt "C Library implementation" if TOOLCHAINOPTS - default USE_UCLIBC + default LIBC_USE_UCLIBC help Select the C library implementation. - config USE_EGLIBC + config LIBC_USE_EGLIBC bool "Use eglibc" + select USE_EGLIBC depends on !avr32 - - config USE_UCLIBC + + config LIBC_USE_UCLIBC + select USE_UCLIBC bool "Use uClibc" - config USE_MUSL + config LIBC_USE_MUSL bool "Use musl" + select USE_MUSL depends on !(mips64 || mips64el) endchoice @@ -204,10 +207,16 @@ config INSIGHT help Enable if you want to build insight-gdb +config USE_EGLIBC + bool + config USE_UCLIBC bool default y if !TOOLCHAINOPTS && !EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN +config USE_MUSL + bool + config USE_EXTERNAL_LIBC bool default y if EXTERNAL_TOOLCHAIN || NATIVE_TOOLCHAIN -- cgit v1.2.3