From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 18FDC1381FA for ; Tue, 6 May 2014 18:05:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 29111E07A0; Tue, 6 May 2014 18:05:56 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 95B2BE07A0 for ; Tue, 6 May 2014 18:05:55 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 76E1633FA4D for ; Tue, 6 May 2014 18:05:54 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 2FFCB1818D for ; Tue, 6 May 2014 18:05:53 +0000 (UTC) From: "Ian Stakenvicius" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ian Stakenvicius" Message-ID: <1399399511.705a6221b13ea69a355dcfe8b860fb417c3bd1e0.axs@gentoo> Subject: [gentoo-commits] proj/mozilla:master commit in: dev-lang/spidermonkey/, dev-lang/spidermonkey/files/ X-VCS-Repository: proj/mozilla X-VCS-Files: dev-lang/spidermonkey/files/spidermonkey-24-upward-growing-stack.patch dev-lang/spidermonkey/spidermonkey-24.2.0-r1.ebuild X-VCS-Directories: dev-lang/spidermonkey/ dev-lang/spidermonkey/files/ X-VCS-Committer: axs X-VCS-Committer-Name: Ian Stakenvicius X-VCS-Revision: 705a6221b13ea69a355dcfe8b860fb417c3bd1e0 X-VCS-Branch: master Date: Tue, 6 May 2014 18:05:53 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 1a9f1bbb-f115-4818-bf06-d401a75b352d X-Archives-Hash: 6a9710b9345a387fb6d74d9cc37e4097 commit: 705a6221b13ea69a355dcfe8b860fb417c3bd1e0 Author: Ian Stakenvicius gentoo org> AuthorDate: Tue May 6 18:05:11 2014 +0000 Commit: Ian Stakenvicius gentoo 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(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