Skip to content

Commit 619672a

Browse files
committed
Bug 1867459 - Replace CPU_ARCH with TARGET_CPU. r=firefox-build-system-reviewers,sergesanspaille
Differential Revision: https://phabricator.services.mozilla.com/D195157
1 parent 38f8a07 commit 619672a

File tree

566 files changed

+5664
-5665
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

566 files changed

+5664
-5665
lines changed

browser/installer/windows/Makefile.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
include $(topsrcdir)/toolkit/mozapps/installer/package-name.mk
66

77
CONFIG_DIR = instgen
8-
ifeq ($(CPU_ARCH), aarch64)
8+
ifeq ($(TARGET_CPU), aarch64)
99
SFX_MODULE = $(topsrcdir)/other-licenses/7zstub/firefox/7zSD.ARM64.sfx
1010
else
1111
SFX_MODULE = $(topsrcdir)/other-licenses/7zstub/firefox/7zSD.Win32.sfx

build/autoconf/sanitize.m4

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ dnl ========================================================
1010
if test -n "$MOZ_ASAN"; then
1111
if test -n "$CLANG_CL"; then
1212
# Look for the ASan runtime binary
13-
if test "$CPU_ARCH" = "x86_64"; then
13+
if test "$TARGET_CPU" = "x86_64"; then
1414
MOZ_CLANG_RT_ASAN_LIB=clang_rt.asan_dynamic-x86_64.dll
1515
else
1616
MOZ_CLANG_RT_ASAN_LIB=clang_rt.asan_dynamic-i386.dll

build/gyp_base.mozbuild

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,4 @@ arches = {
3636
}
3737

3838
gyp_vars["host_arch"] = arches.get(CONFIG["HOST_CPU_ARCH"], CONFIG["HOST_CPU_ARCH"])
39-
gyp_vars["target_arch"] = arches.get(CONFIG["CPU_ARCH"], CONFIG["CPU_ARCH"])
39+
gyp_vars["target_arch"] = arches.get(CONFIG["TARGET_CPU"], CONFIG["TARGET_CPU"])

build/moz-automation.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ifdef CROSS_COMPILE
1212
# Narrow the definition of cross compilation to not include win32 builds
1313
# on win64 and linux32 builds on linux64.
1414
ifeq ($(HOST_OS_ARCH),$(OS_TARGET))
15-
ifneq (,$(filter x86%,$(CPU_ARCH)))
15+
ifneq (,$(filter x86%,$(TARGET_CPU)))
1616
FUZZY_CROSS_COMPILE =
1717
else
1818
FUZZY_CROSS_COMPILE = 1

build/moz.configure/init.configure

+1-2
Original file line numberDiff line numberDiff line change
@@ -825,10 +825,9 @@ set_config("OS_TARGET", target_variables.OS_TARGET)
825825
add_old_configure_assignment("OS_TARGET", target_variables.OS_TARGET)
826826
set_config("OS_ARCH", target_variables.OS_ARCH)
827827
add_old_configure_assignment("OS_ARCH", target_variables.OS_ARCH)
828-
set_config("CPU_ARCH", target.cpu)
829-
add_old_configure_assignment("CPU_ARCH", target.cpu)
830828
set_config("INTEL_ARCHITECTURE", target_variables.INTEL_ARCHITECTURE)
831829
set_config("TARGET_CPU", target.cpu)
830+
add_old_configure_assignment("TARGET_CPU", target.cpu)
832831
set_config("TARGET_RAW_CPU", target.raw_cpu)
833832
set_config("TARGET_OS", target.os)
834833
set_config("TARGET_RAW_OS", target.raw_os)

build/unix/elfhack/inject/moz.build

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Library("elfhack_inject")
1010

1111
DIST_INSTALL = False
1212

13-
stem = CONFIG["CPU_ARCH"]
13+
stem = CONFIG["TARGET_CPU"]
1414
if CONFIG["RELRHACK"] and CONFIG["OS_TARGET"] == "Android":
1515
stem += "-android"
1616

build/win32/autowinchecksec.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
"seh",
6161
]
6262

63-
if buildconfig.substs["CPU_ARCH"] == "x86":
63+
if buildconfig.substs["TARGET_CPU"] == "x86":
6464
checks += [
6565
"safeSEH",
6666
]

config/config.mk

+2-2
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ endif # WINNT
285285

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

config/create_res.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ def generate_res():
5454
cpu_arch_dict = {"x86_64": "_AMD64_", "x86": "_X86_", "aarch64": "_ARM64_"}
5555

5656
# add a preprocessor #define that specifies the CPU architecture
57-
cpu_arch_ppd = cpu_arch_dict[buildconfig.substs["CPU_ARCH"]]
57+
cpu_arch_ppd = cpu_arch_dict[buildconfig.substs["TARGET_CPU"]]
5858

5959
command.extend(("-D", cpu_arch_ppd))
6060

config/external/ffi/moz.build

+1-1
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ else:
126126
):
127127
DEFINES["SYMBOL_UNDERSCORE"] = True
128128

129-
if CONFIG["OS_ARCH"] == "Darwin" and CONFIG["CPU_ARCH"] in ("arm", "aarch64"):
129+
if CONFIG["OS_ARCH"] == "Darwin" and CONFIG["TARGET_CPU"] in ("arm", "aarch64"):
130130
DEFINES["FFI_EXEC_TRAMPOLINE_TABLE"] = True
131131
ffi_h_defines.append("FFI_EXEC_TRAMPOLINE_TABLE")
132132

config/external/icu/data/moz.build

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Library("icudata")
1111
LOCAL_INCLUDES += ["."]
1212

1313
prefix = ""
14-
if (CONFIG["OS_ARCH"] == "WINNT" and CONFIG["CPU_ARCH"] == "x86") or CONFIG[
14+
if (CONFIG["OS_ARCH"] == "WINNT" and CONFIG["TARGET_CPU"] == "x86") or CONFIG[
1515
"OS_ARCH"
1616
] == "Darwin":
1717
prefix = "_"

config/external/moz.build

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ if not CONFIG["MOZ_SYSTEM_PNG"]:
4949
if not CONFIG["MOZ_SYSTEM_WEBP"]:
5050
external_dirs += ["media/libwebp"]
5151

52-
if CONFIG["CPU_ARCH"] == "arm":
52+
if CONFIG["TARGET_CPU"] == "arm":
5353
external_dirs += ["media/openmax_dl/dl"]
5454

5555
if CONFIG["MOZ_FFVPX"]:

config/external/nspr/pr/moz.build

+10-10
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ if CONFIG["OS_ARCH"] == "Linux":
2121
DEFINES["HAVE_POINTER_LOCALTIME_R"] = True
2222
DEFINES["_GNU_SOURCE"] = True
2323
SOURCES += ["/nsprpub/pr/src/md/unix/linux.c"]
24-
if CONFIG["CPU_ARCH"] == "x86_64":
24+
if CONFIG["TARGET_CPU"] == "x86_64":
2525
SOURCES += ["/nsprpub/pr/src/md/unix/os_Linux_x86_64.s"]
26-
elif CONFIG["CPU_ARCH"] == "x86":
26+
elif CONFIG["TARGET_CPU"] == "x86":
2727
DEFINES["i386"] = True
2828
SOURCES += ["/nsprpub/pr/src/md/unix/os_Linux_x86.s"]
29-
elif CONFIG["CPU_ARCH"] == "ppc":
29+
elif CONFIG["TARGET_CPU"] == "ppc":
3030
SOURCES += ["/nsprpub/pr/src/md/unix/os_Linux_ppc.s"]
3131
elif CONFIG["OS_TARGET"] in ("FreeBSD", "OpenBSD", "NetBSD"):
3232
DEFINES["HAVE_BSD_FLOCK"] = True
@@ -56,11 +56,11 @@ elif CONFIG["OS_TARGET"] == "SunOS":
5656
DEFINES["_PR_INET6"] = True
5757
DEFINES["SOLARIS"] = True
5858
SOURCES += ["/nsprpub/pr/src/md/unix/solaris.c"]
59-
if CONFIG["CPU_ARCH"] == "x86_64":
59+
if CONFIG["TARGET_CPU"] == "x86_64":
6060
SOURCES += ["/nsprpub/pr/src/md/unix/os_SunOS_x86_64.s"]
61-
elif CONFIG["CPU_ARCH"] == "x86":
61+
elif CONFIG["TARGET_CPU"] == "x86":
6262
SOURCES += ["/nsprpub/pr/src/md/unix/os_SunOS_x86.s"]
63-
elif CONFIG["CPU_ARCH"] == "sparc64":
63+
elif CONFIG["TARGET_CPU"] == "sparc64":
6464
ASFLAGS += ["-x", "assembler-with-cpp", "-D_ASM"]
6565
SOURCES += ["/nsprpub/pr/src/md/unix/os_SunOS_sparcv9.s"]
6666
elif CONFIG["OS_TARGET"] == "WINNT":
@@ -80,14 +80,14 @@ elif CONFIG["OS_TARGET"] == "WINNT":
8080
DEFINES["_PR_GLOBAL_THREADS_ONLY"] = True
8181
if not CONFIG["DEBUG"]:
8282
DEFINES["DO_NOT_WAIT_FOR_CONNECT_OVERLAPPED_OPERATIONS"] = True
83-
if CONFIG["CPU_ARCH"] == "x86_64":
83+
if CONFIG["TARGET_CPU"] == "x86_64":
8484
DEFINES["_AMD64_"] = True
85-
elif CONFIG["CPU_ARCH"] == "x86":
85+
elif CONFIG["TARGET_CPU"] == "x86":
8686
DEFINES["_X86_"] = True
87-
elif CONFIG["CPU_ARCH"] == "aarch64":
87+
elif CONFIG["TARGET_CPU"] == "aarch64":
8888
DEFINES["_ARM64_"] = True
8989
else:
90-
error("Unsupported CPU_ARCH value: %s" % CONFIG["CPU_ARCH"])
90+
error("Unsupported TARGET_CPU value: %s" % CONFIG["TARGET_CPU"])
9191
else:
9292
error(
9393
'Not a supported OS_TARGET for NSPR in moz.build: "%s". Use --with-system-nspr'

config/rules.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ endif
143143
endif # !GNU_CC
144144
endif # WINNT
145145

146-
ifeq (arm-Darwin,$(CPU_ARCH)-$(OS_TARGET))
146+
ifeq (arm-Darwin,$(TARGET_CPU)-$(OS_TARGET))
147147
ifdef PROGRAM
148148
MOZ_PROGRAM_LDFLAGS += -Wl,-rpath -Wl,@executable_path/Frameworks
149149
endif

config/system-headers.mozbuild

+1-1
Original file line numberDiff line numberDiff line change
@@ -1356,7 +1356,7 @@ if CONFIG["OS_TARGET"] in ("Android", "Linux", "FreeBSD"):
13561356
"sys/auxv.h",
13571357
]
13581358

1359-
if CONFIG["OS_TARGET"] == "Linux" and CONFIG["CPU_ARCH"].startswith("mips"):
1359+
if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"].startswith("mips"):
13601360
system_headers += [
13611361
"sys/cachectl.h",
13621362
]

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ Makefile/moz.build practices
4949
'bar'
5050
]
5151
52-
- Use ``CONFIG['CPU_ARCH'] {=arm}`` to test for generic classes of
52+
- Use ``CONFIG['TARGET_CPU'] {=arm}`` to test for generic classes of
5353
architecture rather than ``CONFIG['OS_TEST'] {=armv7}`` (re: bug 886689).
5454

5555

dom/base/moz.build

+2-2
Original file line numberDiff line numberDiff line change
@@ -501,7 +501,7 @@ if CONFIG["MOZ_PLACES"]:
501501
# on win32 if we add these files to UNIFIED_SOURCES then the compiler generates
502502
# larger stack frames for some recursive functions that cause us to hit stack
503503
# overflows (see bug 1824565)
504-
if CONFIG["OS_ARCH"] == "WINNT" and CONFIG["CPU_ARCH"] == "x86":
504+
if CONFIG["OS_ARCH"] == "WINNT" and CONFIG["TARGET_CPU"] == "x86":
505505
SOURCES += [
506506
"CompressionStream.cpp",
507507
"DecompressionStream.cpp",
@@ -541,7 +541,7 @@ if CONFIG["INTEL_ARCHITECTURE"]:
541541

542542
# Are we targeting PowerPC? If so, we can enable a SIMD version for
543543
# nsTextFragment.cpp as well.
544-
if CONFIG["CPU_ARCH"].startswith("ppc"):
544+
if CONFIG["TARGET_CPU"].startswith("ppc"):
545545
SOURCES += ["nsTextFragmentVMX.cpp"]
546546
SOURCES["nsTextFragmentVMX.cpp"].flags += CONFIG["PPC_VMX_FLAGS"]
547547

dom/media/webaudio/moz.build

+1-1
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ UNIFIED_SOURCES += [
125125
"WebAudioUtils.cpp",
126126
]
127127

128-
if CONFIG["CPU_ARCH"] == "aarch64" or CONFIG["BUILD_ARM_NEON"]:
128+
if CONFIG["TARGET_CPU"] == "aarch64" or CONFIG["BUILD_ARM_NEON"]:
129129
DEFINES["USE_NEON"] = True
130130
LOCAL_INCLUDES += ["/third_party/xsimd/include"]
131131
SOURCES += ["AudioNodeEngineNEON.cpp"]

dom/media/webrtc/third_party_build/webrtc.mozbuild

+5-5
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ if CONFIG["MOZ_WEBRTC"]:
2222
if CONFIG["OS_TARGET"] == "Linux":
2323
DEFINES["WEBRTC_LINUX"] = True
2424
if (
25-
CONFIG["CPU_ARCH"] == "x86"
26-
or CONFIG["CPU_ARCH"] == "x86_64"
27-
or CONFIG["CPU_ARCH"] == "arm"
28-
or CONFIG["CPU_ARCH"] == "aarch64"
25+
CONFIG["TARGET_CPU"] == "x86"
26+
or CONFIG["TARGET_CPU"] == "x86_64"
27+
or CONFIG["TARGET_CPU"] == "arm"
28+
or CONFIG["TARGET_CPU"] == "aarch64"
2929
or (
3030
CONFIG["TARGET_ENDIANNESS"] == "little"
31-
and CONFIG["CPU_ARCH"].startswith("mips")
31+
and CONFIG["TARGET_CPU"].startswith("mips")
3232
)
3333
):
3434
DEFINES["WEBRTC_USE_PIPEWIRE"] = True

gfx/2d/moz.build

+2-2
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ if CONFIG["INTEL_ARCHITECTURE"]:
145145
SOURCES["SwizzleSSE2.cpp"].flags += CONFIG["SSE2_FLAGS"]
146146
SOURCES["SwizzleSSSE3.cpp"].flags += CONFIG["SSSE3_FLAGS"]
147147
SOURCES["ssse3-scaler.c"].flags += CONFIG["SSSE3_FLAGS"]
148-
elif CONFIG["CPU_ARCH"].startswith("mips"):
148+
elif CONFIG["TARGET_CPU"].startswith("mips"):
149149
SOURCES += [
150150
"BlurLS3.cpp",
151151
]
@@ -197,7 +197,7 @@ if CONFIG["MOZ_WIDGET_TOOLKIT"] == "cocoa":
197197
"MacIOSurface.cpp",
198198
]
199199

200-
if CONFIG["CPU_ARCH"] == "aarch64" or CONFIG["BUILD_ARM_NEON"]:
200+
if CONFIG["TARGET_CPU"] == "aarch64" or CONFIG["BUILD_ARM_NEON"]:
201201
SOURCES += [
202202
"BlurNEON.cpp",
203203
"ConvolutionFilterNEON.cpp",

gfx/cairo/libpixman/src/moz.build

+3-3
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ if CONFIG['INTEL_ARCHITECTURE']:
7878
SOURCES['pixman-sse2.c'].flags += CONFIG['SSE_FLAGS'] + CONFIG['SSE2_FLAGS']
7979
SOURCES['pixman-ssse3.c'].flags += CONFIG['SSSE3_FLAGS']
8080
# AArch64 NEON optimizations don't build on Windows and Mac out of the box.
81-
elif CONFIG['CPU_ARCH'] == 'aarch64' and CONFIG['OS_TARGET'] in ('Android', 'Linux', 'Darwin'):
81+
elif CONFIG['TARGET_CPU'] == 'aarch64' and CONFIG['OS_TARGET'] in ('Android', 'Linux', 'Darwin'):
8282
DEFINES['USE_ARM_A64_NEON'] = True
8383
if CONFIG['OS_TARGET'] == 'Darwin':
8484
DEFINES['ASM_LEADING_UNDERSCORE'] = True
@@ -88,7 +88,7 @@ elif CONFIG['CPU_ARCH'] == 'aarch64' and CONFIG['OS_TARGET'] in ('Android', 'Lin
8888
'pixman-arma64-neon-asm.S',
8989
]
9090
SOURCES['pixman-arm-neon.c'].flags += ['-march=armv8-a']
91-
elif CONFIG['CPU_ARCH'] == 'arm':
91+
elif CONFIG['TARGET_CPU'] == 'arm':
9292
if CONFIG['HAVE_ARM_NEON']:
9393
DEFINES['USE_ARM_NEON'] = True
9494
SOURCES += [
@@ -104,7 +104,7 @@ elif CONFIG['CPU_ARCH'] == 'arm':
104104
'pixman-arm-simd-asm.S',
105105
'pixman-arm-simd.c',
106106
]
107-
elif CONFIG['CPU_ARCH'] in ('ppc', 'ppc64'):
107+
elif CONFIG['TARGET_CPU'] in ('ppc', 'ppc64'):
108108
if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
109109
DEFINES['USE_VMX'] = True
110110
SOURCES += ['pixman-vmx.c']

gfx/skia/generate_mozbuild.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
SOURCES['skia/src/opts/SkOpts_hsw.cpp'].flags += ['-Dskvx=skvx_hsw', '-mavx2', '-mf16c', '-mfma']
5959
if not CONFIG["MOZ_CODE_COVERAGE"]:
6060
SOURCES['skia/src/opts/SkOpts_skx.cpp'].flags += ['-Dskvx=skvx_skx', '-mavx512f', '-mavx512dq', '-mavx512cd', '-mavx512bw', '-mavx512vl']
61-
elif CONFIG['CPU_ARCH'] == 'aarch64' and CONFIG['CC_TYPE'] in ('clang', 'gcc'):
61+
elif CONFIG['TARGET_CPU'] == 'aarch64' and CONFIG['CC_TYPE'] in ('clang', 'gcc'):
6262
SOURCES['skia/src/opts/SkOpts_crc32.cpp'].flags += ['-Dskvx=skvx_crc32', '-march=armv8-a+crc']
6363
6464
DEFINES['MOZ_SKIA'] = True
@@ -100,7 +100,7 @@
100100
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
101101
CXXFLAGS += CONFIG['MOZ_PANGO_CFLAGS']
102102
103-
if CONFIG['CPU_ARCH'] in ('mips32', 'mips64'):
103+
if CONFIG['TARGET_CPU'] in ('mips32', 'mips64'):
104104
# The skia code uses `mips` as a variable, but it's a builtin preprocessor
105105
# macro on mips that expands to `1`.
106106
DEFINES['mips'] = False
@@ -387,12 +387,12 @@ def write_mozbuild(sources):
387387
write_cflags(f, sources['intel'], opt_allowlist, 'skia_opt_flags', 4)
388388

389389
if sources['arm']:
390-
f.write("elif CONFIG['CPU_ARCH'] == 'arm' and CONFIG['CC_TYPE'] in ('clang', 'gcc'):\n")
390+
f.write("elif CONFIG['TARGET_CPU'] == 'arm' and CONFIG['CC_TYPE'] in ('clang', 'gcc'):\n")
391391
write_sources(f, sources['arm'], 4)
392392
write_cflags(f, sources['arm'], opt_allowlist, 'skia_opt_flags', 4)
393393

394394
if sources['arm64']:
395-
f.write("elif CONFIG['CPU_ARCH'] == 'aarch64':\n")
395+
f.write("elif CONFIG['TARGET_CPU'] == 'aarch64':\n")
396396
write_sources(f, sources['arm64'], 4)
397397
write_cflags(f, sources['arm64'], opt_allowlist, 'skia_opt_flags', 4)
398398

gfx/skia/moz.build

+4-4
Original file line numberDiff line numberDiff line change
@@ -536,7 +536,7 @@ if CONFIG['INTEL_ARCHITECTURE']:
536536
SOURCES['skia/src/opts/SkOpts_skx.cpp'].flags += skia_opt_flags
537537
SOURCES['skia/src/opts/SkOpts_sse42.cpp'].flags += skia_opt_flags
538538
SOURCES['skia/src/opts/SkOpts_ssse3.cpp'].flags += skia_opt_flags
539-
elif CONFIG['CPU_ARCH'] == 'aarch64':
539+
elif CONFIG['TARGET_CPU'] == 'aarch64':
540540
SOURCES += [
541541
'skia/src/opts/SkOpts_crc32.cpp',
542542
]
@@ -568,7 +568,7 @@ if CONFIG['INTEL_ARCHITECTURE']:
568568
SOURCES['skia/src/opts/SkOpts_hsw.cpp'].flags += ['-Dskvx=skvx_hsw', '-mavx2', '-mf16c', '-mfma']
569569
if not CONFIG["MOZ_CODE_COVERAGE"]:
570570
SOURCES['skia/src/opts/SkOpts_skx.cpp'].flags += ['-Dskvx=skvx_skx', '-mavx512f', '-mavx512dq', '-mavx512cd', '-mavx512bw', '-mavx512vl']
571-
elif CONFIG['CPU_ARCH'] == 'aarch64' and CONFIG['CC_TYPE'] in ('clang', 'gcc'):
571+
elif CONFIG['TARGET_CPU'] == 'aarch64' and CONFIG['CC_TYPE'] in ('clang', 'gcc'):
572572
SOURCES['skia/src/opts/SkOpts_crc32.cpp'].flags += ['-Dskvx=skvx_crc32', '-march=armv8-a+crc']
573573

574574
DEFINES['MOZ_SKIA'] = True
@@ -610,11 +610,11 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk', 'android'):
610610
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
611611
CXXFLAGS += CONFIG['MOZ_PANGO_CFLAGS']
612612

613-
if CONFIG['CPU_ARCH'] in ('mips32', 'mips64'):
613+
if CONFIG['TARGET_CPU'] in ('mips32', 'mips64'):
614614
# The skia code uses `mips` as a variable, but it's a builtin preprocessor
615615
# macro on mips that expands to `1`.
616616
DEFINES['mips'] = False
617617

618618
# Work around bug 1841199.
619-
if CONFIG['CPU_ARCH'] in ('mips32', 'mips64', 'ppc64'):
619+
if CONFIG['TARGET_CPU'] in ('mips32', 'mips64', 'ppc64'):
620620
DEFINES['musttail'] = 'nomusttail'

gfx/tests/gtest/moz.build

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ UNIFIED_SOURCES += [
2727
]
2828

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

gfx/ycbcr/moz.build

+4-4
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ if CONFIG['INTEL_ARCHITECTURE']:
2525

2626
# MSVC doesn't support MMX when targeting AMD64.
2727
if CONFIG['CC_TYPE'] == 'clang-cl':
28-
if CONFIG['CPU_ARCH'] == 'x86':
28+
if CONFIG['TARGET_CPU'] == 'x86':
2929
SOURCES += [
3030
'yuv_convert_mmx.cpp',
3131
]
@@ -34,8 +34,8 @@ if CONFIG['INTEL_ARCHITECTURE']:
3434
SOURCES['yuv_convert_mmx.cpp'].flags += CONFIG['MMX_FLAGS']
3535

3636
if CONFIG['CC_TYPE'] == 'clang-cl':
37-
if CONFIG['CPU_ARCH'] == 'x86_64' or \
38-
(CONFIG['CPU_ARCH'] == 'x86' and CONFIG['CC_TYPE'] == 'clang-cl'):
37+
if CONFIG['TARGET_CPU'] == 'x86_64' or \
38+
(CONFIG['TARGET_CPU'] == 'x86' and CONFIG['CC_TYPE'] == 'clang-cl'):
3939
SOURCES += [
4040
'yuv_row_win64.cpp',
4141
]
@@ -53,7 +53,7 @@ else:
5353
'yuv_row_other.cpp',
5454
]
5555

56-
if CONFIG['CPU_ARCH'] == 'arm' and CONFIG['HAVE_ARM_NEON']:
56+
if CONFIG['TARGET_CPU'] == 'arm' and CONFIG['HAVE_ARM_NEON']:
5757
SOURCES += [
5858
'yuv_row_arm.s',
5959
]

image/test/gtest/moz.build

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ UNIFIED_SOURCES = [
2222
]
2323

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

0 commit comments

Comments
 (0)