Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 168357ae authored by Ying Wang's avatar Ying Wang Committed by Gerrit Code Review
Browse files

Merge "Support .asm being compiled by yasm targeted for x86_64."

parents 501af528 fe1e5c34

core/binary.mk

+1 −3
Original line number Diff line number Diff line
@@ -797,8 +797,7 @@ 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 for x86/x86_64 needs to be compiled with yasm.

asm_sources_asm := $(filter %.asm,$(my_src_files))

ifneq ($(strip $(asm_sources_asm)),)

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)

endif

endif





##########################################################

core/combo/TARGET_linux-x86.mk

+2 −0
Original line number Diff line number Diff line
@@ -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_LINKER := /system/bin/linker



$(combo_2nd_arch_prefix)TARGET_GLOBAL_YASM_FLAGS := -f elf32 -m x86

core/combo/TARGET_linux-x86_64.mk

+2 −0
Original line number Diff line number Diff line
@@ -153,3 +153,5 @@ TARGET_STRIP_MODULE:=true 
TARGET_DEFAULT_SYSTEM_SHARED_LIBRARIES := libc libm



TARGET_LINKER := /system/bin/linker64



TARGET_GLOBAL_YASM_FLAGS := -f elf64 -m amd64

core/definitions.mk

+1 −1
Original line number Diff line number Diff line
@@ -1051,7 +1051,7 @@ define transform-asm-to-o 
@mkdir -p $(dir $@)

$(hide) $(YASM) \

    $(addprefix -I , $(PRIVATE_C_INCLUDES)) \

    -f elf32 -m x86 \

    $($(PRIVATE_2ND_ARCH_VAR_PREFIX)TARGET_GLOBAL_YASM_FLAGS) \

    $(PRIVATE_ASFLAGS) \

    -o $@ $<

endef