[gentoo-commits] proj/mozilla:master commit in: dev-lang/spidermonkey/, dev-lang/spidermonkey/files/

[Ian Stakenvicius]

commit:     705a6221b13ea69a355dcfe8b860fb417c3bd1e0
Author:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Tue May  6 18:05:11 2014 +0000
Commit:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Tue May  6 18:05:11 2014 +0000
URL:        
http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=705a6221

fix hppa bug 497900

---
 .../spidermonkey-24-upward-growing-stack.patch     | 41 ++++++++++++++++++++++
 .../spidermonkey/spidermonkey-24.2.0-r1.ebuild     |  1 +
 2 files changed, 42 insertions(+)

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 0000000..7096362
--- /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 3fe37dd..7a9be92 100644
--- a/dev-lang/spidermonkey/spidermonkey-24.2.0-r1.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-24.2.0-r1.ebuild
@@ -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