[vlc-commits] contrib: aom: use armv7 for all targets whose ARCH is "arm"

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Wed Jul 31 07:52:38 2019 +0200| [a143c4b08c3a8681c08cad9296b68a6a1003ce92] | committer: Steve Lhomme

contrib: aom: use armv7 for all targets whose ARCH is "arm"

That includes Linux targets, in addition to Windows, iOS and Android.

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

 contrib/src/aom/rules.mak | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/contrib/src/aom/rules.mak b/contrib/src/aom/rules.mak
index 18d29f9478..aa990cecd6 100644
--- a/contrib/src/aom/rules.mak
+++ b/contrib/src/aom/rules.mak
@@ -63,7 +63,6 @@ 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
@@ -73,22 +72,20 @@ ifneq ($(filter arm aarch64, $(ARCH)),)
 # 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
-endif
 endif
 
 # Force cpu detection
 ifdef HAVE_ANDROID
-ifeq ($(ARCH),arm)
-AOM_CONF += -DAOM_TARGET_CPU=armv7
-endif
 ifeq ($(ARCH),aarch64)
 AOM_CONF += -DAOM_TARGET_CPU=arm64
 endif
 endif
 
+ifeq ($(ARCH),arm)
+# armv7, not just plain arm
+AOM_CONF += -DAOM_TARGET_CPU=armv7
+endif
+
 # libaom doesn't allow in-tree builds
 .aom: aom toolchain.cmake
 	cd $< && mkdir -p aom_build