[vlc-commits] contrib: aom: Use asm/intrinsics on windows on arm/aarch64

[Martin Storsjö]

vlc/vlc-3.0 | branch: master | Martin Storsjö <martin at martin.st> | Thu Apr 19 14:40:48 2018 +0300| [93d6ae3fc415e3672941447b55d3741d7deefd2c] | committer: Tristan Matthews

contrib: aom: Use asm/intrinsics on windows on arm/aarch64

(cherry picked from commit 5157dc8988d6c2f7b3f07da9951c1d43053d42be)

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=93d6ae3fc415e3672941447b55d3741d7deefd2c
---

 contrib/src/aom/rules.mak | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/contrib/src/aom/rules.mak b/contrib/src/aom/rules.mak
index 14b51c9fe4..e362477812 100644
--- a/contrib/src/aom/rules.mak
+++ b/contrib/src/aom/rules.mak
@@ -46,9 +46,13 @@ endif
 
 ifdef HAVE_WIN32
 ifneq ($(filter arm aarch64, $(ARCH)),)
-# These configurations don't build with asm enabled yet, witout further
-# patching.
-AOM_CONF += -DAOM_TARGET_CPU=generic
+# These targets don't have runtime cpu detection.
+AOM_CONF += -DCONFIG_RUNTIME_CPU_DETECT=0
+endif
+ifeq ($(ARCH),arm)
+# armv7, not just plain arm
+AOM_CONF += -DAOM_TARGET_CPU=armv7
+AOM_CONF += -DAOM_ADS2GAS_REQUIRED=1 -DAOM_ADS2GAS=../build/make/ads2gas.pl -DAOM_ADS2GAS_OPTS="-thumb;-noelf" -DAOM_GAS_EXT=S
 endif
 endif