generic-library/openh264
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Force armv7/neon within the arm assembly header file

Browse Source 
This avoids having to add extra compiler flags to be able to build
them.
This commit is contained in:
Martin Storsjö 2015-02-01 23:00:55 +02:00
parent 9b442b3d44
commit 5a78735802
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build/platform-android.mk
View File

@ -12,9 +12,6 @@ ifeq ($(ARCH), arm)
LDFLAGS += -march=armv7-a -Wl,--fix-cortex-a8 LDFLAGS += -march=armv7-a -Wl,--fix-cortex-a8
APP_ABI = armeabi-v7a APP_ABI = armeabi-v7a
endif endif
ifeq (Yes, $(USE_ASM))
ASMFLAGS += -march=armv7-a -mfpu=neon
endif
else ifeq ($(ARCH), arm64) else ifeq ($(ARCH), arm64)
APP_ABI = arm64-v8a APP_ABI = arm64-v8a
else ifeq ($(ARCH), x86) else ifeq ($(ARCH), x86)

2
codec/common/arm/arm_arch_common_macro.S
View File

@ -50,6 +50,8 @@ mov pc, lr
.section .note.GNU-stack,"",%progbits // Mark stack as non-executable .section .note.GNU-stack,"",%progbits // Mark stack as non-executable
.text .text
.arch armv7-a
.fpu neon
.macro WELS_ASM_FUNC_BEGIN funcName .macro WELS_ASM_FUNC_BEGIN funcName
.align 2 .align 2