mozilla-central: changeset 438638:b1e0b485298554d1f00fa3fced60941b4de180f4

author	Nathan Froyd <froydnj@mozilla.com>
	Thu, 27 Sep 2018 19:44:16 -0400
changeset 438638	b1e0b485298554d1f00fa3fced60941b4de180f4
parent 438637	5d60b68a0a426e3c316435e315ddddf35f3aea20
child 438639	a94730ef300e11980098601d90b0f86d4ef87423
push id	34730
push user	aciure@mozilla.com
push date	Fri, 28 Sep 2018 08:54:16 +0000
treeherder	mozilla-central@20d42e205b19 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	jld
bugs	1494712
milestone	64.0a1
first release with	nightly linux32 20d42e205b19 / 64.0a1 / 20180928100051 / files nightly linux64 20d42e205b19 / 64.0a1 / 20180928100051 / files nightly mac 20d42e205b19 / 64.0a1 / 20180928100051 / files nightly win32 20d42e205b19 / 64.0a1 / 20180928100051 / files nightly win64 20d42e205b19 / 64.0a1 / 20180928100051 / files
last release without	nightly linux32 be037b5b6327 / 64.0a1 / 20180927220034 / files nightly linux64 be037b5b6327 / 64.0a1 / 20180927220034 / files nightly mac be037b5b6327 / 64.0a1 / 20180927220034 / files nightly win32 be037b5b6327 / 64.0a1 / 20180927220034 / files nightly win64 be037b5b6327 / 64.0a1 / 20180927220034 / files

--- 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"