diff options
| author | Ying Wang <wangying@google.com> | 2015-03-11 16:37:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-03-11 16:37:25 +0000 |
| commit | 168357aeda0c71cd54f9bcfe72f2fca2d3baad36 (patch) | |
| tree | 0ad05f4f8a906a16c70a4fb3b882ca365bdd96f0 /core/binary.mk | |
| parent | 501af5280fd36c6634b91ac87a55c780d8634a43 (diff) | |
| parent | fe1e5c3453caa43662ee5a21be74aa160fdbc628 (diff) | |
| download | build-168357aeda0c71cd54f9bcfe72f2fca2d3baad36.zip build-168357aeda0c71cd54f9bcfe72f2fca2d3baad36.tar.gz build-168357aeda0c71cd54f9bcfe72f2fca2d3baad36.tar.bz2 | |
Merge "Support .asm being compiled by yasm targeted for x86_64."
Diffstat (limited to 'core/binary.mk')
| -rw-r--r-- | core/binary.mk | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/core/binary.mk b/core/binary.mk index 81513f5..de908e3 100644 --- a/core/binary.mk +++ b/core/binary.mk @@ -797,8 +797,7 @@ endif asm_objects := $(asm_objects_S) $(asm_objects_s) -# .asm for x86 needs to be compiled with yasm. -ifeq (x86,$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) +# .asm for x86/x86_64 needs to be compiled with yasm. asm_sources_asm := $(filter %.asm,$(my_src_files)) ifneq ($(strip $(asm_sources_asm)),) asm_objects_asm := $(addprefix $(intermediates)/,$(asm_sources_asm:.asm=.o)) @@ -808,7 +807,6 @@ $(asm_objects_asm): $(intermediates)/%.o: $(TOPDIR)$(LOCAL_PATH)/%.asm \ asm_objects += $(asm_objects_asm) endif -endif ########################################################## |