commit 7b913ce6fa5030519121757bf5b258efba51cc06
author Ying Wang <wangying@google.com> Thu Jun 05 19:05:47 2014 -0700
committer Ying Wang <wangying@google.com> Fri Jun 06 11:00:36 2014 -0700
tree 950afa49fd6989c9c0831991d7ad495049f0b0c7
parent e564c0cbd08c728d84e62308c741b30f3bd542f8

Support .asm being compiled by yasm targeted for x86.

Change-Id: Icd6626a082facf920b0e49e2fbe8861e94400552

core/binary.mk

diff --git a/core/binary.mk b/core/binary.mk
index 45ab0c0..762b155 100644
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -744,6 +744,19 @@
 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
 ####################################################