[Fwd: Re: ports/91522:Spidermonkey version update to 1.5 with fixes for ia64/amd64]
Anish Mistry
amistry at am-productions.biz
Sat Jan 14 07:50:07 UTC 2006
The following reply was made to PR ports/91522; it has been noted by GNATS.
From: Anish Mistry <amistry at am-productions.biz>
To: citric at cubicone.tmetic.com
Cc: Ryan Lamb <ryanlamb82 at yahoo.com>, bug-followup at freebsd.org
Subject: Re: [Fwd: Re: ports/91522:Spidermonkey version update to 1.5 with fixes for ia64/amd64]
Date: Sat, 14 Jan 2006 02:43:06 -0500
--nextPart1910197.AEggGLISZ9
Content-Type: multipart/mixed;
boundary="Boundary-01=_LuKyDNPfbHexToD"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
--Boundary-01=_LuKyDNPfbHexToD
Content-Type: text/plain;
charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline
On Thursday 12 January 2006 10:36 pm, you wrote:
> Have you gotten an error like this too?
> I was able to try this out on an amd64 running 5.4-RELEASE and got
> the same.
The attached fixes the build on my amd64 system (RELENG_6). Some of=20
the fixes were from the spidermonkey CVS, but others weren't. You=20
may want to try to get all of the patches that the port needs=20
committed up stream so they won't need to be patched when there is=20
another spidermonkey release.
=2D-=20
Anish Mistry
amistry at am-productions.biz
AM Productions http://am-productions.biz/
--Boundary-01=_LuKyDNPfbHexToD
Content-Type: text/x-diff;
charset="iso-8859-1";
name="patch-amd64-spidermonkey.patch"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
filename="patch-amd64-spidermonkey.patch"
=2D-- jslock.c.orig Sat Jan 14 02:20:18 2006
+++ jslock.c Sat Jan 14 02:22:17 2006
@@ -193,7 +193,9 @@
#endif
}
=20
+#ifndef NSPR_LOCK
static void js_Dequeue(JSThinLock *);
+#endif
=20
#ifdef DEBUG_SCOPE_COUNT
=20
=2D-- jsopcode.c.orig Sun Aug 29 18:00:24 2004
+++ jsopcode.c Sat Jan 14 02:26:07 2006
@@ -239,7 +239,7 @@
pc2 +=3D jmplen;
npairs =3D GET_ATOM_INDEX(pc2);
pc2 +=3D ATOM_INDEX_LEN;
=2D fprintf(fp, " offset %d npairs %u", off, (uintN) npairs);
+ fprintf(fp, " offset %td npairs %u", off, (uintN) npairs);
while (npairs) {
atom =3D GET_ATOM(cx, script, pc2);
pc2 +=3D ATOM_INDEX_LEN;
=2D-- jstypes.h.orig Sat Nov 15 00:11:04 2003
+++ jstypes.h Sat Jan 14 02:17:40 2006
@@ -203,6 +203,19 @@
#define JS_BITMASK(n) (JS_BIT(n) - 1)
=20
/***********************************************************************
+** MACROS: JS_PTR_TO_INT32
+** JS_PTR_TO_UINT32
+** JS_INT32_TO_PTR
+** JS_UINT32_TO_PTR
+** DESCRIPTION:
+** Integer to pointer and pointer to integer conversion macros.
+***********************************************************************/
+#define JS_PTR_TO_INT32(x) ((jsint)((char *)(x) - (char *)0))
+#define JS_PTR_TO_UINT32(x) ((jsuint)((char *)(x) - (char *)0))
+#define JS_INT32_TO_PTR(x) ((void *)((char *)0 + (jsint)(x)))
+#define JS_UINT32_TO_PTR(x) ((void *)((char *)0 + (jsuint)(x)))
+
+/***********************************************************************
** MACROS: JS_HOWMANY
** JS_ROUNDUP
** JS_MIN
=2D-- jscntxt.c.orig Sat Jan 14 01:57:13 2006
+++ jscntxt.c Sat Jan 14 02:14:51 2006
@@ -334,7 +334,7 @@
{
const JSResolvingKey *key =3D (const JSResolvingKey *)ptr;
=20
=2D return ((JSDHashNumber)key->obj >> JSVAL_TAGBITS) ^ key->id;
+ return ((JSDHashNumber)JS_PTR_TO_UINT32(key->obj) >> JSVAL_TAGBITS) ^ =
key->id;
}
=20
JS_PUBLIC_API(JSBool)
--Boundary-01=_LuKyDNPfbHexToD--
--nextPart1910197.AEggGLISZ9
Content-Type: application/pgp-signature
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (FreeBSD)
iD8DBQBDyKuYxqA5ziudZT0RAnIGAKCxETJCFA2tFz1Ig68QUuraa5O/TgCdFLiS
9DNB1VERRJbg9OKJk23K4fA=
=/My7
-----END PGP SIGNATURE-----
--nextPart1910197.AEggGLISZ9--
More information about the freebsd-ports-bugs
mailing list