StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Dan Willemsen
2016-01-21 22:31:11 +00:00
committed by Gerrit Code Review
parent b49d05e72e 45d38c06b4
commit 60c9200c1e
1 changed files with 2 additions and 0 deletions
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.