openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "Pass the arm/thumb cflags to assembly files" 

am: 60c9200c1e

* commit '60c9200c1ee3f5d983c5f9d9cc1724f6010daca2':
  Pass the arm/thumb cflags to assembly files
This commit is contained in:
Dan Willemsen 2016-01-21 23:19:02 +00:00 committed by android-build-merger
parent cf7eb025f8 60c9200c1e
commit 537e093fe8
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/binary.mk
View File

@ -907,6 +907,7 @@ $(gen_s_objects): $(intermediates)/%.o: $(intermediates)/%.s \
endif endif
gen_asm_objects := $(gen_S_objects) $(gen_s_objects) gen_asm_objects := $(gen_S_objects) $(gen_s_objects)
$(gen_asm_objects): PRIVATE_ARM_CFLAGS := $(normal_objects_cflags)
########################################################### ###########################################################
## o: Include generated .o files in output. ## o: Include generated .o files in output.
@ -1043,6 +1044,7 @@ $(asm_objects_s): $(intermediates)/%.o: $(TOPDIR)$(LOCAL_PATH)/%.s \
endif endif
asm_objects := $(dotdot_objects_S) $(dotdot_objects_s) $(asm_objects_S) $(asm_objects_s) asm_objects := $(dotdot_objects_S) $(dotdot_objects_s) $(asm_objects_S) $(asm_objects_s)
$(asm_objects): PRIVATE_ARM_CFLAGS := $(normal_objects_cflags)
# .asm for x86/x86_64 needs to be compiled with yasm. # .asm for x86/x86_64 needs to be compiled with yasm.