diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-02 08:49:37 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-02 08:49:37 +0100 |
commit | 4e2469a90193a1b4f8733b6de2238ce9b897bf90 (patch) | |
tree | f53d30478a6ca9fbf26e8d892d99c7f41a5d3302 /target/config | |
parent | 32e00c4479ec1ccc5914c4949c42ee54e4f6a728 (diff) | |
parent | f5a8c46a5e05beadcbd2e7e2ff486974e39059fd (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target/config')
-rw-r--r-- | target/config/Config.in | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/target/config/Config.in b/target/config/Config.in index 09dbef1e3..2982fd088 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -127,6 +127,7 @@ config ADK_TARGET_ABI default "eabihf" if ADK_EABIHF config ADK_TARGET_MIPS_ABI + depends on ADK_TARGET_KERNEL64 && ADK_LINUX_MIPS string default "32" if ADK_o32 default "n32" if ADK_n32 @@ -179,12 +180,12 @@ endchoice config ADK_TARGET_LIBC_PATH string default "lib32" if ADK_n32 + default "lib" if ADK_x32 default "lib64" if ADK_n64 \ || ADK_64 \ || ADK_LINUX_SPARC64 \ || ADK_LINUX_PPC64 \ || ADK_LINUX_X86_64 - default "libx32" if ADK_x32 default "lib" @@ -208,6 +209,7 @@ config ADK_TARGET_KERNEL_MINICONFIG default "qemu-sparc" if ADK_TARGET_SYSTEM_QEMU_SPARC default "qemu-sparc64" if ADK_TARGET_SYSTEM_QEMU_SPARC64 default "qemu-i686" if ADK_TARGET_SYSTEM_QEMU_I686 + default "qemu-x86_64" if ADK_TARGET_SYSTEM_QEMU_X86_64 default "cubox-i" if ADK_TARGET_SYSTEM_CUBOX_I default "raspberry-pi" if ADK_TARGET_SYSTEM_RASPBERRY_PI default "sharp-zaurus" if ADK_TARGET_SYSTEM_SHARP_ZAURUS @@ -725,15 +727,22 @@ config ADK_TARGET_SUFFIX string default "gnueabihf" if (ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC) && ADK_EABIHF default "gnueabi" if (ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC) && ADK_EABI + default "gnuabi64" if (ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC) && ADK_n64 + default "gnuabin32" if (ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC) && ADK_n32 + default "gnuabi32" if (ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC) && ADK_o32 default "gnu" if (ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC) && !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 + default "uclibcabin32" if ADK_TARGET_LIB_UCLIBC && ADK_n32 + default "uclibcabi32" if ADK_TARGET_LIB_UCLIBC && ADK_o32 default "uclibc" if ADK_TARGET_LIB_UCLIBC && !ADK_EABI default "muslgnueabihf" if ADK_TARGET_LIB_MUSL && ADK_EABIHF default "muslgnueabi" if ADK_TARGET_LIB_MUSL && ADK_EABI - default "musl" if ADK_TARGET_LIB_MUSL && !ADK_EABI - default "n64" if ADK_n64 - default "n32" if ADK_n32 + default "muslabi64" if ADK_TARGET_LIB_MUSL && ADK_n64 + default "muslabin32" if ADK_TARGET_LIB_MUSL && ADK_n32 + default "muslabi32" if ADK_TARGET_LIB_MUSL && ADK_o32 + default "musl" if ADK_TARGET_LIB_MUSL default "32" if ADK_32 default "x32" if ADK_x32 default "gnu" |