From 1ddb4c03622a654452a5e76b5a0e4db715dc350d Mon Sep 17 00:00:00 2001 From: James Zern Date: Mon, 31 Oct 2016 16:18:51 -0700 Subject: [PATCH] use .S suffix rather than .s for NEON asm for compatibility with other build systems Change-Id: I6763e62e3126850ad4f8ad29e388b8dad0bbc4c3 --- build/make/Android.mk | 20 ++++++++++---------- build/make/Makefile | 10 +++++----- build/make/configure.sh | 6 +++--- build/make/gen_msvs_vcxproj.sh | 2 +- libs.mk | 4 ++-- vpx_dsp/arm/idct4x4_add_neon.asm | 2 +- vpx_dsp/arm/idct8x8_add_neon.asm | 2 +- 7 files changed, 23 insertions(+), 23 deletions(-) diff --git a/build/make/Android.mk b/build/make/Android.mk index 36120170e..e4ae3629e 100644 --- a/build/make/Android.mk +++ b/build/make/Android.mk @@ -101,8 +101,8 @@ LOCAL_CFLAGS := -O3 # like x86inc.asm and x86_abi_support.asm LOCAL_ASMFLAGS := -I$(LIBVPX_PATH) -.PRECIOUS: %.asm.s -$(ASM_CNV_PATH)/libvpx/%.asm.s: $(LIBVPX_PATH)/%.asm +.PRECIOUS: %.asm.S +$(ASM_CNV_PATH)/libvpx/%.asm.S: $(LIBVPX_PATH)/%.asm @mkdir -p $(dir $@) @$(CONFIG_DIR)$(ASM_CONVERSION) <$< > $@ @@ -132,7 +132,7 @@ endif # Pull out assembly files, splitting NEON from the rest. This is # done to specify that the NEON assembly files use NEON assembler flags. -# x86 assembly matches %.asm, arm matches %.asm.s +# x86 assembly matches %.asm, arm matches %.asm.S # x86: @@ -140,12 +140,12 @@ CODEC_SRCS_ASM_X86 = $(filter %.asm, $(CODEC_SRCS_UNIQUE)) LOCAL_SRC_FILES += $(foreach file, $(CODEC_SRCS_ASM_X86), libvpx/$(file)) # arm: -CODEC_SRCS_ASM_ARM_ALL = $(filter %.asm.s, $(CODEC_SRCS_UNIQUE)) +CODEC_SRCS_ASM_ARM_ALL = $(filter %.asm.S, $(CODEC_SRCS_UNIQUE)) CODEC_SRCS_ASM_ARM = $(foreach v, \ $(CODEC_SRCS_ASM_ARM_ALL), \ $(if $(findstring neon,$(v)),,$(v))) -CODEC_SRCS_ASM_ADS2GAS = $(patsubst %.s, \ - $(ASM_CNV_PATH_LOCAL)/libvpx/%.s, \ +CODEC_SRCS_ASM_ADS2GAS = $(patsubst %.S, \ + $(ASM_CNV_PATH_LOCAL)/libvpx/%.S, \ $(CODEC_SRCS_ASM_ARM)) LOCAL_SRC_FILES += $(CODEC_SRCS_ASM_ADS2GAS) @@ -153,11 +153,11 @@ ifeq ($(TARGET_ARCH_ABI),armeabi-v7a) CODEC_SRCS_ASM_NEON = $(foreach v, \ $(CODEC_SRCS_ASM_ARM_ALL),\ $(if $(findstring neon,$(v)),$(v),)) - CODEC_SRCS_ASM_NEON_ADS2GAS = $(patsubst %.s, \ - $(ASM_CNV_PATH_LOCAL)/libvpx/%.s, \ + CODEC_SRCS_ASM_NEON_ADS2GAS = $(patsubst %.S, \ + $(ASM_CNV_PATH_LOCAL)/libvpx/%.S, \ $(CODEC_SRCS_ASM_NEON)) - LOCAL_SRC_FILES += $(patsubst %.s, \ - %.s.neon, \ + LOCAL_SRC_FILES += $(patsubst %.S, \ + %.S.neon, \ $(CODEC_SRCS_ASM_NEON_ADS2GAS)) endif diff --git a/build/make/Makefile b/build/make/Makefile index 469eb74c3..cba605786 100644 --- a/build/make/Makefile +++ b/build/make/Makefile @@ -90,7 +90,7 @@ all: .PHONY: clean clean:: - rm -f $(OBJS-yes) $(OBJS-yes:.o=.d) $(OBJS-yes:.asm.s.o=.asm.s) + rm -f $(OBJS-yes) $(OBJS-yes:.o=.d) $(OBJS-yes:.asm.S.o=.asm.S) rm -f $(CLEAN-OBJS) .PHONY: clean @@ -180,13 +180,13 @@ $(BUILD_PFX)%.asm.o: %.asm $(qexec)$(if $(CONFIG_DEPENDENCY_TRACKING),,mkdir -p $(dir $@)) $(qexec)$(AS) $(ASFLAGS) -o $@ $< -$(BUILD_PFX)%.s.d: %.s +$(BUILD_PFX)%.S.d: %.S $(if $(quiet),@echo " [DEP] $@") $(qexec)mkdir -p $(dir $@) $(qexec)$(SRC_PATH_BARE)/build/make/gen_asm_deps.sh \ --build-pfx=$(BUILD_PFX) --depfile=$@ $(ASFLAGS) $< > $@ -$(BUILD_PFX)%.s.o: %.s +$(BUILD_PFX)%.S.o: %.S $(if $(quiet),@echo " [AS] $@") $(qexec)$(if $(CONFIG_DEPENDENCY_TRACKING),,mkdir -p $(dir $@)) $(qexec)$(AS) $(ASFLAGS) -o $@ $< @@ -198,8 +198,8 @@ $(BUILD_PFX)%.c.S: %.c $(qexec)$(if $(CONFIG_DEPENDENCY_TRACKING),,mkdir -p $(dir $@)) $(qexec)$(CC) -S $(CFLAGS) -o $@ $< -.PRECIOUS: %.asm.s -$(BUILD_PFX)%.asm.s: %.asm +.PRECIOUS: %.asm.S +$(BUILD_PFX)%.asm.S: %.asm $(if $(quiet),@echo " [ASM CONVERSION] $@") $(qexec)mkdir -p $(dir $@) $(qexec)$(ASM_CONVERSION) <$< >$@ diff --git a/build/make/configure.sh b/build/make/configure.sh index 35609e89a..f050fa06a 100644 --- a/build/make/configure.sh +++ b/build/make/configure.sh @@ -635,7 +635,7 @@ setup_gnu_toolchain() { AS=${AS:-${CROSS}as} STRIP=${STRIP:-${CROSS}strip} NM=${NM:-${CROSS}nm} - AS_SFX=.s + AS_SFX=.S EXE_SFX= } @@ -926,7 +926,7 @@ EOF ;; vs*) asm_conversion_cmd="${source_path}/build/make/ads2armasm_ms.pl" - AS_SFX=.s + AS_SFX=.S msvs_arch_dir=arm-msvs disable_feature multithread disable_feature unit_tests @@ -1034,7 +1034,7 @@ EOF STRIP="$(${XCRUN_FIND} strip)" NM="$(${XCRUN_FIND} nm)" RANLIB="$(${XCRUN_FIND} ranlib)" - AS_SFX=.s + AS_SFX=.S LD="${CXX:-$(${XCRUN_FIND} ld)}" # ASFLAGS is written here instead of using check_add_asflags diff --git a/build/make/gen_msvs_vcxproj.sh b/build/make/gen_msvs_vcxproj.sh index e98611d10..e3395afa2 100755 --- a/build/make/gen_msvs_vcxproj.sh +++ b/build/make/gen_msvs_vcxproj.sh @@ -203,7 +203,7 @@ for opt in "$@"; do # The paths in file_list are fixed outside of the loop. file_list[${#file_list[@]}]="$opt" case "$opt" in - *.asm|*.s) uses_asm=true + *.asm|*.[Ss]) uses_asm=true ;; esac ;; diff --git a/libs.mk b/libs.mk index 6e12b5404..f4f48cc16 100644 --- a/libs.mk +++ b/libs.mk @@ -12,7 +12,7 @@ # ARM assembly files are written in RVCT-style. We use some make magic to # filter those files to allow GCC compilation ifeq ($(ARCH_ARM),yes) - ASM:=$(if $(filter yes,$(CONFIG_GCC)$(CONFIG_MSVS)),.asm.s,.asm) + ASM:=$(if $(filter yes,$(CONFIG_GCC)$(CONFIG_MSVS)),.asm.S,.asm) else ASM:=.asm endif @@ -366,7 +366,7 @@ endif # # Add assembler dependencies for configuration. # -$(filter %.s.o,$(OBJS-yes)): $(BUILD_PFX)vpx_config.asm +$(filter %.S.o,$(OBJS-yes)): $(BUILD_PFX)vpx_config.asm $(filter %$(ASM).o,$(OBJS-yes)): $(BUILD_PFX)vpx_config.asm diff --git a/vpx_dsp/arm/idct4x4_add_neon.asm b/vpx_dsp/arm/idct4x4_add_neon.asm index c7c60c7ca..bd4e86ded 100644 --- a/vpx_dsp/arm/idct4x4_add_neon.asm +++ b/vpx_dsp/arm/idct4x4_add_neon.asm @@ -15,7 +15,7 @@ AREA ||.text||, CODE, READONLY, ALIGN=2 - INCLUDE vpx_dsp/arm/idct_neon.asm.s + INCLUDE vpx_dsp/arm/idct_neon.asm.S AREA Block, CODE, READONLY ; name this block of code ;void vpx_idct4x4_16_add_neon(int16_t *input, uint8_t *dest, int dest_stride) diff --git a/vpx_dsp/arm/idct8x8_add_neon.asm b/vpx_dsp/arm/idct8x8_add_neon.asm index 8d6957403..a5c9c927d 100644 --- a/vpx_dsp/arm/idct8x8_add_neon.asm +++ b/vpx_dsp/arm/idct8x8_add_neon.asm @@ -16,7 +16,7 @@ AREA ||.text||, CODE, READONLY, ALIGN=2 - INCLUDE vpx_dsp/arm/idct_neon.asm.s + INCLUDE vpx_dsp/arm/idct_neon.asm.S ; Parallel 1D IDCT on all the columns of a 8x8 16bit data matrix which are ; loaded in q8-q15. The output will be stored back into q8-q15 registers.