Bug 1480553 - part 1 - add Windows-specific aarch64 macro detection; r=glandium
authorNathan Froyd <froydnj@mozilla.com>
Thu, 02 Aug 2018 21:40:40 -0400
changeset 826223 4dbeee9501bdd367b73d353075a98521015238a4
parent 826222 a99bdd693233b35c3f40375debbf4456da5ab0b0
child 826224 d87760979a3eccce946f59ade6a145251c04a8ba
push id118275
push userbmo:dharvey@mozilla.com
push dateFri, 03 Aug 2018 11:44:33 +0000
reviewersglandium
bugs1480553
milestone63.0a1
Bug 1480553 - part 1 - add Windows-specific aarch64 macro detection; r=glandium MSVC doesn't define __aarch64__, but uses its own symbol instead.
python/mozbuild/mozbuild/configure/constants.py
--- a/python/mozbuild/mozbuild/configure/constants.py
+++ b/python/mozbuild/mozbuild/configure/constants.py
@@ -71,17 +71,17 @@ WindowsBinaryType = EnumString.subclass(
     'win64',
 )
 
 # The order of those checks matter
 CPU_preprocessor_checks = OrderedDict((
     ('x86', '__i386__ || _M_IX86'),
     ('x86_64', '__x86_64__ || _M_X64'),
     ('arm', '__arm__ || _M_ARM'),
-    ('aarch64', '__aarch64__'),
+    ('aarch64', '__aarch64__ || _M_ARM64'),
     ('ia64', '__ia64__'),
     ('s390x', '__s390x__'),
     ('s390', '__s390__'),
     ('ppc64', '__powerpc64__'),
     ('ppc', '__powerpc__'),
     ('Alpha', '__alpha__'),
     ('hppa', '__hppa__'),
     ('sparc64', '__sparc__ && __arch64__'),