diff options
| author | Miao Wang <miaowang@google.com> | 2015-06-24 15:27:31 -0700 |
|---|---|---|
| committer | Miao Wang <miaowang@google.com> | 2015-06-24 17:07:00 -0700 |
| commit | e0540693ce023ea9a5570c28f92f82e708a7c64c (patch) | |
| tree | 5f9f73ef7f9d38daf5fdc6beb0e86264df6c66e3 | |
| parent | 8886302a09fbc3be1e53cbd6d2a6e0c4225f0a12 (diff) | |
| download | mclinker-e0540693ce023ea9a5570c28f92f82e708a7c64c.tar.gz | |
make mclinker able to link arm object on x86 (fugu)
bug:21806530
Change-Id: Idf3365d53e6667cfbf720cc66db6ce561fe15feb
| -rw-r--r-- | mcld-device-build.mk | 5 | ||||
| -rw-r--r-- | tools/mcld/Android.mk | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/mcld-device-build.mk b/mcld-device-build.mk index 4c73156..5734e91 100644 --- a/mcld-device-build.mk +++ b/mcld-device-build.mk @@ -27,6 +27,11 @@ ifeq ($(HOST_OS),darwin) LOCAL_CFLAGS += -DDARWIN_FLEX=1 endif +ifeq ($(BUILD_ARM_FOR_X86),true) +LOCAL_CFLAGS_x86 += -DPROVIDE_ARM_CODEGEN -DFORCE_BUILD_ARM +LOCAL_CFLAGS_x86_64 += -DPROVIDE_ARM_CODEGEN -DFORCE_BUILD_ARM +endif + # Make sure bionic is first so we can include system headers. LOCAL_C_INCLUDES := \ bionic \ diff --git a/tools/mcld/Android.mk b/tools/mcld/Android.mk index a9e3dc6..0405848 100644 --- a/tools/mcld/Android.mk +++ b/tools/mcld/Android.mk @@ -60,6 +60,10 @@ endif # Add x86 libraries for both x86 and x86_64 targets ifneq (, $(findstring x86,$(TARGET_ARCH))) LOCAL_WHOLE_STATIC_LIBRARIES += $(MCLD_X86_LIBS) +ifeq ($(BUILD_ARM_FOR_X86),true) + LOCAL_WHOLE_STATIC_LIBRARIES += $(MCLD_ARM_LIBS) \ + $(MCLD_AARCH64_LIBS) +endif endif |