From 111e0d7f09b5273a64e00e55210b6e5d747e6b90 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 4 Mar 2014 11:17:27 +0100 Subject: be consistent with names for the ABI --- target/config/Config.in | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'target/config/Config.in') diff --git a/target/config/Config.in b/target/config/Config.in index 44ee685fe..1eda1e3a4 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -117,14 +117,20 @@ config ADK_n32 config ADK_n64 boolean +config ADK_eabi + boolean + +config ADK_eabihf + boolean + config ADK_TARGET_ABI string default "n32" if ADK_n32 default "n64" if ADK_n64 default "32" if ADK_32 default "x32" if ADK_x32 - default "eabi" if ADK_EABI - default "eabihf" if ADK_EABIHF + default "eabi" if ADK_eabi + default "eabihf" if ADK_eabihf config ADK_TARGET_MIPS_ABI depends on ADK_TARGET_KERNEL64 && ADK_LINUX_MIPS @@ -251,19 +257,19 @@ depends on ADK_TARGET_SYSTEM_QEMU_ARM config ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB boolean "ARM Ltd. Versatile/PB" select ADK_soft_float - select ADK_EABI + select ADK_eabi select ADK_CPU_ARM926EJ_S config ADK_TARGET_QEMU_ARM_MODEL_VEXPRESS_A9 boolean "ARM Ltd. Versatile Express for Cortex-A9" select ADK_hard_float - select ADK_EABIHF + select ADK_eabihf select ADK_CPU_CORTEX_A9 config ADK_TARGET_QEMU_ARM_MODEL_SPITZ boolean "Xscale PXA270 Spitz PDA" select ADK_soft_float - select ADK_EABI + select ADK_eabi select ADK_CPU_XSCALE select ADK_TARGET_WITH_VGA @@ -387,12 +393,6 @@ config ADK_TARGET_KERNEL_MAY_64BIT config ADK_TOOLCHAIN_ONLY boolean -config ADK_EABI - boolean - -config ADK_EABIHF - boolean - config ADK_LINUX_64 boolean @@ -700,24 +700,24 @@ endchoice config ADK_TARGET_SUFFIX string - default "gnueabihf" if ADK_TARGET_LIB_GLIBC && ADK_EABIHF - default "gnueabi" if ADK_TARGET_LIB_GLIBC && ADK_EABI + default "gnueabihf" if ADK_TARGET_LIB_GLIBC && ADK_eabihf + default "gnueabi" if ADK_TARGET_LIB_GLIBC && ADK_eabi default "gnuabi64" if ADK_TARGET_LIB_GLIBC && ADK_n64 && ADK_TARGET_KERNEL64 default "gnuabin32" if ADK_TARGET_LIB_GLIBC && ADK_n32 && ADK_TARGET_KERNEL64 default "gnuabi32" if ADK_TARGET_LIB_GLIBC && ADK_o32 && ADK_TARGET_KERNEL64 default "gnu32" if ADK_TARGET_LIB_GLIBC && ADK_32 && ADK_TARGET_KERNEL64 default "gnux32" if ADK_TARGET_LIB_GLIBC && ADK_x32 && ADK_TARGET_KERNEL64 default "gnu" if ADK_TARGET_LIB_GLIBC - default "uclibcgnueabihf" if ADK_TARGET_LIB_UCLIBC && ADK_EABIHF - default "uclibcgnueabi" if ADK_TARGET_LIB_UCLIBC && ADK_EABI + default "uclibcgnueabihf" if ADK_TARGET_LIB_UCLIBC && ADK_eabihf + default "uclibcgnueabi" if ADK_TARGET_LIB_UCLIBC && ADK_eabi default "uclibcabi64" if ADK_TARGET_LIB_UCLIBC && ADK_n64 && ADK_TARGET_KERNEL64 default "uclibcabin32" if ADK_TARGET_LIB_UCLIBC && ADK_n32 && ADK_TARGET_KERNEL64 default "uclibcabi32" if ADK_TARGET_LIB_UCLIBC && ADK_o32 && ADK_TARGET_KERNEL64 default "uclibc32" if ADK_TARGET_LIB_UCLIBC && ADK_32 && ADK_TARGET_KERNEL64 default "uclibcx32" if ADK_TARGET_LIB_UCLIBC && ADK_x32 && ADK_TARGET_KERNEL64 default "uclibc" if ADK_TARGET_LIB_UCLIBC - default "muslgnueabihf" if ADK_TARGET_LIB_MUSL && ADK_EABIHF - default "muslgnueabi" if ADK_TARGET_LIB_MUSL && ADK_EABI + default "muslgnueabihf" if ADK_TARGET_LIB_MUSL && ADK_eabihf + default "muslgnueabi" if ADK_TARGET_LIB_MUSL && ADK_eabi default "muslabi64" if ADK_TARGET_LIB_MUSL && ADK_n64 && ADK_TARGET_KERNEL64 default "muslabin32" if ADK_TARGET_LIB_MUSL && ADK_n32 && ADK_TARGET_KERNEL64 default "muslabi32" if ADK_TARGET_LIB_MUSL && ADK_o32 && ADK_TARGET_KERNEL64 -- cgit v1.2.3 From 7d2b38ba6e51a5da5250ef394b9fe69a72783459 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 4 Mar 2014 17:47:21 +0100 Subject: fix qemu-ppc64 building on Darwin, use --with-cpu=ultrasparc for qemu-sparc64, still another issue exist. --- target/config/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'target/config/Config.in') diff --git a/target/config/Config.in b/target/config/Config.in index c8e566cc8..ab6bf353b 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -579,7 +579,7 @@ config ADK_TARGET_CFLAGS default "-march=atom" if ADK_CPU_ATOM default "-march=amdfam10" if ADK_CPU_AMDFAM10 default "-mcpu=v8" if ADK_CPU_SPARC_V8 - default "-m64 -mcpu=v9" if ADK_CPU_SPARC_V9 + default "-m64 -mcpu=ultrasparc" if ADK_CPU_SPARC_V9 default "-march=loongson2f -Wa,-mfix-loongson2f-nop" if ADK_CPU_LOONGSON2F default "-march=mips32" if ADK_CPU_MIPS32 default "-march=mips64" if ADK_CPU_MIPS64 -- cgit v1.2.3