ref: 0fc93cd98e8aed9dab06afbe38b2ba9465ad0ac0
parent: 1118dd4f71cf2551cf71a1a26c24e59c54ab8eea
author: Martin Storsjö <martin@martin.st>
date: Wed Feb 26 10:00:35 EST 2014
Hook up building arm assembly in the generic linux and android makefiles
--- a/build/platform-android.mk
+++ b/build/platform-android.mk
@@ -15,6 +15,11 @@
endif
LDFLAGS += -march=armv7-a -Wl,--fix-cortex-a8
APP_ABI = armeabi-v7a
+ ifeq (Yes, $(USE_ASM))
+ ASM_ARCH = arm
+ CFLAGS += -DHAVE_NEON
+ ASMFLAGS += -march=armv7-a -mfpu=neon
+ endif
else
GCCPATHPREFIX = x86
GCCPREFIX = i686-linux-android
--- a/build/platform-arch.mk
+++ b/build/platform-arch.mk
@@ -1,3 +1,9 @@
ifneq ($(filter %86 x86_64, $(ARCH)),)
include build/platform-x86-common.mk
endif
+ifneq ($(filter-out arm64, $(filter arm%, $(ARCH))),)
+ifeq ($(USE_ASM), Yes)
+ASM_ARCH = arm
+CFLAGS += -DHAVE_NEON
+endif
+endif
--- a/build/platform-linux.mk
+++ b/build/platform-linux.mk
@@ -10,4 +10,7 @@
ASMFLAGS += -f elf32
endif
endif
+ifeq ($(ASM_ARCH), arm)
+ASMFLAGS += -march=armv7-a -mfpu=neon
+endif