diff options
| author | Ying Wang <wangying@google.com> | 2014-06-09 21:43:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-06-09 21:43:56 +0000 |
| commit | 5ad17493cdb329087459ef7cddaed20cb1bba707 (patch) | |
| tree | 1f5c8bcc984237bef63eeb286cee5a76e63ee40f /core/binary.mk | |
| parent | 1a8f0d3b6dc316034e1e3b28702fead4108ec8d3 (diff) | |
| parent | 7b913ce6fa5030519121757bf5b258efba51cc06 (diff) | |
| download | build-5ad17493cdb329087459ef7cddaed20cb1bba707.zip build-5ad17493cdb329087459ef7cddaed20cb1bba707.tar.gz build-5ad17493cdb329087459ef7cddaed20cb1bba707.tar.bz2 | |
Merge "Support .asm being compiled by yasm targeted for x86."
Diffstat (limited to 'core/binary.mk')
| -rw-r--r-- | core/binary.mk | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/core/binary.mk b/core/binary.mk index 253c42d..33f243b 100644 --- a/core/binary.mk +++ b/core/binary.mk @@ -744,6 +744,19 @@ 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_sources_asm := $(filter %.asm,$(my_src_files)) +ifneq ($(strip $(asm_sources_asm)),) +asm_objects_asm := $(addprefix $(intermediates)/,$(asm_sources_asm:.asm=.o)) +$(asm_objects_asm): $(intermediates)/%.o: $(TOPDIR)$(LOCAL_PATH)/%.asm \ + $(LOCAL_ADDITIONAL_DEPENDENCIES) + $(transform-asm-to-o) + +asm_objects += $(asm_objects_asm) +endif +endif + #################################################### ## Import includes #################################################### |