summaryrefslogtreecommitdiff
path: root/target
diff options
context:
space:
mode:
Diffstat (limited to 'target')
-rw-r--r--target/config/Config.in26
-rw-r--r--target/x86_64/target.mk6
2 files changed, 13 insertions, 19 deletions
diff --git a/target/config/Config.in b/target/config/Config.in
index 32a254900..db7f09a5d 100644
--- a/target/config/Config.in
+++ b/target/config/Config.in
@@ -92,14 +92,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
@@ -126,32 +129,17 @@ config ADK_TARGET_WITH_MULTILIB
config ADK_TARGET_MULTILIB_X86_64
boolean "64 bit libraries"
depends on ADK_LINUX_X86_64 && ADK_TARGET_WITH_MULTILIB
- default y
+ 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
-
-choice
-prompt "Default Library (compile all applications with this library)"
-config ADK_TARGET_MULTILIB_X86_64_DEF
- boolean "64 Bit libraries as default"
- depends on ADK_TARGET_MULTILIB_X86_64
-
-config ADK_TARGET_MULTILIB_X86_32_DEF
- boolean "32 Bit libraries as default"
- depends on ADK_TARGET_MULTILIB_X86_32
-
-config ADK_TARGET_MULTILIB_X86_X32_DEF
- boolean "x32 Bit libraries as default"
- depends on ADK_TARGET_MULTILIB_X86_X32
-
-endchoice
-endmenu
+ default y if ADK_x32
config ADK_MULTILIB_TARGET
string
@@ -178,6 +166,8 @@ config ADK_MULTILIB_TARGET
&& ADK_TARGET_MULTILIB_X86_X32
+endmenu
+
# submodel support
#
choice
diff --git a/target/x86_64/target.mk b/target/x86_64/target.mk
index 53d0acf59..1d5465d7a 100644
--- a/target/x86_64/target.mk
+++ b/target/x86_64/target.mk
@@ -2,4 +2,8 @@ include $(TOPDIR)/mk/kernel-ver.mk
ARCH:= x86
CPU_ARCH:= x86_64
TARGET_OPTIMIZATION:= -O2 -pipe
-TARGET_CFLAGS_ARCH:= $(ADK_TARGET_CFLAGS)
+ifeq ($(ADK_TARGET_WITH_MULTILIB),y)
+TARGET_CFLAGS_ARCH:= $(ADK_TARGET_CFLAGS)
+else
+TARGET_CFLAGS_ARCH:= $(ADK_TARGET_CFLAGS) $(ADK_TARGET_ABI_CFLAGS)
+endif