diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-14 11:59:46 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-14 11:59:46 +0200 |
| commit | 47113d6f632cdbf53b495905f9433040dccd80d6 (patch) | |
| tree | 7327028a212bc2f3d9710660b7bb8ad6d6ed6775 /target/config | |
| parent | 02ac3b4c45f696aca0472a3b6a8347466de263b1 (diff) | |
| parent | e0bc31d6aeddd5cae6dd5f4726defb2370d7df26 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target/config')
| -rw-r--r-- | target/config/Config.in | 69 |
1 files changed, 0 insertions, 69 deletions
diff --git a/target/config/Config.in b/target/config/Config.in index 15981617e..f8f59eabf 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -93,21 +93,17 @@ depends on ADK_TARGET_KERNEL64 && ADK_LINUX_X86_64 config ADK_TARGET_ABI_64 boolean "64 Bit ABI" select ADK_64 - select ADK_TARGET_MULTILIB_X86_64 if ADK_TARGET_WITH_MULTILIB config ADK_TARGET_ABI_X32 boolean "x32 ABI (new)" select ADK_x32 - select ADK_TARGET_MULTILIB_X86_X32 if ADK_TARGET_WITH_MULTILIB config ADK_TARGET_ABI_32 boolean "32 Bit ABI" select ADK_32 - select ADK_TARGET_MULTILIB_X86_32 if ADK_TARGET_WITH_MULTILIB endchoice -# multilib support config ADK_TARGET_LIBC_PATH string default "lib32" if ADK_n32 @@ -120,71 +116,6 @@ config ADK_TARGET_LIBC_PATH default "lib" -menu "Target multilib support" -depends on ADK_TARGET_DISABLED && \ - ( ADK_LINUX_X86_64 || ADK_LINUX_MIPS ) && \ - ( ADK_TARGET_LIB_EGLIBC || ADK_TARGET_LIB_GLIBC ) - -config ADK_TARGET_WITH_MULTILIB - boolean "multilib support" - -config ADK_TARGET_MULTILIB_MIPS_64 - boolean "64 bit libraries (n64 abi)" - depends on ADK_LINUX_MIPS && ADK_TARGET_WITH_MULTILIB - default y if ADK_n64 - -config ADK_TARGET_MULTILIB_MIPS_N32 - boolean "32 bit libraries (n32 abi)" - depends on ADK_LINUX_MIPS && ADK_TARGET_WITH_MULTILIB - default y if ADK_n32 - -config ADK_TARGET_MULTILIB_MIPS_O32 - boolean "32 bit libraries (o32 abi)" - depends on ADK_LINUX_MIPS && ADK_TARGET_WITH_MULTILIB - default y if ADK_o32 - -config ADK_TARGET_MULTILIB_X86_64 - boolean "64 bit libraries" - depends on ADK_LINUX_X86_64 && ADK_TARGET_WITH_MULTILIB - default y if ADK_64 - -config ADK_TARGET_MULTILIB_X86_32 - boolean "32 bit libraries" - depends on ADK_LINUX_X86_64 && ADK_TARGET_WITH_MULTILIB - default y if ADK_32 - -config ADK_TARGET_MULTILIB_X86_X32 - boolean "x32 bit libraries" - depends on ADK_LINUX_X86_64 && ADK_TARGET_WITH_MULTILIB - default y if ADK_x32 - -config ADK_MULTILIB_TARGET - string - default "m32" if ADK_TARGET_MULTILIB_X86_32 \ - && !ADK_TARGET_MULTILIB_X86_64 \ - && !ADK_TARGET_MULTILIB_X86_X32 - default "m64" if !ADK_TARGET_MULTILIB_X86_32 \ - && ADK_TARGET_MULTILIB_X86_64 \ - && !ADK_TARGET_MULTILIB_X86_X32 - default "x32" if !ADK_TARGET_MULTILIB_X86_32 \ - && !ADK_TARGET_MULTILIB_X86_64 \ - && ADK_TARGET_MULTILIB_X86_X32 - default "m32,m64" if ADK_TARGET_MULTILIB_X86_32 \ - && ADK_TARGET_MULTILIB_X86_64 \ - && !ADK_TARGET_MULTILIB_X86_X32 - default "mx32,m64" if !ADK_TARGET_MULTILIB_X86_32 \ - && ADK_TARGET_MULTILIB_X86_64 \ - && ADK_TARGET_MULTILIB_X86_X32 - default "m32,mx32" if ADK_TARGET_MULTILIB_X86_32 \ - && !ADK_TARGET_MULTILIB_X86_64 \ - && ADK_TARGET_MULTILIB_X86_X32 - default "m64,m32,mx32" if ADK_TARGET_MULTILIB_X86_32 \ - && ADK_TARGET_MULTILIB_X86_64 \ - && ADK_TARGET_MULTILIB_X86_X32 - - -endmenu - # submodel support # choice |