Bug 1867459 - Replace CPU_ARCH with TARGET_CPU. r=firefox-build-system-reviewers,sergesanspaille

Differential Revision: https://phabricator.services.mozilla.com/D195157

Author: glandium

browser/installer/windows/Makefile.in

@@ -5,7 +5,7 @@
 include $(topsrcdir)/toolkit/mozapps/installer/package-name.mk
 
 CONFIG_DIR = instgen
-ifeq ($(CPU_ARCH), aarch64)
+ifeq ($(TARGET_CPU), aarch64)
 SFX_MODULE = $(topsrcdir)/other-licenses/7zstub/firefox/7zSD.ARM64.sfx
 else
 SFX_MODULE = $(topsrcdir)/other-licenses/7zstub/firefox/7zSD.Win32.sfx

build/autoconf/sanitize.m4

@@ -10,7 +10,7 @@ dnl ========================================================
 if test -n "$MOZ_ASAN"; then
     if test -n "$CLANG_CL"; then
         # Look for the ASan runtime binary
-        if test "$CPU_ARCH" = "x86_64"; then
+        if test "$TARGET_CPU" = "x86_64"; then
           MOZ_CLANG_RT_ASAN_LIB=clang_rt.asan_dynamic-x86_64.dll
         else
           MOZ_CLANG_RT_ASAN_LIB=clang_rt.asan_dynamic-i386.dll

build/gyp_base.mozbuild

@@ -36,4 +36,4 @@ arches = {
 }
 
 gyp_vars["host_arch"] = arches.get(CONFIG["HOST_CPU_ARCH"], CONFIG["HOST_CPU_ARCH"])
-gyp_vars["target_arch"] = arches.get(CONFIG["CPU_ARCH"], CONFIG["CPU_ARCH"])
+gyp_vars["target_arch"] = arches.get(CONFIG["TARGET_CPU"], CONFIG["TARGET_CPU"])

build/moz-automation.mk

@@ -12,7 +12,7 @@ ifdef CROSS_COMPILE
 # Narrow the definition of cross compilation to not include win32 builds
 # on win64 and linux32 builds on linux64.
 ifeq ($(HOST_OS_ARCH),$(OS_TARGET))
-ifneq (,$(filter x86%,$(CPU_ARCH)))
+ifneq (,$(filter x86%,$(TARGET_CPU)))
 FUZZY_CROSS_COMPILE =
 else
 FUZZY_CROSS_COMPILE = 1

build/moz.configure/init.configure

@@ -825,10 +825,9 @@ set_config("OS_TARGET", target_variables.OS_TARGET)
 add_old_configure_assignment("OS_TARGET", target_variables.OS_TARGET)
 set_config("OS_ARCH", target_variables.OS_ARCH)
 add_old_configure_assignment("OS_ARCH", target_variables.OS_ARCH)
-set_config("CPU_ARCH", target.cpu)
-add_old_configure_assignment("CPU_ARCH", target.cpu)
 set_config("INTEL_ARCHITECTURE", target_variables.INTEL_ARCHITECTURE)
 set_config("TARGET_CPU", target.cpu)
+add_old_configure_assignment("TARGET_CPU", target.cpu)
 set_config("TARGET_RAW_CPU", target.raw_cpu)
 set_config("TARGET_OS", target.os)
 set_config("TARGET_RAW_OS", target.raw_os)

build/unix/elfhack/inject/moz.build

@@ -10,7 +10,7 @@ Library("elfhack_inject")
 
 DIST_INSTALL = False
 
-stem = CONFIG["CPU_ARCH"]
+stem = CONFIG["TARGET_CPU"]
 if CONFIG["RELRHACK"] and CONFIG["OS_TARGET"] == "Android":
     stem += "-android"
 

build/win32/autowinchecksec.py

@@ -60,7 +60,7 @@
     "seh",
 ]
 
-if buildconfig.substs["CPU_ARCH"] == "x86":
+if buildconfig.substs["TARGET_CPU"] == "x86":
     checks += [
         "safeSEH",
     ]

config/config.mk

@@ -285,7 +285,7 @@ endif # WINNT
 
 ifeq ($(OS_ARCH),WINNT)
 ifneq (,$(filter msvc clang-cl,$(CC_TYPE)))
-ifneq ($(CPU_ARCH),x86)
+ifneq ($(TARGET_CPU),x86)
 # Normal operation on 64-bit Windows needs 2 MB of stack. (Bug 582910)
 # ASAN requires 6 MB of stack.
 # Setting the stack to 8 MB to match the capability of other systems
@@ -310,7 +310,7 @@ WIN32_EXE_LDFLAGS      += -STACK:2097152
 endif
 endif
 else
-ifneq ($(CPU_ARCH),x86)
+ifneq ($(TARGET_CPU),x86)
 MOZ_PROGRAM_LDFLAGS += -Wl,-Xlink=-STACK:8388608
 else
 MOZ_PROGRAM_LDFLAGS += -Wl,-Xlink=-STACK:1572864

config/create_res.py

@@ -54,7 +54,7 @@ def generate_res():
             cpu_arch_dict = {"x86_64": "_AMD64_", "x86": "_X86_", "aarch64": "_ARM64_"}
 
             # add a preprocessor #define that specifies the CPU architecture
-            cpu_arch_ppd = cpu_arch_dict[buildconfig.substs["CPU_ARCH"]]
+            cpu_arch_ppd = cpu_arch_dict[buildconfig.substs["TARGET_CPU"]]
 
             command.extend(("-D", cpu_arch_ppd))
 

config/external/ffi/moz.build

@@ -126,7 +126,7 @@ else:
     ):
         DEFINES["SYMBOL_UNDERSCORE"] = True
 
-    if CONFIG["OS_ARCH"] == "Darwin" and CONFIG["CPU_ARCH"] in ("arm", "aarch64"):
+    if CONFIG["OS_ARCH"] == "Darwin" and CONFIG["TARGET_CPU"] in ("arm", "aarch64"):
         DEFINES["FFI_EXEC_TRAMPOLINE_TABLE"] = True
         ffi_h_defines.append("FFI_EXEC_TRAMPOLINE_TABLE")
 

config/external/icu/data/moz.build

@@ -11,7 +11,7 @@ Library("icudata")
 LOCAL_INCLUDES += ["."]
 
 prefix = ""
-if (CONFIG["OS_ARCH"] == "WINNT" and CONFIG["CPU_ARCH"] == "x86") or CONFIG[
+if (CONFIG["OS_ARCH"] == "WINNT" and CONFIG["TARGET_CPU"] == "x86") or CONFIG[
     "OS_ARCH"
 ] == "Darwin":
     prefix = "_"

config/external/moz.build

@@ -49,7 +49,7 @@ if not CONFIG["MOZ_SYSTEM_PNG"]:
 if not CONFIG["MOZ_SYSTEM_WEBP"]:
     external_dirs += ["media/libwebp"]
 
-if CONFIG["CPU_ARCH"] == "arm":
+if CONFIG["TARGET_CPU"] == "arm":
     external_dirs += ["media/openmax_dl/dl"]
 
 if CONFIG["MOZ_FFVPX"]:

config/external/nspr/pr/moz.build

@@ -21,12 +21,12 @@ if CONFIG["OS_ARCH"] == "Linux":
     DEFINES["HAVE_POINTER_LOCALTIME_R"] = True
     DEFINES["_GNU_SOURCE"] = True
     SOURCES += ["/nsprpub/pr/src/md/unix/linux.c"]
-    if CONFIG["CPU_ARCH"] == "x86_64":
+    if CONFIG["TARGET_CPU"] == "x86_64":
         SOURCES += ["/nsprpub/pr/src/md/unix/os_Linux_x86_64.s"]
-    elif CONFIG["CPU_ARCH"] == "x86":
+    elif CONFIG["TARGET_CPU"] == "x86":
         DEFINES["i386"] = True
         SOURCES += ["/nsprpub/pr/src/md/unix/os_Linux_x86.s"]
-    elif CONFIG["CPU_ARCH"] == "ppc":
+    elif CONFIG["TARGET_CPU"] == "ppc":
         SOURCES += ["/nsprpub/pr/src/md/unix/os_Linux_ppc.s"]
 elif CONFIG["OS_TARGET"] in ("FreeBSD", "OpenBSD", "NetBSD"):
     DEFINES["HAVE_BSD_FLOCK"] = True
@@ -56,11 +56,11 @@ elif CONFIG["OS_TARGET"] == "SunOS":
     DEFINES["_PR_INET6"] = True
     DEFINES["SOLARIS"] = True
     SOURCES += ["/nsprpub/pr/src/md/unix/solaris.c"]
-    if CONFIG["CPU_ARCH"] == "x86_64":
+    if CONFIG["TARGET_CPU"] == "x86_64":
         SOURCES += ["/nsprpub/pr/src/md/unix/os_SunOS_x86_64.s"]
-    elif CONFIG["CPU_ARCH"] == "x86":
+    elif CONFIG["TARGET_CPU"] == "x86":
         SOURCES += ["/nsprpub/pr/src/md/unix/os_SunOS_x86.s"]
-    elif CONFIG["CPU_ARCH"] == "sparc64":
+    elif CONFIG["TARGET_CPU"] == "sparc64":
         ASFLAGS += ["-x", "assembler-with-cpp", "-D_ASM"]
         SOURCES += ["/nsprpub/pr/src/md/unix/os_SunOS_sparcv9.s"]
 elif CONFIG["OS_TARGET"] == "WINNT":
@@ -80,14 +80,14 @@ elif CONFIG["OS_TARGET"] == "WINNT":
     DEFINES["_PR_GLOBAL_THREADS_ONLY"] = True
     if not CONFIG["DEBUG"]:
         DEFINES["DO_NOT_WAIT_FOR_CONNECT_OVERLAPPED_OPERATIONS"] = True
-    if CONFIG["CPU_ARCH"] == "x86_64":
+    if CONFIG["TARGET_CPU"] == "x86_64":
         DEFINES["_AMD64_"] = True
-    elif CONFIG["CPU_ARCH"] == "x86":
+    elif CONFIG["TARGET_CPU"] == "x86":
         DEFINES["_X86_"] = True
-    elif CONFIG["CPU_ARCH"] == "aarch64":
+    elif CONFIG["TARGET_CPU"] == "aarch64":
         DEFINES["_ARM64_"] = True
     else:
-        error("Unsupported CPU_ARCH value: %s" % CONFIG["CPU_ARCH"])
+        error("Unsupported TARGET_CPU value: %s" % CONFIG["TARGET_CPU"])
 else:
     error(
         'Not a supported OS_TARGET for NSPR in moz.build: "%s". Use --with-system-nspr'

config/rules.mk

@@ -143,7 +143,7 @@ endif
 endif # !GNU_CC
 endif # WINNT
 
-ifeq (arm-Darwin,$(CPU_ARCH)-$(OS_TARGET))
+ifeq (arm-Darwin,$(TARGET_CPU)-$(OS_TARGET))
 ifdef PROGRAM
 MOZ_PROGRAM_LDFLAGS += -Wl,-rpath -Wl,@executable_path/Frameworks
 endif

config/system-headers.mozbuild

@@ -1356,7 +1356,7 @@ if CONFIG["OS_TARGET"] in ("Android", "Linux", "FreeBSD"):
         "sys/auxv.h",
     ]
 
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["CPU_ARCH"].startswith("mips"):
+if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"].startswith("mips"):
     system_headers += [
         "sys/cachectl.h",
     ]

docs/code-quality/coding-style/coding_style_python.rst

@@ -49,7 +49,7 @@ Makefile/moz.build practices
           'bar'
       ]
 
--  Use ``CONFIG['CPU_ARCH'] {=arm}`` to test for generic classes of
+-  Use ``CONFIG['TARGET_CPU'] {=arm}`` to test for generic classes of
    architecture rather than ``CONFIG['OS_TEST'] {=armv7}`` (re: bug 886689).
 
 

dom/base/moz.build

@@ -501,7 +501,7 @@ if CONFIG["MOZ_PLACES"]:
 # on win32 if we add these files to UNIFIED_SOURCES then the compiler generates
 # larger stack frames for some recursive functions that cause us to hit stack
 # overflows (see bug 1824565)
-if CONFIG["OS_ARCH"] == "WINNT" and CONFIG["CPU_ARCH"] == "x86":
+if CONFIG["OS_ARCH"] == "WINNT" and CONFIG["TARGET_CPU"] == "x86":
     SOURCES += [
         "CompressionStream.cpp",
         "DecompressionStream.cpp",
@@ -541,7 +541,7 @@ if CONFIG["INTEL_ARCHITECTURE"]:
 
 # Are we targeting PowerPC? If so, we can enable a SIMD version for
 # nsTextFragment.cpp as well.
-if CONFIG["CPU_ARCH"].startswith("ppc"):
+if CONFIG["TARGET_CPU"].startswith("ppc"):
     SOURCES += ["nsTextFragmentVMX.cpp"]
     SOURCES["nsTextFragmentVMX.cpp"].flags += CONFIG["PPC_VMX_FLAGS"]
 

dom/media/webaudio/moz.build

@@ -125,7 +125,7 @@ UNIFIED_SOURCES += [
     "WebAudioUtils.cpp",
 ]
 
-if CONFIG["CPU_ARCH"] == "aarch64" or CONFIG["BUILD_ARM_NEON"]:
+if CONFIG["TARGET_CPU"] == "aarch64" or CONFIG["BUILD_ARM_NEON"]:
     DEFINES["USE_NEON"] = True
     LOCAL_INCLUDES += ["/third_party/xsimd/include"]
     SOURCES += ["AudioNodeEngineNEON.cpp"]

dom/media/webrtc/third_party_build/webrtc.mozbuild

@@ -22,13 +22,13 @@ if CONFIG["MOZ_WEBRTC"]:
     if CONFIG["OS_TARGET"] == "Linux":
         DEFINES["WEBRTC_LINUX"] = True
         if (
-            CONFIG["CPU_ARCH"] == "x86"
-            or CONFIG["CPU_ARCH"] == "x86_64"
-            or CONFIG["CPU_ARCH"] == "arm"
-            or CONFIG["CPU_ARCH"] == "aarch64"
+            CONFIG["TARGET_CPU"] == "x86"
+            or CONFIG["TARGET_CPU"] == "x86_64"
+            or CONFIG["TARGET_CPU"] == "arm"
+            or CONFIG["TARGET_CPU"] == "aarch64"
             or (
                 CONFIG["TARGET_ENDIANNESS"] == "little"
-                and CONFIG["CPU_ARCH"].startswith("mips")
+                and CONFIG["TARGET_CPU"].startswith("mips")
             )
         ):
             DEFINES["WEBRTC_USE_PIPEWIRE"] = True

gfx/2d/moz.build

@@ -145,7 +145,7 @@ if CONFIG["INTEL_ARCHITECTURE"]:
     SOURCES["SwizzleSSE2.cpp"].flags += CONFIG["SSE2_FLAGS"]
     SOURCES["SwizzleSSSE3.cpp"].flags += CONFIG["SSSE3_FLAGS"]
     SOURCES["ssse3-scaler.c"].flags += CONFIG["SSSE3_FLAGS"]
-elif CONFIG["CPU_ARCH"].startswith("mips"):
+elif CONFIG["TARGET_CPU"].startswith("mips"):
     SOURCES += [
         "BlurLS3.cpp",
     ]
@@ -197,7 +197,7 @@ if CONFIG["MOZ_WIDGET_TOOLKIT"] == "cocoa":
         "MacIOSurface.cpp",
     ]
 
-if CONFIG["CPU_ARCH"] == "aarch64" or CONFIG["BUILD_ARM_NEON"]:
+if CONFIG["TARGET_CPU"] == "aarch64" or CONFIG["BUILD_ARM_NEON"]:
     SOURCES += [
         "BlurNEON.cpp",
         "ConvolutionFilterNEON.cpp",

gfx/cairo/libpixman/src/moz.build

@@ -78,7 +78,7 @@ if CONFIG['INTEL_ARCHITECTURE']:
     SOURCES['pixman-sse2.c'].flags += CONFIG['SSE_FLAGS'] + CONFIG['SSE2_FLAGS']
     SOURCES['pixman-ssse3.c'].flags += CONFIG['SSSE3_FLAGS']
 # AArch64 NEON optimizations don't build on Windows and Mac out of the box.
-elif CONFIG['CPU_ARCH'] == 'aarch64' and CONFIG['OS_TARGET'] in ('Android', 'Linux', 'Darwin'):
+elif CONFIG['TARGET_CPU'] == 'aarch64' and CONFIG['OS_TARGET'] in ('Android', 'Linux', 'Darwin'):
     DEFINES['USE_ARM_A64_NEON'] = True
     if CONFIG['OS_TARGET'] == 'Darwin':
         DEFINES['ASM_LEADING_UNDERSCORE'] = True
@@ -88,7 +88,7 @@ elif CONFIG['CPU_ARCH'] == 'aarch64' and CONFIG['OS_TARGET'] in ('Android', 'Lin
         'pixman-arma64-neon-asm.S',
     ]
     SOURCES['pixman-arm-neon.c'].flags += ['-march=armv8-a']
-elif CONFIG['CPU_ARCH'] == 'arm':
+elif CONFIG['TARGET_CPU'] == 'arm':
     if CONFIG['HAVE_ARM_NEON']:
         DEFINES['USE_ARM_NEON'] = True
         SOURCES += [
@@ -104,7 +104,7 @@ elif CONFIG['CPU_ARCH'] == 'arm':
             'pixman-arm-simd-asm.S',
             'pixman-arm-simd.c',
         ]
-elif CONFIG['CPU_ARCH'] in ('ppc', 'ppc64'):
+elif CONFIG['TARGET_CPU'] in ('ppc', 'ppc64'):
     if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
         DEFINES['USE_VMX'] = True
         SOURCES += ['pixman-vmx.c']

gfx/skia/generate_mozbuild.py

@@ -58,7 +58,7 @@
     SOURCES['skia/src/opts/SkOpts_hsw.cpp'].flags += ['-Dskvx=skvx_hsw', '-mavx2', '-mf16c', '-mfma']
     if not CONFIG["MOZ_CODE_COVERAGE"]:
         SOURCES['skia/src/opts/SkOpts_skx.cpp'].flags += ['-Dskvx=skvx_skx', '-mavx512f', '-mavx512dq', '-mavx512cd', '-mavx512bw', '-mavx512vl']
-elif CONFIG['CPU_ARCH'] == 'aarch64' and CONFIG['CC_TYPE'] in ('clang', 'gcc'):
+elif CONFIG['TARGET_CPU'] == 'aarch64' and CONFIG['CC_TYPE'] in ('clang', 'gcc'):
     SOURCES['skia/src/opts/SkOpts_crc32.cpp'].flags += ['-Dskvx=skvx_crc32', '-march=armv8-a+crc']
 
 DEFINES['MOZ_SKIA'] = True
@@ -100,7 +100,7 @@
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
     CXXFLAGS += CONFIG['MOZ_PANGO_CFLAGS']
 
-if CONFIG['CPU_ARCH'] in ('mips32', 'mips64'):
+if CONFIG['TARGET_CPU'] in ('mips32', 'mips64'):
     # The skia code uses `mips` as a variable, but it's a builtin preprocessor
     # macro on mips that expands to `1`.
     DEFINES['mips'] = False
@@ -387,12 +387,12 @@ def write_mozbuild(sources):
   write_cflags(f, sources['intel'], opt_allowlist, 'skia_opt_flags', 4)
 
   if sources['arm']:
-    f.write("elif CONFIG['CPU_ARCH'] == 'arm' and CONFIG['CC_TYPE'] in ('clang', 'gcc'):\n")
+    f.write("elif CONFIG['TARGET_CPU'] == 'arm' and CONFIG['CC_TYPE'] in ('clang', 'gcc'):\n")
     write_sources(f, sources['arm'], 4)
     write_cflags(f, sources['arm'], opt_allowlist, 'skia_opt_flags', 4)
 
   if sources['arm64']:
-    f.write("elif CONFIG['CPU_ARCH'] == 'aarch64':\n")
+    f.write("elif CONFIG['TARGET_CPU'] == 'aarch64':\n")
     write_sources(f, sources['arm64'], 4)
     write_cflags(f, sources['arm64'], opt_allowlist, 'skia_opt_flags', 4)
 

gfx/skia/moz.build

@@ -536,7 +536,7 @@ if CONFIG['INTEL_ARCHITECTURE']:
     SOURCES['skia/src/opts/SkOpts_skx.cpp'].flags += skia_opt_flags
     SOURCES['skia/src/opts/SkOpts_sse42.cpp'].flags += skia_opt_flags
     SOURCES['skia/src/opts/SkOpts_ssse3.cpp'].flags += skia_opt_flags
-elif CONFIG['CPU_ARCH'] == 'aarch64':
+elif CONFIG['TARGET_CPU'] == 'aarch64':
     SOURCES += [
         'skia/src/opts/SkOpts_crc32.cpp',
     ]
@@ -568,7 +568,7 @@ if CONFIG['INTEL_ARCHITECTURE']:
     SOURCES['skia/src/opts/SkOpts_hsw.cpp'].flags += ['-Dskvx=skvx_hsw', '-mavx2', '-mf16c', '-mfma']
     if not CONFIG["MOZ_CODE_COVERAGE"]:
         SOURCES['skia/src/opts/SkOpts_skx.cpp'].flags += ['-Dskvx=skvx_skx', '-mavx512f', '-mavx512dq', '-mavx512cd', '-mavx512bw', '-mavx512vl']
-elif CONFIG['CPU_ARCH'] == 'aarch64' and CONFIG['CC_TYPE'] in ('clang', 'gcc'):
+elif CONFIG['TARGET_CPU'] == 'aarch64' and CONFIG['CC_TYPE'] in ('clang', 'gcc'):
     SOURCES['skia/src/opts/SkOpts_crc32.cpp'].flags += ['-Dskvx=skvx_crc32', '-march=armv8-a+crc']
 
 DEFINES['MOZ_SKIA'] = True
@@ -610,11 +610,11 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk', 'android'):
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
     CXXFLAGS += CONFIG['MOZ_PANGO_CFLAGS']
 
-if CONFIG['CPU_ARCH'] in ('mips32', 'mips64'):
+if CONFIG['TARGET_CPU'] in ('mips32', 'mips64'):
     # The skia code uses `mips` as a variable, but it's a builtin preprocessor
     # macro on mips that expands to `1`.
     DEFINES['mips'] = False
 
 # Work around bug 1841199.
-if CONFIG['CPU_ARCH'] in ('mips32', 'mips64', 'ppc64'):
+if CONFIG['TARGET_CPU'] in ('mips32', 'mips64', 'ppc64'):
     DEFINES['musttail'] = 'nomusttail'

gfx/tests/gtest/moz.build

@@ -27,7 +27,7 @@ UNIFIED_SOURCES += [
 ]
 
 # skip the test on windows10-aarch64 due to perma-crash - bug 1544961
-if not (CONFIG["OS_TARGET"] == "WINNT" and CONFIG["CPU_ARCH"] == "aarch64"):
+if not (CONFIG["OS_TARGET"] == "WINNT" and CONFIG["TARGET_CPU"] == "aarch64"):
     UNIFIED_SOURCES += [
         "TestVsync.cpp",
     ]

gfx/ycbcr/moz.build

@@ -25,7 +25,7 @@ if CONFIG['INTEL_ARCHITECTURE']:
 
     # MSVC doesn't support MMX when targeting AMD64.
     if CONFIG['CC_TYPE'] == 'clang-cl':
-        if CONFIG['CPU_ARCH'] == 'x86':
+        if CONFIG['TARGET_CPU'] == 'x86':
             SOURCES += [
                 'yuv_convert_mmx.cpp',
             ]
@@ -34,8 +34,8 @@ if CONFIG['INTEL_ARCHITECTURE']:
         SOURCES['yuv_convert_mmx.cpp'].flags += CONFIG['MMX_FLAGS']
 
 if CONFIG['CC_TYPE'] == 'clang-cl':
-    if CONFIG['CPU_ARCH'] == 'x86_64' or \
-       (CONFIG['CPU_ARCH'] == 'x86' and CONFIG['CC_TYPE'] == 'clang-cl'):
+    if CONFIG['TARGET_CPU'] == 'x86_64' or \
+       (CONFIG['TARGET_CPU'] == 'x86' and CONFIG['CC_TYPE'] == 'clang-cl'):
         SOURCES += [
             'yuv_row_win64.cpp',
         ]
@@ -53,7 +53,7 @@ else:
         'yuv_row_other.cpp',
     ]
 
-if CONFIG['CPU_ARCH'] == 'arm' and CONFIG['HAVE_ARM_NEON']:
+if CONFIG['TARGET_CPU'] == 'arm' and CONFIG['HAVE_ARM_NEON']:
     SOURCES += [
         'yuv_row_arm.s',
     ]

image/test/gtest/moz.build

@@ -22,7 +22,7 @@ UNIFIED_SOURCES = [
 ]
 
 # skip the test on windows10-aarch64, aarch64 due to 1544961
-if not (CONFIG["OS_TARGET"] == "WINNT" and CONFIG["CPU_ARCH"] == "aarch64"):
+if not (CONFIG["OS_TARGET"] == "WINNT" and CONFIG["TARGET_CPU"] == "aarch64"):
     UNIFIED_SOURCES += [
         "TestDecoders.cpp",
         "TestDecodersPerf.cpp",