| commit | fe1e5c3453caa43662ee5a21be74aa160fdbc628 | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Mon Mar 09 18:57:40 2015 -0700 |
| committer | Ying Wang <wangying@google.com> | Mon Mar 09 18:57:40 2015 -0700 |
| tree | bf85c6823645e7eb22c99938623ff0e67adee6e9 | |
| parent | 708b56edc879847f418108cf360bc990bb2a502a [diff] |
Support .asm being compiled by yasm targeted for x86_64. Change-Id: Ia6425c38dd2f7ad2dc697213cd61b7515b9e7aff
diff --git a/core/combo/TARGET_linux-x86.mk b/core/combo/TARGET_linux-x86.mk index e22500e..f17a514 100644 --- a/core/combo/TARGET_linux-x86.mk +++ b/core/combo/TARGET_linux-x86.mk
@@ -147,3 +147,5 @@ $(combo_2nd_arch_prefix)TARGET_DEFAULT_SYSTEM_SHARED_LIBRARIES := libc libm $(combo_2nd_arch_prefix)TARGET_LINKER := /system/bin/linker + +$(combo_2nd_arch_prefix)TARGET_GLOBAL_YASM_FLAGS := -f elf32 -m x86
diff --git a/core/combo/TARGET_linux-x86_64.mk b/core/combo/TARGET_linux-x86_64.mk index 046a42b..c945b3e 100644 --- a/core/combo/TARGET_linux-x86_64.mk +++ b/core/combo/TARGET_linux-x86_64.mk
@@ -153,3 +153,5 @@ TARGET_DEFAULT_SYSTEM_SHARED_LIBRARIES := libc libm TARGET_LINKER := /system/bin/linker64 + +TARGET_GLOBAL_YASM_FLAGS := -f elf64 -m amd64