libvpx: Maintain old ARCH_ defines

Removing these caused build errors because assembly files don't properly
depend on header files.

Change-Id: I00f4b7a47a8965ea7261a415230d19146f0940b6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1862726
Auto-Submit: Johann Koenig <johannkoenig@google.com>
Reviewed-by: James Zern <jzern@google.com>
Commit-Queue: Johann Koenig <johannkoenig@google.com>
Cr-Commit-Position: refs/heads/master@{#706207}

third_party/libvpx/generate_gni.sh

@@ -284,6 +284,10 @@ function gen_config_files {
   # Disable HAVE_UNISTD_H as it causes vp8 to try to detect how many cpus
   # available, which doesn't work from inside a sandbox on linux.
   sed -i.bak -e 's/\(HAVE_UNISTD_H[[:space:]]*\)1/\10/' vpx_config.h
+  # Maintain old ARCH_ defines to avoid build errors because assembly file
+  # dependencies are incorrect.
+  sed -i.bak -e 's/\(#define \)VPX_\(ARCH_[_0-9A-Z]\+ [01]\)/&\n\1\2/' vpx_config.h
+
   rm vpx_config.h.bak
 
   # Use the correct ads2gas script.

third_party/libvpx/source/config/ios/arm-neon/vpx_config.asm

@@ -3,10 +3,15 @@
 
 	.syntax unified
 .set VPX_ARCH_ARM ,  1
+.set ARCH_ARM ,  1
 .set VPX_ARCH_MIPS ,  0
+.set ARCH_MIPS ,  0
 .set VPX_ARCH_X86 ,  0
+.set ARCH_X86 ,  0
 .set VPX_ARCH_X86_64 ,  0
+.set ARCH_X86_64 ,  0
 .set VPX_ARCH_PPC ,  0
+.set ARCH_PPC ,  0
 .set HAVE_NEON ,  1
 .set HAVE_NEON_ASM ,  1
 .set HAVE_MIPS32 ,  0

third_party/libvpx/source/config/ios/arm-neon/vpx_config.h

@@ -11,10 +11,15 @@
 #define RESTRICT    
 #define INLINE      inline
 #define VPX_ARCH_ARM 1
+#define ARCH_ARM 1
 #define VPX_ARCH_MIPS 0
+#define ARCH_MIPS 0
 #define VPX_ARCH_X86 0
+#define ARCH_X86 0
 #define VPX_ARCH_X86_64 0
+#define ARCH_X86_64 0
 #define VPX_ARCH_PPC 0
+#define ARCH_PPC 0
 #define HAVE_NEON 1
 #define HAVE_NEON_ASM 1
 #define HAVE_MIPS32 0

third_party/libvpx/source/config/ios/arm64/vpx_config.asm

@@ -3,10 +3,15 @@
 
 	.syntax unified
 .set VPX_ARCH_ARM ,  1
+.set ARCH_ARM ,  1
 .set VPX_ARCH_MIPS ,  0
+.set ARCH_MIPS ,  0
 .set VPX_ARCH_X86 ,  0
+.set ARCH_X86 ,  0
 .set VPX_ARCH_X86_64 ,  0
+.set ARCH_X86_64 ,  0
 .set VPX_ARCH_PPC ,  0
+.set ARCH_PPC ,  0
 .set HAVE_NEON ,  1
 .set HAVE_NEON_ASM ,  0
 .set HAVE_MIPS32 ,  0

third_party/libvpx/source/config/ios/arm64/vpx_config.h

@@ -11,10 +11,15 @@
 #define RESTRICT    
 #define INLINE      inline
 #define VPX_ARCH_ARM 1
+#define ARCH_ARM 1
 #define VPX_ARCH_MIPS 0
+#define ARCH_MIPS 0
 #define VPX_ARCH_X86 0
+#define ARCH_X86 0
 #define VPX_ARCH_X86_64 0
+#define ARCH_X86_64 0
 #define VPX_ARCH_PPC 0
+#define ARCH_PPC 0
 #define HAVE_NEON 1
 #define HAVE_NEON_ASM 0
 #define HAVE_MIPS32 0

third_party/libvpx/source/config/linux/arm-neon-cpu-detect/vpx_config.asm

@@ -2,10 +2,15 @@
 @  using the ads2gas.pl script.
 	.syntax unified
 .equ VPX_ARCH_ARM ,  1
+.equ ARCH_ARM ,  1
 .equ VPX_ARCH_MIPS ,  0
+.equ ARCH_MIPS ,  0
 .equ VPX_ARCH_X86 ,  0
+.equ ARCH_X86 ,  0
 .equ VPX_ARCH_X86_64 ,  0
+.equ ARCH_X86_64 ,  0
 .equ VPX_ARCH_PPC ,  0
+.equ ARCH_PPC ,  0
 .equ HAVE_NEON ,  1
 .equ HAVE_NEON_ASM ,  1
 .equ HAVE_MIPS32 ,  0

third_party/libvpx/source/config/linux/arm-neon-cpu-detect/vpx_config.h

@@ -11,10 +11,15 @@
 #define RESTRICT    
 #define INLINE      inline
 #define VPX_ARCH_ARM 1
+#define ARCH_ARM 1
 #define VPX_ARCH_MIPS 0
+#define ARCH_MIPS 0
 #define VPX_ARCH_X86 0
+#define ARCH_X86 0
 #define VPX_ARCH_X86_64 0
+#define ARCH_X86_64 0
 #define VPX_ARCH_PPC 0
+#define ARCH_PPC 0
 #define HAVE_NEON 1
 #define HAVE_NEON_ASM 1
 #define HAVE_MIPS32 0

third_party/libvpx/source/config/linux/arm-neon-highbd/vpx_config.asm

@@ -2,10 +2,15 @@
 @  using the ads2gas.pl script.
 	.syntax unified
 .equ VPX_ARCH_ARM ,  1
+.equ ARCH_ARM ,  1
 .equ VPX_ARCH_MIPS ,  0
+.equ ARCH_MIPS ,  0
 .equ VPX_ARCH_X86 ,  0
+.equ ARCH_X86 ,  0
 .equ VPX_ARCH_X86_64 ,  0
+.equ ARCH_X86_64 ,  0
 .equ VPX_ARCH_PPC ,  0
+.equ ARCH_PPC ,  0
 .equ HAVE_NEON ,  1
 .equ HAVE_NEON_ASM ,  1
 .equ HAVE_MIPS32 ,  0

third_party/libvpx/source/config/linux/arm-neon-highbd/vpx_config.h

@@ -11,10 +11,15 @@
 #define RESTRICT    
 #define INLINE      inline
 #define VPX_ARCH_ARM 1
+#define ARCH_ARM 1
 #define VPX_ARCH_MIPS 0
+#define ARCH_MIPS 0
 #define VPX_ARCH_X86 0
+#define ARCH_X86 0
 #define VPX_ARCH_X86_64 0
+#define ARCH_X86_64 0
 #define VPX_ARCH_PPC 0
+#define ARCH_PPC 0
 #define HAVE_NEON 1
 #define HAVE_NEON_ASM 1
 #define HAVE_MIPS32 0

third_party/libvpx/source/config/linux/arm-neon/vpx_config.asm

@@ -2,10 +2,15 @@
 @  using the ads2gas.pl script.
 	.syntax unified
 .equ VPX_ARCH_ARM ,  1
+.equ ARCH_ARM ,  1
 .equ VPX_ARCH_MIPS ,  0
+.equ ARCH_MIPS ,  0
 .equ VPX_ARCH_X86 ,  0
+.equ ARCH_X86 ,  0
 .equ VPX_ARCH_X86_64 ,  0
+.equ ARCH_X86_64 ,  0
 .equ VPX_ARCH_PPC ,  0
+.equ ARCH_PPC ,  0
 .equ HAVE_NEON ,  1
 .equ HAVE_NEON_ASM ,  1
 .equ HAVE_MIPS32 ,  0

third_party/libvpx/source/config/linux/arm-neon/vpx_config.h

@@ -11,10 +11,15 @@
 #define RESTRICT    
 #define INLINE      inline
 #define VPX_ARCH_ARM 1
+#define ARCH_ARM 1
 #define VPX_ARCH_MIPS 0
+#define ARCH_MIPS 0
 #define VPX_ARCH_X86 0
+#define ARCH_X86 0
 #define VPX_ARCH_X86_64 0
+#define ARCH_X86_64 0
 #define VPX_ARCH_PPC 0
+#define ARCH_PPC 0
 #define HAVE_NEON 1
 #define HAVE_NEON_ASM 1
 #define HAVE_MIPS32 0

third_party/libvpx/source/config/linux/arm/vpx_config.asm

@@ -2,10 +2,15 @@
 @  using the ads2gas.pl script.
 	.syntax unified
 .equ VPX_ARCH_ARM ,  1
+.equ ARCH_ARM ,  1
 .equ VPX_ARCH_MIPS ,  0
+.equ ARCH_MIPS ,  0
 .equ VPX_ARCH_X86 ,  0
+.equ ARCH_X86 ,  0
 .equ VPX_ARCH_X86_64 ,  0
+.equ ARCH_X86_64 ,  0
 .equ VPX_ARCH_PPC ,  0
+.equ ARCH_PPC ,  0
 .equ HAVE_NEON ,  0
 .equ HAVE_NEON_ASM ,  0
 .equ HAVE_MIPS32 ,  0

third_party/libvpx/source/config/linux/arm/vpx_config.h

@@ -11,10 +11,15 @@
 #define RESTRICT    
 #define INLINE      inline
 #define VPX_ARCH_ARM 1
+#define ARCH_ARM 1
 #define VPX_ARCH_MIPS 0
+#define ARCH_MIPS 0
 #define VPX_ARCH_X86 0
+#define ARCH_X86 0
 #define VPX_ARCH_X86_64 0
+#define ARCH_X86_64 0
 #define VPX_ARCH_PPC 0
+#define ARCH_PPC 0
 #define HAVE_NEON 0
 #define HAVE_NEON_ASM 0
 #define HAVE_MIPS32 0

third_party/libvpx/source/config/linux/arm64-highbd/vpx_config.asm

@@ -2,10 +2,15 @@
 @  using the ads2gas.pl script.
 	.syntax unified
 .equ VPX_ARCH_ARM ,  1
+.equ ARCH_ARM ,  1
 .equ VPX_ARCH_MIPS ,  0
+.equ ARCH_MIPS ,  0
 .equ VPX_ARCH_X86 ,  0
+.equ ARCH_X86 ,  0
 .equ VPX_ARCH_X86_64 ,  0
+.equ ARCH_X86_64 ,  0
 .equ VPX_ARCH_PPC ,  0
+.equ ARCH_PPC ,  0
 .equ HAVE_NEON ,  1
 .equ HAVE_NEON_ASM ,  0
 .equ HAVE_MIPS32 ,  0

third_party/libvpx/source/config/linux/arm64-highbd/vpx_config.h

@@ -11,10 +11,15 @@
 #define RESTRICT    
 #define INLINE      inline
 #define VPX_ARCH_ARM 1
+#define ARCH_ARM 1
 #define VPX_ARCH_MIPS 0
+#define ARCH_MIPS 0
 #define VPX_ARCH_X86 0
+#define ARCH_X86 0
 #define VPX_ARCH_X86_64 0
+#define ARCH_X86_64 0
 #define VPX_ARCH_PPC 0
+#define ARCH_PPC 0
 #define HAVE_NEON 1
 #define HAVE_NEON_ASM 0
 #define HAVE_MIPS32 0

third_party/libvpx/source/config/linux/arm64/vpx_config.asm

@@ -2,10 +2,15 @@
 @  using the ads2gas.pl script.
 	.syntax unified
 .equ VPX_ARCH_ARM ,  1
+.equ ARCH_ARM ,  1
 .equ VPX_ARCH_MIPS ,  0
+.equ ARCH_MIPS ,  0
 .equ VPX_ARCH_X86 ,  0
+.equ ARCH_X86 ,  0
 .equ VPX_ARCH_X86_64 ,  0
+.equ ARCH_X86_64 ,  0
 .equ VPX_ARCH_PPC ,  0
+.equ ARCH_PPC ,  0
 .equ HAVE_NEON ,  1
 .equ HAVE_NEON_ASM ,  0
 .equ HAVE_MIPS32 ,  0

third_party/libvpx/source/config/linux/arm64/vpx_config.h

@@ -11,10 +11,15 @@
 #define RESTRICT    
 #define INLINE      inline
 #define VPX_ARCH_ARM 1
+#define ARCH_ARM 1
 #define VPX_ARCH_MIPS 0
+#define ARCH_MIPS 0
 #define VPX_ARCH_X86 0
+#define ARCH_X86 0
 #define VPX_ARCH_X86_64 0
+#define ARCH_X86_64 0
 #define VPX_ARCH_PPC 0
+#define ARCH_PPC 0
 #define HAVE_NEON 1
 #define HAVE_NEON_ASM 0
 #define HAVE_MIPS32 0

third_party/libvpx/source/config/linux/generic/vpx_config.asm

@@ -2,10 +2,15 @@
 @  using the ads2gas.pl script.
 	.syntax unified
 .equ VPX_ARCH_ARM ,  0
+.equ ARCH_ARM ,  0
 .equ VPX_ARCH_MIPS ,  0
+.equ ARCH_MIPS ,  0
 .equ VPX_ARCH_X86 ,  0
+.equ ARCH_X86 ,  0
 .equ VPX_ARCH_X86_64 ,  0
+.equ ARCH_X86_64 ,  0
 .equ VPX_ARCH_PPC ,  0
+.equ ARCH_PPC ,  0
 .equ HAVE_NEON ,  0
 .equ HAVE_NEON_ASM ,  0
 .equ HAVE_MIPS32 ,  0

third_party/libvpx/source/config/linux/generic/vpx_config.h

@@ -11,10 +11,15 @@
 #define RESTRICT    
 #define INLINE      inline
 #define VPX_ARCH_ARM 0
+#define ARCH_ARM 0
 #define VPX_ARCH_MIPS 0
+#define ARCH_MIPS 0
 #define VPX_ARCH_X86 0
+#define ARCH_X86 0
 #define VPX_ARCH_X86_64 0
+#define ARCH_X86_64 0
 #define VPX_ARCH_PPC 0
+#define ARCH_PPC 0
 #define HAVE_NEON 0
 #define HAVE_NEON_ASM 0
 #define HAVE_MIPS32 0

third_party/libvpx/source/config/linux/ia32/vpx_config.asm

 %define VPX_ARCH_ARM 0
+%define ARCH_ARM 0
 %define VPX_ARCH_MIPS 0
+%define ARCH_MIPS 0
 %define VPX_ARCH_X86 1
+%define ARCH_X86 1
 %define VPX_ARCH_X86_64 0
+%define ARCH_X86_64 0
 %define VPX_ARCH_PPC 0
+%define ARCH_PPC 0
 %define HAVE_NEON 0
 %define HAVE_NEON_ASM 0
 %define HAVE_MIPS32 0

third_party/libvpx/source/config/linux/ia32/vpx_config.h

@@ -11,10 +11,15 @@
 #define RESTRICT    
 #define INLINE      inline
 #define VPX_ARCH_ARM 0
+#define ARCH_ARM 0
 #define VPX_ARCH_MIPS 0
+#define ARCH_MIPS 0
 #define VPX_ARCH_X86 1
+#define ARCH_X86 1
 #define VPX_ARCH_X86_64 0
+#define ARCH_X86_64 0
 #define VPX_ARCH_PPC 0
+#define ARCH_PPC 0
 #define HAVE_NEON 0
 #define HAVE_NEON_ASM 0
 #define HAVE_MIPS32 0

third_party/libvpx/source/config/linux/mips64el/vpx_config.h

@@ -11,10 +11,15 @@
 #define RESTRICT    
 #define INLINE      inline
 #define VPX_ARCH_ARM 0
+#define ARCH_ARM 0
 #define VPX_ARCH_MIPS 1
+#define ARCH_MIPS 1
 #define VPX_ARCH_X86 0
+#define ARCH_X86 0
 #define VPX_ARCH_X86_64 0
+#define ARCH_X86_64 0
 #define VPX_ARCH_PPC 0
+#define ARCH_PPC 0
 #define HAVE_NEON 0
 #define HAVE_NEON_ASM 0
 #define HAVE_MIPS32 0

third_party/libvpx/source/config/linux/mipsel/vpx_config.h

@@ -11,10 +11,15 @@
 #define RESTRICT    
 #define INLINE      inline
 #define VPX_ARCH_ARM 0
+#define ARCH_ARM 0
 #define VPX_ARCH_MIPS 1
+#define ARCH_MIPS 1
 #define VPX_ARCH_X86 0
+#define ARCH_X86 0
 #define VPX_ARCH_X86_64 0
+#define ARCH_X86_64 0
 #define VPX_ARCH_PPC 0
+#define ARCH_PPC 0
 #define HAVE_NEON 0
 #define HAVE_NEON_ASM 0
 #define HAVE_MIPS32 1

third_party/libvpx/source/config/linux/x64/vpx_config.asm

 %define VPX_ARCH_ARM 0
+%define ARCH_ARM 0
 %define VPX_ARCH_MIPS 0
+%define ARCH_MIPS 0
 %define VPX_ARCH_X86 0
+%define ARCH_X86 0
 %define VPX_ARCH_X86_64 1
+%define ARCH_X86_64 1
 %define VPX_ARCH_PPC 0
+%define ARCH_PPC 0
 %define HAVE_NEON 0
 %define HAVE_NEON_ASM 0
 %define HAVE_MIPS32 0

third_party/libvpx/source/config/linux/x64/vpx_config.h

@@ -11,10 +11,15 @@
 #define RESTRICT    
 #define INLINE      inline
 #define VPX_ARCH_ARM 0
+#define ARCH_ARM 0
 #define VPX_ARCH_MIPS 0
+#define ARCH_MIPS 0
 #define VPX_ARCH_X86 0
+#define ARCH_X86 0
 #define VPX_ARCH_X86_64 1
+#define ARCH_X86_64 1
 #define VPX_ARCH_PPC 0
+#define ARCH_PPC 0
 #define HAVE_NEON 0
 #define HAVE_NEON_ASM 0
 #define HAVE_MIPS32 0

third_party/libvpx/source/config/mac/ia32/vpx_config.asm

 %define VPX_ARCH_ARM 0
+%define ARCH_ARM 0
 %define VPX_ARCH_MIPS 0
+%define ARCH_MIPS 0
 %define VPX_ARCH_X86 1
+%define ARCH_X86 1
 %define VPX_ARCH_X86_64 0
+%define ARCH_X86_64 0
 %define VPX_ARCH_PPC 0
+%define ARCH_PPC 0
 %define HAVE_NEON 0
 %define HAVE_NEON_ASM 0
 %define HAVE_MIPS32 0

third_party/libvpx/source/config/mac/ia32/vpx_config.h

@@ -11,10 +11,15 @@
 #define RESTRICT    
 #define INLINE      inline
 #define VPX_ARCH_ARM 0
+#define ARCH_ARM 0
 #define VPX_ARCH_MIPS 0
+#define ARCH_MIPS 0
 #define VPX_ARCH_X86 1
+#define ARCH_X86 1
 #define VPX_ARCH_X86_64 0
+#define ARCH_X86_64 0
 #define VPX_ARCH_PPC 0
+#define ARCH_PPC 0
 #define HAVE_NEON 0
 #define HAVE_NEON_ASM 0
 #define HAVE_MIPS32 0

third_party/libvpx/source/config/mac/x64/vpx_config.asm

 %define VPX_ARCH_ARM 0
+%define ARCH_ARM 0
 %define VPX_ARCH_MIPS 0
+%define ARCH_MIPS 0
 %define VPX_ARCH_X86 0
+%define ARCH_X86 0
 %define VPX_ARCH_X86_64 1
+%define ARCH_X86_64 1
 %define VPX_ARCH_PPC 0
+%define ARCH_PPC 0
 %define HAVE_NEON 0
 %define HAVE_NEON_ASM 0
 %define HAVE_MIPS32 0

third_party/libvpx/source/config/mac/x64/vpx_config.h

@@ -11,10 +11,15 @@
 #define RESTRICT    
 #define INLINE      inline
 #define VPX_ARCH_ARM 0
+#define ARCH_ARM 0
 #define VPX_ARCH_MIPS 0
+#define ARCH_MIPS 0
 #define VPX_ARCH_X86 0
+#define ARCH_X86 0
 #define VPX_ARCH_X86_64 1
+#define ARCH_X86_64 1
 #define VPX_ARCH_PPC 0
+#define ARCH_PPC 0
 #define HAVE_NEON 0
 #define HAVE_NEON_ASM 0
 #define HAVE_MIPS32 0

third_party/libvpx/source/config/nacl/vpx_config.h

@@ -11,10 +11,15 @@
 #define RESTRICT    
 #define INLINE      inline
 #define VPX_ARCH_ARM 0
+#define ARCH_ARM 0
 #define VPX_ARCH_MIPS 0
+#define ARCH_MIPS 0
 #define VPX_ARCH_X86 0
+#define ARCH_X86 0
 #define VPX_ARCH_X86_64 0
+#define ARCH_X86_64 0
 #define VPX_ARCH_PPC 0
+#define ARCH_PPC 0
 #define HAVE_NEON 0
 #define HAVE_NEON_ASM 0
 #define HAVE_MIPS32 0

third_party/libvpx/source/config/win/arm64/vpx_config.asm

@@ -3,10 +3,15 @@
 
 	.syntax unified
 .set VPX_ARCH_ARM ,  1
+.set ARCH_ARM ,  1
 .set VPX_ARCH_MIPS ,  0
+.set ARCH_MIPS ,  0
 .set VPX_ARCH_X86 ,  0
+.set ARCH_X86 ,  0
 .set VPX_ARCH_X86_64 ,  0
+.set ARCH_X86_64 ,  0
 .set VPX_ARCH_PPC ,  0
+.set ARCH_PPC ,  0
 .set HAVE_NEON ,  1
 .set HAVE_NEON_ASM ,  0
 .set HAVE_MIPS32 ,  0

third_party/libvpx/source/config/win/arm64/vpx_config.h

@@ -11,10 +11,15 @@
 #define RESTRICT    
 #define INLINE      __inline
 #define VPX_ARCH_ARM 1
+#define ARCH_ARM 1
 #define VPX_ARCH_MIPS 0
+#define ARCH_MIPS 0
 #define VPX_ARCH_X86 0
+#define ARCH_X86 0
 #define VPX_ARCH_X86_64 0
+#define ARCH_X86_64 0
 #define VPX_ARCH_PPC 0
+#define ARCH_PPC 0
 #define HAVE_NEON 1
 #define HAVE_NEON_ASM 0
 #define HAVE_MIPS32 0

third_party/libvpx/source/config/win/ia32/vpx_config.asm

 %define VPX_ARCH_ARM 0
+%define ARCH_ARM 0
 %define VPX_ARCH_MIPS 0
+%define ARCH_MIPS 0
 %define VPX_ARCH_X86 1
+%define ARCH_X86 1
 %define VPX_ARCH_X86_64 0
+%define ARCH_X86_64 0
 %define VPX_ARCH_PPC 0
+%define ARCH_PPC 0
 %define HAVE_NEON 0
 %define HAVE_NEON_ASM 0
 %define HAVE_MIPS32 0

third_party/libvpx/source/config/win/ia32/vpx_config.h

@@ -11,10 +11,15 @@
 #define RESTRICT    
 #define INLINE      __inline
 #define VPX_ARCH_ARM 0
+#define ARCH_ARM 0
 #define VPX_ARCH_MIPS 0
+#define ARCH_MIPS 0
 #define VPX_ARCH_X86 1
+#define ARCH_X86 1
 #define VPX_ARCH_X86_64 0
+#define ARCH_X86_64 0
 #define VPX_ARCH_PPC 0
+#define ARCH_PPC 0
 #define HAVE_NEON 0
 #define HAVE_NEON_ASM 0
 #define HAVE_MIPS32 0

third_party/libvpx/source/config/win/x64/vpx_config.asm

 %define VPX_ARCH_ARM 0
+%define ARCH_ARM 0
 %define VPX_ARCH_MIPS 0
+%define ARCH_MIPS 0
 %define VPX_ARCH_X86 0
+%define ARCH_X86 0
 %define VPX_ARCH_X86_64 1
+%define ARCH_X86_64 1
 %define VPX_ARCH_PPC 0
+%define ARCH_PPC 0
 %define HAVE_NEON 0
 %define HAVE_NEON_ASM 0
 %define HAVE_MIPS32 0

third_party/libvpx/source/config/win/x64/vpx_config.h

@@ -11,10 +11,15 @@
 #define RESTRICT    
 #define INLINE      __inline
 #define VPX_ARCH_ARM 0
+#define ARCH_ARM 0
 #define VPX_ARCH_MIPS 0
+#define ARCH_MIPS 0
 #define VPX_ARCH_X86 0
+#define ARCH_X86 0
 #define VPX_ARCH_X86_64 1
+#define ARCH_X86_64 1
 #define VPX_ARCH_PPC 0
+#define ARCH_PPC 0
 #define HAVE_NEON 0
 #define HAVE_NEON_ASM 0
 #define HAVE_MIPS32 0