pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

spidermonkey31: Reduce diff with spidermonkey17



Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Wed Oct 12 13:10:59 2016 +0200
Changeset:	5d17244a82b1a45d23635db31152d4a2054e9898

Modified Files:
	spidermonkey31/Makefile
	spidermonkey31/distinfo
Added Files:
	spidermonkey31/patches/patch-assembler_assembler_MIPSAssembler.h
	spidermonkey31/patches/patch-jsnativestack.cpp

Log Message:
spidermonkey31: Reduce diff with spidermonkey17

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=5d17244a82b1a45d23635db31152d4a2054e9898

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 spidermonkey31/Makefile                                  |  4 ++++
 spidermonkey31/distinfo                                  |  2 ++
 .../patches/patch-assembler_assembler_MIPSAssembler.h    | 16 ++++++++++++++++
 spidermonkey31/patches/patch-jsnativestack.cpp           | 13 +++++++++++++
 4 files changed, 35 insertions(+)

diffs:
diff --git a/spidermonkey31/Makefile b/spidermonkey31/Makefile
index 5cf4a84..72c32be 100644
--- a/spidermonkey31/Makefile
+++ b/spidermonkey31/Makefile
@@ -31,6 +31,8 @@ MAKE_JOBS_SAFE=	no
 PKGCONFIG_OVERRIDE+=	ctypes/libffi/libffi.pc.in
 PKGCONFIG_OVERRIDE+=	js.pc.in
 
+TEST_TARGET=		check
+
 CHECK_PORTABILITY_SKIP+=	tests/update-test262.sh
 
 PYTHON_VERSIONS_ACCEPTED=	27
@@ -58,6 +60,8 @@ post-install:
 	${CHMOD} -x ${DESTDIR}${PREFIX}/lib/libmozjs-31.a
 	${CHMOD} -x ${DESTDIR}${PREFIX}/lib/pkgconfig/mozjs-31.pc
 
+PYTHON_VERSIONS_ACCEPTED=	27
+PYTHON_FOR_BUILD_ONLY=		yes
 .include "../../devel/libffi/buildlink3.mk"
 .include "../../devel/nspr/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/spidermonkey31/distinfo b/spidermonkey31/distinfo
index 581e54a..94fb3df 100644
--- a/spidermonkey31/distinfo
+++ b/spidermonkey31/distinfo
@@ -4,3 +4,5 @@ SHA1 (mozjs-31.2.0.rc0.tar.bz2) = db818cfc36382253301d0f0f14495fd186d5d28a
 RMD160 (mozjs-31.2.0.rc0.tar.bz2) = b62057d85933362f4e431180424a39c2d3231386
 SHA512 (mozjs-31.2.0.rc0.tar.bz2) = 6a2025f0c419e56b89876a3543aabc459cdcf915a4cf4aedc55d89fc59d469d23aee2d505a930442e887705f0d62762e2218b312c5d56741cdb5aa54433cb71b
 Size (mozjs-31.2.0.rc0.tar.bz2) = 21410352 bytes
+SHA1 (patch-assembler_assembler_MIPSAssembler.h) = 2698ee3eb71b28fd412e8a33284e251e1ed5a013
+SHA1 (patch-jsnativestack.cpp) = a07cfa38f2005d29399c06b3ce5ac22a326a2193
diff --git a/spidermonkey31/patches/patch-assembler_assembler_MIPSAssembler.h b/spidermonkey31/patches/patch-assembler_assembler_MIPSAssembler.h
new file mode 100644
index 0000000..d7e7423
--- /dev/null
+++ b/spidermonkey31/patches/patch-assembler_assembler_MIPSAssembler.h
@@ -0,0 +1,16 @@
+$NetBSD$
+
+--- assembler/assembler/MIPSAssembler.h.orig	2014-10-10 18:31:12.000000000 +0000
++++ assembler/assembler/MIPSAssembler.h
+@@ -226,7 +226,10 @@ public:
+ 
+     void nop()
+     {
+-        emitInst(0x00000000);
++       /* nop is insufficient for eliminating hazards
++        * in a superscalar CPU. blindly convert all to
++        * MIPSNNR6 ehb / ssnop, at a performance cost. */
++        emitInst(0x000000c0);
+     }
+ 
+     /* Need to insert one load data delay nop for mips1.  */
diff --git a/spidermonkey31/patches/patch-jsnativestack.cpp b/spidermonkey31/patches/patch-jsnativestack.cpp
new file mode 100644
index 0000000..9656a5e
--- /dev/null
+++ b/spidermonkey31/patches/patch-jsnativestack.cpp
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- jsnativestack.cpp.orig	2014-10-10 18:31:12.000000000 +0000
++++ jsnativestack.cpp
+@@ -98,7 +98,7 @@ js::GetNativeStackBaseImpl()
+     pthread_attr_init(&sattr);
+ #  if defined(__OpenBSD__)
+     stack_t ss;
+-#  elif defined(PTHREAD_NP_H) || defined(_PTHREAD_NP_H_) || defined(NETBSD)
++#  elif defined(PTHREAD_NP_H) || defined(_PTHREAD_NP_H_) || defined(NETBSD) || defined(__NetBSD__) /* NETBSD seems undefined */
+     /* e.g. on FreeBSD 4.8 or newer, neundorf%kde.org@localhost */
+     pthread_attr_get_np(thread, &sattr);
+ #  else


Home | Main Index | Thread Index | Old Index