diff options
| author | Pavel Chupin <pavel.v.chupin@intel.com> | 2013-08-16 18:11:13 +0400 |
|---|---|---|
| committer | Pavel Chupin <pavel.v.chupin@intel.com> | 2013-08-23 16:46:42 +0400 |
| commit | e85c1834248916d7d13891e602461d9be91dda28 (patch) | |
| tree | 88c3c552d4e965611cfa9d39522ecb2bd8dd299d /libc | |
| parent | 41f08abf3d020ad8b48ff4151f8c623a119790e0 (diff) | |
| download | bionic-e85c1834248916d7d13891e602461d9be91dda28.zip bionic-e85c1834248916d7d13891e602461d9be91dda28.tar.gz bionic-e85c1834248916d7d13891e602461d9be91dda28.tar.bz2 | |
Add explicit -m32/-melf_i386 for x86 target
Required for x86 build with multilib compiler.
Change-Id: Iac71cdc3461df6fb48cb2a7b713324ca368e6704
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
Diffstat (limited to 'libc')
| -rw-r--r-- | libc/Android.mk | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libc/Android.mk b/libc/Android.mk index cfc124c..2c1a3a6 100644 --- a/libc/Android.mk +++ b/libc/Android.mk @@ -519,7 +519,8 @@ endif # !arm ifeq ($(TARGET_ARCH),x86) libc_common_cflags += -DSOFTFLOAT - libc_crt_target_cflags := + libc_crt_target_cflags := -m32 + libc_crt_target_ldflags := -melf_i386 ifeq ($(ARCH_X86_HAVE_SSE2),true) libc_crt_target_cflags += -DUSE_SSE2=1 endif @@ -649,7 +650,7 @@ ALL_GENERATED_SOURCES += $(GEN) GEN := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_static.o $(GEN): $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_static1.o $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbrand.o @mkdir -p $(dir $@) - $(hide) $(TARGET_LD) -r -o $@ $^ + $(hide) $(TARGET_LD) $(libc_crt_target_ldflags) -r -o $@ $^ ALL_GENERATED_SOURCES += $(GEN) GEN := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_dynamic1.o @@ -664,7 +665,7 @@ ALL_GENERATED_SOURCES += $(GEN) GEN := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_dynamic.o $(GEN): $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_dynamic1.o $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbrand.o @mkdir -p $(dir $@) - $(hide) $(TARGET_LD) -r -o $@ $^ + $(hide) $(TARGET_LD) $(libc_crt_target_ldflags) -r -o $@ $^ ALL_GENERATED_SOURCES += $(GEN) # We rename crtend.o to crtend_android.o to avoid a |