Bug 1494712 - fix incorrect preprocessor define for aarch64 in atomicops.h; r=jld
authorNathan Froyd <froydnj@mozilla.com>
Thu, 27 Sep 2018 19:44:16 -0400
changeset 438638 b1e0b485298554d1f00fa3fced60941b4de180f4
parent 438637 5d60b68a0a426e3c316435e315ddddf35f3aea20
child 438639 a94730ef300e11980098601d90b0f86d4ef87423
push id34730
push useraciure@mozilla.com
push dateFri, 28 Sep 2018 08:54:16 +0000
treeherdermozilla-central@20d42e205b19 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjld
bugs1494712
milestone64.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1494712 - fix incorrect preprocessor define for aarch64 in atomicops.h; r=jld
ipc/chromium/src/base/atomicops.h
--- a/ipc/chromium/src/base/atomicops.h
+++ b/ipc/chromium/src/base/atomicops.h
@@ -145,17 +145,17 @@ Atomic64 Release_Load(volatile const Ato
 #endif  // CPU_ARCH_64_BITS
 
 }  // namespace base::subtle
 }  // namespace base
 
 // Include our platform specific implementation.
 #if defined(OS_WIN) && defined(ARCH_CPU_X86_FAMILY)
 #include "base/atomicops_internals_x86_msvc.h"
-#elif defined(OS_WIN) && defined(ARCH_CPU_AARCH64_FAMILY)
+#elif defined(OS_WIN) && defined(ARCH_CPU_ARM64)
 // Works just fine, separate case in case we need to change things.
 #include "base/atomicops_internals_x86_msvc.h"
 #elif defined(OS_MACOSX) && defined(ARCH_CPU_X86_FAMILY)
 #include "base/atomicops_internals_x86_macosx.h"
 #elif defined(COMPILER_GCC) && defined(ARCH_CPU_X86_FAMILY)
 #include "base/atomicops_internals_x86_gcc.h"
 #elif defined(COMPILER_GCC) && defined(ARCH_CPU_ARMEL)
 #include "base/atomicops_internals_arm_gcc.h"