Bug 1481505 - add aarch64 bits to DEFINES and DSO_LDOPTS; r=dmajor
authorNathan Froyd <froydnj@mozilla.com>
Wed, 08 Aug 2018 16:37:05 -0400
changeset 485830 4a6a97131d1835d837a08cf46b5d35c69b7120fd
parent 485829 686d11ab65e47d8c0b58b7ca9e3d372b8898cc1e
child 485831 068870abe0cc963a609174747d9acae71c8886d5
push id9719
push userffxbld-merge
push dateFri, 24 Aug 2018 17:49:46 +0000
treeherdermozilla-beta@719ec98fba77 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdmajor
bugs1481505
milestone63.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 1481505 - add aarch64 bits to DEFINES and DSO_LDOPTS; r=dmajor Not having _ARM64_ in DEFINES makes any number of things go wrong.
js/src/old-configure.in
old-configure.in
--- a/js/src/old-configure.in
+++ b/js/src/old-configure.in
@@ -847,16 +847,22 @@ case "$target" in
     	AC_DEFINE(_X86_)
 	;;
     x86_64-*)
         if test -n "$_WIN32_MSVC"; then
             DSO_LDOPTS="$DSO_LDOPTS -MACHINE:X64"
         fi
         AC_DEFINE(_AMD64_)
         ;;
+    aarch64-*)
+        if test -n "$_WIN32_MSVC"; then
+            DSO_LDOPTS="$DSO_LDOPTS -MACHINE:ARM64"
+        fi
+        AC_DEFINE(_ARM64_)
+        ;;
     *)
     	AC_DEFINE(_CPU_ARCH_NOT_DEFINED)
 	;;
     esac
     ;;
 
 *-netbsd*)
     DSO_CFLAGS=''
--- a/old-configure.in
+++ b/old-configure.in
@@ -1097,16 +1097,22 @@ case "$target" in
         AC_DEFINE(_X86_)
         ;;
     x86_64-*)
         if test -n "$_WIN32_MSVC"; then
             DSO_LDOPTS="$DSO_LDOPTS -MACHINE:X64"
         fi
         AC_DEFINE(_AMD64_)
         ;;
+    aarch64-*)
+        if test -n "$_WIN32_MSVC"; then
+            DSO_LDOPTS="$DSO_LDOPTS -MACHINE:ARM64"
+        fi
+        AC_DEFINE(_ARM64_)
+        ;;
     *)
         AC_DEFINE(_CPU_ARCH_NOT_DEFINED)
         ;;
     esac
     ;;
 
 *-netbsd*)
     DSO_CFLAGS=''