Bug 1658375 - define platform macros for arm64 macOS in the profiler; r=mstange
authorNathan Froyd <froydnj@mozilla.com>
Mon, 10 Aug 2020 22:02:27 +0000
changeset 544272 28da0a2c2679047cea5c1253a904f2d5ba5ab82f
parent 544271 b2b86f021dfb163a8b13b035eecc4803050de030
child 544273 b094f031cf9dc59d27b9dc2ec2622153db66332d
push id37691
push usermalexandru@mozilla.com
push dateTue, 11 Aug 2020 21:47:38 +0000
treeherdermozilla-central@5d63045bb341 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmstange
bugs1658375
milestone81.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 1658375 - define platform macros for arm64 macOS in the profiler; r=mstange This change doesn't resolve some of the issues in profiler code that have x86-64-isms in them, but this is at least a start. Differential Revision: https://phabricator.services.mozilla.com/D86595
mozglue/baseprofiler/core/PlatformMacros.h
tools/profiler/core/PlatformMacros.h
--- a/mozglue/baseprofiler/core/PlatformMacros.h
+++ b/mozglue/baseprofiler/core/PlatformMacros.h
@@ -17,16 +17,17 @@
 #undef GP_PLAT_amd64_android
 #undef GP_PLAT_arm_android
 #undef GP_PLAT_arm64_android
 #undef GP_PLAT_x86_linux
 #undef GP_PLAT_amd64_linux
 #undef GP_PLAT_arm_linux
 #undef GP_PLAT_mips64_linux
 #undef GP_PLAT_amd64_darwin
+#undef GP_PLAT_arm64_darwin
 #undef GP_PLAT_x86_windows
 #undef GP_PLAT_amd64_windows
 #undef GP_PLAT_arm64_windows
 
 #undef GP_ARCH_x86
 #undef GP_ARCH_amd64
 #undef GP_ARCH_arm
 #undef GP_ARCH_arm64
@@ -80,16 +81,21 @@
 #  define GP_ARCH_arm64 1
 #  define GP_OS_linux 1
 
 #elif defined(__linux__) && defined(__mips64)
 #  define GP_PLAT_mips64_linux 1
 #  define GP_ARCH_mips64 1
 #  define GP_OS_linux 1
 
+#elif defined(__APPLE__) && defined(__aarch64__)
+#  define GP_PLAT_arm64_darwin 1
+#  define GP_ARCH_arm64 1
+#  define GP_OS_darwin 1
+
 #elif defined(__APPLE__) && defined(__x86_64__)
 #  define GP_PLAT_amd64_darwin 1
 #  define GP_ARCH_amd64 1
 #  define GP_OS_darwin 1
 
 #elif defined(__FreeBSD__) && defined(__x86_64__)
 #  define GP_PLAT_amd64_freebsd 1
 #  define GP_ARCH_amd64 1
--- a/tools/profiler/core/PlatformMacros.h
+++ b/tools/profiler/core/PlatformMacros.h
@@ -17,16 +17,17 @@
 #undef GP_PLAT_amd64_android
 #undef GP_PLAT_arm_android
 #undef GP_PLAT_arm64_android
 #undef GP_PLAT_x86_linux
 #undef GP_PLAT_amd64_linux
 #undef GP_PLAT_arm_linux
 #undef GP_PLAT_mips64_linux
 #undef GP_PLAT_amd64_darwin
+#undef GP_PLAT_arm64_darwin
 #undef GP_PLAT_x86_windows
 #undef GP_PLAT_amd64_windows
 #undef GP_PLAT_arm64_windows
 
 #undef GP_ARCH_x86
 #undef GP_ARCH_amd64
 #undef GP_ARCH_arm
 #undef GP_ARCH_arm64
@@ -80,16 +81,21 @@
 #  define GP_ARCH_arm64 1
 #  define GP_OS_linux 1
 
 #elif defined(__linux__) && defined(__mips64)
 #  define GP_PLAT_mips64_linux 1
 #  define GP_ARCH_mips64 1
 #  define GP_OS_linux 1
 
+#elif defined(__APPLE__) && defined(__aarch64__)
+#  define GP_PLAT_arm64_darwin 1
+#  define GP_ARCH_arm64 1
+#  define GP_OS_darwin 1
+
 #elif defined(__APPLE__) && defined(__x86_64__)
 #  define GP_PLAT_amd64_darwin 1
 #  define GP_ARCH_amd64 1
 #  define GP_OS_darwin 1
 
 #elif defined(__FreeBSD__) && defined(__x86_64__)
 #  define GP_PLAT_amd64_freebsd 1
 #  define GP_ARCH_amd64 1