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

am 168357ae: Merge "Support .asm being compiled by yasm targeted for x86_64."

Browse Source 
* commit '168357aeda0c71cd54f9bcfe72f2fca2d3baad36':
  Support .asm being compiled by yasm targeted for x86_64.
This commit is contained in:
Ying Wang
2015-03-11 16:49:07 +00:00
committed by Android Git Automerger
parent b396517cb2 168357aeda
commit ec447f368a
4 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/binary.mk
View File

@@ -797,8 +797,7 @@ endif
asm_objects := $(asm_objects_S) $(asm_objects_s) asm_objects := $(asm_objects_S) $(asm_objects_s)
# .asm for x86 needs to be compiled with yasm. # .asm for x86/x86_64 needs to be compiled with yasm.
ifeq (x86,$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH))
asm_sources_asm := $(filter %.asm,$(my_src_files)) asm_sources_asm := $(filter %.asm,$(my_src_files))
ifneq ($(strip $(asm_sources_asm)),) ifneq ($(strip $(asm_sources_asm)),)
asm_objects_asm := $(addprefix $(intermediates)/,$(asm_sources_asm:.asm=.o)) 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) asm_objects += $(asm_objects_asm)
endif endif
endif
########################################################## ##########################################################

2
core/combo/TARGET_linux-x86.mk
View File

@@ -147,3 +147,5 @@ $(combo_2nd_arch_prefix)TARGET_STRIP_MODULE:=true
$(combo_2nd_arch_prefix)TARGET_DEFAULT_SYSTEM_SHARED_LIBRARIES := libc libm $(combo_2nd_arch_prefix)TARGET_DEFAULT_SYSTEM_SHARED_LIBRARIES := libc libm
$(combo_2nd_arch_prefix)TARGET_LINKER := /system/bin/linker $(combo_2nd_arch_prefix)TARGET_LINKER := /system/bin/linker
$(combo_2nd_arch_prefix)TARGET_GLOBAL_YASM_FLAGS := -f elf32 -m x86

2
core/combo/TARGET_linux-x86_64.mk
View File

@@ -153,3 +153,5 @@ TARGET_STRIP_MODULE:=true
TARGET_DEFAULT_SYSTEM_SHARED_LIBRARIES := libc libm TARGET_DEFAULT_SYSTEM_SHARED_LIBRARIES := libc libm
TARGET_LINKER := /system/bin/linker64 TARGET_LINKER := /system/bin/linker64
TARGET_GLOBAL_YASM_FLAGS := -f elf64 -m amd64

2
core/definitions.mk
View File

@@ -1051,7 +1051,7 @@ define transform-asm-to-o
@mkdir -p $(dir $@) @mkdir -p $(dir $@)
$(hide) $(YASM) \ $(hide) $(YASM) \
$(addprefix -I , $(PRIVATE_C_INCLUDES)) \ $(addprefix -I , $(PRIVATE_C_INCLUDES)) \
-f elf32 -m x86 \ $($(PRIVATE_2ND_ARCH_VAR_PREFIX)TARGET_GLOBAL_YASM_FLAGS) \
$(PRIVATE_ASFLAGS) \ $(PRIVATE_ASFLAGS) \
-o $@ $< -o $@ $<
endef endef