summaryrefslogtreecommitdiff
path: root/target
diff options
context:
space:
mode:
authorWaldemar Brodkorb <mail@waldemar-brodkorb.de>2012-10-10 10:54:20 +0200
committerWaldemar Brodkorb <mail@waldemar-brodkorb.de>2012-10-10 10:54:20 +0200
commit581c747ae157d8802dc704786eaceb648da79e28 (patch)
treeb9d69fbf40a85e876cde9738e04c5f1ea524486d /target
parent6916a7793d864f5dcb661bb059a4f99afa1ee433 (diff)
fix 32 Bit multilib builds
Diffstat (limited to 'target')
-rw-r--r--target/config/Config.in4
-rw-r--r--target/x86_64/target.mk4
2 files changed, 4 insertions, 4 deletions
diff --git a/target/config/Config.in b/target/config/Config.in
index 5dd14a6d1..bfbfb550c 100644
--- a/target/config/Config.in
+++ b/target/config/Config.in
@@ -475,6 +475,10 @@ config ADK_TARGET_ABI_CFLAGS
default "-mx32" if ADK_TARGET_ABI_X32
default "-m64" if ADK_TARGET_ABI_64
+config ADK_TARGET_ABI_LDFLAGS
+ string
+ default "-Wl,-m -Wl,elf_i386" if ADK_TARGET_ABI_32
+
config ADK_TARGET_KERNEL_LDFLAGS
string
default "-mabi=64 -m elf64ltsmip" if ADK_TARGET_ABI_N32
diff --git a/target/x86_64/target.mk b/target/x86_64/target.mk
index 1d5465d7a..7fe893ec7 100644
--- a/target/x86_64/target.mk
+++ b/target/x86_64/target.mk
@@ -2,8 +2,4 @@ include $(TOPDIR)/mk/kernel-ver.mk
ARCH:= x86
CPU_ARCH:= x86_64
TARGET_OPTIMIZATION:= -O2 -pipe
-ifeq ($(ADK_TARGET_WITH_MULTILIB),y)
-TARGET_CFLAGS_ARCH:= $(ADK_TARGET_CFLAGS)
-else
TARGET_CFLAGS_ARCH:= $(ADK_TARGET_CFLAGS) $(ADK_TARGET_ABI_CFLAGS)
-endif