From b6d11b2fab1f1a9937e7153623a8a0ddfa9b2056 Mon Sep 17 00:00:00 2001
From: Geoff Levand <geoff@infradead.org>
Date: Thu, 7 Jul 2016 16:21:25 -0700
Subject: [PATCH] dev-lang/spidermonkey: Fix for CONFIG_ARM64_VA_BITS_48

Fixes runtime errors like these on arm64:

  polkitd[2760]: unhandled level 1 translation fault (11) at 0x7fff8c304108, esr 0x90000005

Signed-off-by: Geoff Levand <geoff@infradead.org>
---
 .../spidermonkey-1.8.5-fix-arm64-va-48.patch  | 21 +++++++++++++++++++
 .../spidermonkey/spidermonkey-1.8.5-r4.ebuild |  3 +++
 2 files changed, 24 insertions(+)
 create mode 100644 sdk_container/src/third_party/coreos-overlay/dev-lang/spidermonkey/files/spidermonkey-1.8.5-fix-arm64-va-48.patch

diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/spidermonkey/files/spidermonkey-1.8.5-fix-arm64-va-48.patch b/sdk_container/src/third_party/coreos-overlay/dev-lang/spidermonkey/files/spidermonkey-1.8.5-fix-arm64-va-48.patch
new file mode 100644
index 0000000000..6248f3ac52
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/dev-lang/spidermonkey/files/spidermonkey-1.8.5-fix-arm64-va-48.patch
@@ -0,0 +1,21 @@
+
+Fix for CONFIG_ARM64_VA_BITS_48=y
+https://bugzilla.redhat.com/show_bug.cgi?id=1242326
+
+--- a/js/src/jsval.h.old
++++ b/js/src/jsval.h
+@@ -236,8 +236,14 @@
+ 
+ #elif JS_BITS_PER_WORD == 64
+ 
++#if defined(__aarch64__)
++#define JSVAL_PAYLOAD_MASK           0x0000FFFFFFFFFFFFLL
++#define JSVAL_TAG_MASK               0xFFFF000000000000LL
++#else
+ #define JSVAL_PAYLOAD_MASK           0x00007FFFFFFFFFFFLL
+ #define JSVAL_TAG_MASK               0xFFFF800000000000LL
++#endif
++
+ #define JSVAL_TYPE_TO_TAG(type)      ((JSValueTag)(JSVAL_TAG_MAX_DOUBLE | (type)))
+ #define JSVAL_TYPE_TO_SHIFTED_TAG(type) (((uint64)JSVAL_TYPE_TO_TAG(type)) << JSVAL_TAG_SHIFT)
+ 
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/spidermonkey/spidermonkey-1.8.5-r4.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-lang/spidermonkey/spidermonkey-1.8.5-r4.ebuild
index e260a10cc1..e7996be117 100644
--- a/sdk_container/src/third_party/coreos-overlay/dev-lang/spidermonkey/spidermonkey-1.8.5-r4.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/dev-lang/spidermonkey/spidermonkey-1.8.5-r4.ebuild
@@ -60,6 +60,9 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-perl-defined-array-check.patch
 	# fix builds for alternate $ROOT locations
 	epatch "${FILESDIR}"/${P}-no-link-lib-deps.patch
+	# Fix for CONFIG_ARM64_VA_BITS_48=y
+	# https://bugzilla.redhat.com/show_bug.cgi?id=1242326
+	epatch "${FILESDIR}/${P}-fix-arm64-va-48.patch"
 
 	epatch_user