diff options
| -rw-r--r-- | dev-lang/spidermonkey/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-lang/spidermonkey/files/spidermonkey-1.8.7-x32.patch | 25 | ||||
| -rw-r--r-- | dev-lang/spidermonkey/spidermonkey-1.8.7.ebuild | 3 |
3 files changed, 32 insertions, 2 deletions
diff --git a/dev-lang/spidermonkey/ChangeLog b/dev-lang/spidermonkey/ChangeLog index 7c6ff52bcfc9..0da0edc74182 100644 --- a/dev-lang/spidermonkey/ChangeLog +++ b/dev-lang/spidermonkey/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-lang/spidermonkey # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/ChangeLog,v 1.77 2012/06/29 15:50:38 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/ChangeLog,v 1.78 2012/07/04 18:51:57 anarchy Exp $ + + 04 Jul 2012; Jory A. Pratt <anarchy@gentoo.org> spidermonkey-1.8.7.ebuild, + +files/spidermonkey-1.8.7-x32.patch: + Add x32 support, bug #421655 29 Jun 2012; Jeroen Roovers <jer@gentoo.org> spidermonkey-1.8.5-r1.ebuild, spidermonkey-1.8.7.ebuild: diff --git a/dev-lang/spidermonkey/files/spidermonkey-1.8.7-x32.patch b/dev-lang/spidermonkey/files/spidermonkey-1.8.7-x32.patch new file mode 100644 index 000000000000..f14a269ee3fc --- /dev/null +++ b/dev-lang/spidermonkey/files/spidermonkey-1.8.7-x32.patch @@ -0,0 +1,25 @@ +--- a/js/src/jslock.cpp 2012-04-06 16:24:51.000000000 -0500 ++++ b/js/src/jslock.cpp 2012-06-21 20:57:00.877937542 -0500 +@@ -150,17 +150,22 @@ + + static JS_ALWAYS_INLINE int + NativeCompareAndSwap(volatile jsword *w, jsword ov, jsword nv) + { + unsigned int res; + + __asm__ __volatile__ ( + "lock\n" ++/* GCC's x32 abi support */ ++#if defined(__LP64__) + "cmpxchgq %2, (%1)\n" ++#else ++ "cmpxchg %2, (%1)\n" ++#endif + "sete %%al\n" + "movzbl %%al, %%eax\n" + : "=a" (res) + : "r" (w), "r" (nv), "a" (ov) + : "cc", "memory"); + return (int)res; + } + diff --git a/dev-lang/spidermonkey/spidermonkey-1.8.7.ebuild b/dev-lang/spidermonkey/spidermonkey-1.8.7.ebuild index 08723c1b139d..e53535cd0f73 100644 --- a/dev-lang/spidermonkey/spidermonkey-1.8.7.ebuild +++ b/dev-lang/spidermonkey/spidermonkey-1.8.7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-1.8.7.ebuild,v 1.3 2012/06/29 15:50:38 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-1.8.7.ebuild,v 1.4 2012/07/04 18:51:57 anarchy Exp $ EAPI="3" WANT_AUTOCONF="2.1" @@ -45,6 +45,7 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-1.8.5-fix-install-symlinks.patch epatch "${FILESDIR}"/${PN}-1.8.7-filter_desc.patch + epatch "${FILESDIR}"/${PN}-1.8.7-x32.patch epatch_user |