fix compilation on hppa (bug 497900)

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 2B6559ED)

3 files changed, 49 insertions, 2 deletions

diff --git a/dev-lang/spidermonkey/ChangeLog b/dev-lang/spidermonkey/ChangeLog
index a426072af81a..33a7f70d84d2 100644
--- a/dev-lang/spidermonkey/ChangeLog
+++ b/dev-lang/spidermonkey/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/spidermonkey
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/ChangeLog,v 1.148 2014/04/19 17:43:30 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/ChangeLog,v 1.149 2014/05/05 20:28:23 axs Exp $
+
+  05 May 2014; Ian Stakenvicius (_AxS_) <axs@gentoo.org>
+  +files/spidermonkey-24-upward-growing-stack.patch,
+  spidermonkey-24.2.0-r1.ebuild:
+  fix compilation on hppa (bug 497900)
 
   19 Apr 2014; Agostino Sarubbo <ago@gentoo.org> spidermonkey-17.0.0-r3.ebuild:
   Stable for sparc, wrt bug #507568
diff --git a/dev-lang/spidermonkey/files/spidermonkey-24-upward-growing-stack.patch b/dev-lang/spidermonkey/files/spidermonkey-24-upward-growing-stack.patch
new file mode 100644
index 000000000000..70963627bcc5
--- /dev/null
+++ b/dev-lang/spidermonkey/files/spidermonkey-24-upward-growing-stack.patch
@@ -0,0 +1,41 @@
+diff -Naur mozjs-24.2.0/js/src/gc/RootMarking.cpp mozjs-24.2.0.new/js/src/gc/RootMarking.cpp
+--- mozjs-24.2.0/js/src/gc/RootMarking.cpp	2013-10-29 16:40:26.000000000 -0400
++++ mozjs-24.2.0.new/js/src/gc/RootMarking.cpp	2014-05-05 16:16:15.570098309 -0400
+@@ -320,7 +320,7 @@
+ 
+     uintptr_t *stackMin, *stackEnd;
+ #if JS_STACK_GROWTH_DIRECTION > 0
+-    stackMin = rt->nativeStackBase;
++    stackMin = reinterpret_cast<uintptr_t *>(rt->nativeStackBase);
+     stackEnd = cgcd->nativeStackTop;
+ #else
+     stackMin = cgcd->nativeStackTop + 1;
+diff -Naur mozjs-24.2.0/js/src/jsapi.cpp mozjs-24.2.0.new/js/src/jsapi.cpp
+--- mozjs-24.2.0/js/src/jsapi.cpp	2013-12-06 17:52:35.000000000 -0500
++++ mozjs-24.2.0.new/js/src/jsapi.cpp	2014-05-05 16:17:01.330099145 -0400
+@@ -863,10 +863,6 @@
+ 
+     PodZero(&debugHooks);
+     PodZero(&atomState);
+-
+-#if JS_STACK_GROWTH_DIRECTION > 0
+-    nativeStackLimit = UINTPTR_MAX;
+-#endif
+ }
+ 
+ bool
+diff -Naur mozjs-24.2.0/js/src/jsfriendapi.cpp mozjs-24.2.0.new/js/src/jsfriendapi.cpp
+--- mozjs-24.2.0/js/src/jsfriendapi.cpp	2013-10-29 16:40:20.000000000 -0400
++++ mozjs-24.2.0.new/js/src/jsfriendapi.cpp	2014-05-05 16:18:30.350100769 -0400
+@@ -32,7 +32,11 @@
+                  PerThreadDataFriendFields::RuntimeMainThreadOffset);
+ 
+ PerThreadDataFriendFields::PerThreadDataFriendFields()
++#if JS_STACK_GROWTH_DIRECTION > 0
++  : nativeStackLimit(UINTPTR_MAX)
++#else
+   : nativeStackLimit(0)
++#endif
+ {
+ #if defined(JSGC_ROOT_ANALYSIS) || defined(JSGC_USE_EXACT_ROOTING)
+     PodArrayZero(thingGCRooters);
diff --git a/dev-lang/spidermonkey/spidermonkey-24.2.0-r1.ebuild b/dev-lang/spidermonkey/spidermonkey-24.2.0-r1.ebuild
index 3fe37dd395b4..e72cf71b2cc1 100644
--- a/dev-lang/spidermonkey/spidermonkey-24.2.0-r1.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-24.2.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-24.2.0-r1.ebuild,v 1.1 2014/03/08 14:38:51 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-24.2.0-r1.ebuild,v 1.2 2014/05/05 20:28:23 axs Exp $
 
 EAPI="5"
 WANT_AUTOCONF="2.1"
@@ -43,6 +43,7 @@ pkg_setup(){
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-${SLOT}-system-icu.patch
 	epatch "${FILESDIR}"/${PN}-24.2.0-fix-file-permissions.patch
+	epatch "${FILESDIR}"/${PN}-${SLOT}-upward-growing-stack.patch
 	epatch_user
 
 	if [[ ${CHOST} == *-freebsd* ]]; then