Enable JIT for ARM64.

3 files changed, 29 insertions, 8 deletions

diff --git a/www/firefox52/Makefile b/www/firefox52/Makefile
index 6ff3bf2e760..6144f12da80 100644
--- a/www/firefox52/Makefile
+++ b/www/firefox52/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2018/07/23 04:56:12 maya Exp $
+# $NetBSD: Makefile,v 1.29 2018/07/30 12:23:11 jmcneill Exp $
 
 FIREFOX_VER=		${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
 MOZ_BRANCH=		52.9
@@ -6,7 +6,7 @@ MOZ_BRANCH_MINOR=	.0esr
 
 DISTNAME=	firefox-${FIREFOX_VER}.source
 PKGNAME=	firefox52-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/b/beta/:S/esr//}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	www
 MASTER_SITES+=	${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
 MASTER_SITES+=	${MASTER_SITE_MOZILLA_ALL:=firefox/releases/${FIREFOX_VER}/source/}
diff --git a/www/firefox52/distinfo b/www/firefox52/distinfo
index da5210ee10e..2a4b7dbe14b 100644
--- a/www/firefox52/distinfo
+++ b/www/firefox52/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.16 2018/06/26 21:49:32 maya Exp $
+$NetBSD: distinfo,v 1.17 2018/07/30 12:23:11 jmcneill Exp $
 
 SHA1 (firefox-52.9.0esr.source.tar.xz) = df3d47518b380fe934e32a288515c25435fd82a7
 RMD160 (firefox-52.9.0esr.source.tar.xz) = 8940269f0a515c0066b6ab2eea1da8963d27617b
@@ -6,7 +6,7 @@ SHA512 (firefox-52.9.0esr.source.tar.xz) = bfca42668ca78a12a9fb56368f4aae5334b1f
 Size (firefox-52.9.0esr.source.tar.xz) = 214087304 bytes
 SHA1 (patch-aa) = c1084caa275e57b716c3499301f7fc3f99ef5026
 SHA1 (patch-ao) = 8b7125ef3b193fca4d03386142887b2f8d5015c5
-SHA1 (patch-as) = 632ebd35287f8f97d18721d39a0514d4cdbb12cc
+SHA1 (patch-as) = b596132c7b6902c4f7ddb901e28e1437b99bb428
 SHA1 (patch-build_gyp.mozbuild) = 481270e6703e556fb87a3440cb3cfb3d4fcc4c86
 SHA1 (patch-build_moz.configure_init.configure) = f2df0c6b92aa825a61f6a4ee1f70f5443c61858e
 SHA1 (patch-build_moz.configure_keyfiles.configure) = dd46c7c29464f374eed3f0762f4653d42032c261
diff --git a/www/firefox52/patches/patch-as b/www/firefox52/patches/patch-as
index fe4697aaf4d..16a474a6e22 100644
--- a/www/firefox52/patches/patch-as
+++ b/www/firefox52/patches/patch-as
@@ -1,9 +1,10 @@
-$NetBSD: patch-as,v 1.1 2017/04/27 01:55:57 ryoon Exp $
+$NetBSD: patch-as,v 1.2 2018/07/30 12:23:11 jmcneill Exp $
 
 * Treat DragonFly like FreeBSD.
 * Add system ICU support
+* Enable ARM64 JIT
 
---- js/src/old-configure.in.orig	2017-01-16 16:16:52.000000000 +0000
+--- js/src/old-configure.in.orig	2017-04-11 02:13:16.000000000 +0000
 +++ js/src/old-configure.in
 @@ -140,6 +140,9 @@ fi
  
@@ -15,7 +16,17 @@ $NetBSD: patch-as,v 1.1 2017/04/27 01:55:57 ryoon Exp $
  dnl Special win32 checks
  dnl ========================================================
  
-@@ -1053,7 +1056,7 @@ dnl Checks for header files.
+@@ -957,6 +960,9 @@ arm*-*)
+     ENABLE_ION=1
+     AC_DEFINE(JS_CPU_ARM)
+     ;;
++aarch64*-*)
++    ENABLE_ION=1
++    ;;
+ sparc-*)
+ dnl ENABLE_ION=0
+     AC_DEFINE(JS_CPU_SPARC)
+@@ -1024,7 +1030,7 @@ dnl Checks for header files.
  dnl ========================================================
  AC_HEADER_DIRENT
  case "$target_os" in
@@ -24,7 +35,7 @@ $NetBSD: patch-as,v 1.1 2017/04/27 01:55:57 ryoon Exp $
  # for stuff like -lXshm
      CPPFLAGS="${CPPFLAGS} ${X_CFLAGS}"
      ;;
-@@ -1184,7 +1187,7 @@ then
+@@ -1155,7 +1161,7 @@ then
      fi
  
  	case "$target" in
@@ -33,3 +44,13 @@ $NetBSD: patch-as,v 1.1 2017/04/27 01:55:57 ryoon Exp $
  			AC_DEFINE(_REENTRANT)
  			AC_DEFINE(_THREAD_SAFE)
  			dnl -pthread links in -lpthread, so don't specify it explicitly.
+@@ -1755,6 +1761,9 @@ elif test "$CPU_ARCH" = "arm"; then
+ 
+     dnl ARM platforms may trap on unaligned accesses; catch the signal and
+     dnl recover.
++elif test "$CPU_ARCH" = "aarch64"; then
++    AC_DEFINE(JS_CODEGEN_ARM64)
++    JS_CODEGEN_ARM64=1
+ elif test "$CPU_ARCH" = "mips32"; then
+     AC_DEFINE(JS_CODEGEN_MIPS32)
+     JS_CODEGEN_MIPS32=1