pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

- Build in a subdir rather than changing WRKSRC so that we can patch all files necessary. - Bring back patches required for SunOS. - Mark se broken on SunOS/x86_64 as that is the state confirmed by upstream.

Module Name:	pkgsrc-wip
Committed By:	Filip Hajny <filip%joyent.com@localhost>
Pushed By:	fhajny
Date:		Wed Mar 21 11:48:22 2018 +0000
Changeset:	a02f165fcb41799f28d543f8d8e3c6fbc4b7a284

Modified Files:
	spidermonkey24/Makefile
	spidermonkey24/distinfo
	spidermonkey24/patches/patch-Makefile.in
	spidermonkey24/patches/patch-config_Makefile.in
	spidermonkey24/patches/patch-config_milestone.pl
	spidermonkey24/patches/patch-config_system-headers
	spidermonkey24/patches/patch-ctypes_CTypes.h
	spidermonkey24/patches/patch-ctypes_libffi_configure
	spidermonkey24/patches/patch-frontend_ParseMaps.cpp
	spidermonkey24/patches/patch-gdb_Makefile.in
	spidermonkey24/patches/patch-jit_AsmJSSignalHandlers.cpp
	spidermonkey24/patches/patch-jsapi-tests_Makefile.in
	spidermonkey24/patches/patch-jscompartment.h
	spidermonkey24/patches/patch-jsmath.cpp
	spidermonkey24/patches/patch-jsnativestack.cpp
	spidermonkey24/patches/patch-shell_Makefile.in
	spidermonkey24/patches/patch-vm_ObjectImpl-inl.h
	spidermonkey24/patches/patch-vm_SPSProfiler.cpp
Added Files:
	spidermonkey24/patches/patch-mfbt_Atomics.h
	spidermonkey24/patches/patch-mfbt_Poison.cpp

Log Message:
- Build in a subdir rather than changing WRKSRC so that we can patch all
  files necessary.
- Bring back patches required for SunOS.
- Mark se broken on SunOS/x86_64 as that is the state confirmed by
  upstream.

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

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

diffstat:
 spidermonkey24/Makefile                            | 14 ++++++---
 spidermonkey24/distinfo                            | 34 ++++++++++++----------
 spidermonkey24/patches/patch-Makefile.in           |  4 +--
 spidermonkey24/patches/patch-config_Makefile.in    |  4 +--
 spidermonkey24/patches/patch-config_milestone.pl   |  4 +--
 spidermonkey24/patches/patch-config_system-headers |  4 +--
 spidermonkey24/patches/patch-ctypes_CTypes.h       |  4 +--
 .../patches/patch-ctypes_libffi_configure          |  4 +--
 .../patches/patch-frontend_ParseMaps.cpp           |  4 +--
 spidermonkey24/patches/patch-gdb_Makefile.in       |  4 +--
 .../patches/patch-jit_AsmJSSignalHandlers.cpp      | 19 +++++++++---
 .../patches/patch-jsapi-tests_Makefile.in          |  4 +--
 spidermonkey24/patches/patch-jscompartment.h       |  4 +--
 spidermonkey24/patches/patch-jsmath.cpp            |  4 +--
 spidermonkey24/patches/patch-jsnativestack.cpp     |  4 +--
 spidermonkey24/patches/patch-mfbt_Atomics.h        | 13 +++++++++
 spidermonkey24/patches/patch-mfbt_Poison.cpp       | 20 +++++++++++++
 spidermonkey24/patches/patch-shell_Makefile.in     |  4 +--
 spidermonkey24/patches/patch-vm_ObjectImpl-inl.h   |  4 +--
 spidermonkey24/patches/patch-vm_SPSProfiler.cpp    |  5 ++--
 20 files changed, 106 insertions(+), 55 deletions(-)

diffs:
diff --git a/spidermonkey24/Makefile b/spidermonkey24/Makefile
index 2d1a03193d..e43c3b2ee1 100644
--- a/spidermonkey24/Makefile
+++ b/spidermonkey24/Makefile
@@ -11,12 +11,16 @@ HOMEPAGE=	https://developer.mozilla.org/en/SpiderMonkey
 COMMENT=	Standalone JavaScript implementation in C
 LICENSE=	mpl-2.0
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/js/src
+# Spidermonkey 24 never worked here and unlikely will
+# https://bugzilla.mozilla.org/show_bug.cgi?id=577056
+BROKEN_ON_PLATFORM=	SunOS-*-x86_64
 
 USE_TOOLS+=		pkg-config perl:build gmake
 USE_LIBTOOL=		yes
 USE_LANGUAGES=		c c++
 
+CONFIGURE_DIRS=		js/src
+
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-strip
 CONFIGURE_ARGS+=	--enable-readline
@@ -24,10 +28,12 @@ CONFIGURE_ARGS+=	--enable-system-ffi
 CONFIGURE_ARGS+=	--enable-threadsafe
 CONFIGURE_ARGS+=	--with-system-nspr
 
-PKGCONFIG_OVERRIDE+=	ctypes/libffi/libffi.pc.in
-PKGCONFIG_OVERRIDE+=	js.pc.in
+CPPFLAGS.SunOS+=	-D__EXTENSIONS__
+
+PKGCONFIG_OVERRIDE+=	js/src/ctypes/libffi/libffi.pc.in
+PKGCONFIG_OVERRIDE+=	js/src/js.pc.in
 
-CHECK_PORTABILITY_SKIP+=	tests/update-test262.sh
+CHECK_PORTABILITY_SKIP+=	js/src/tests/update-test262.sh
 
 PYTHON_VERSIONS_ACCEPTED=	27
 PYTHON_FOR_BUILD_ONLY=		yes
diff --git a/spidermonkey24/distinfo b/spidermonkey24/distinfo
index 1769a19c67..2e2716e84b 100644
--- a/spidermonkey24/distinfo
+++ b/spidermonkey24/distinfo
@@ -3,19 +3,21 @@ $NetBSD: distinfo,v 1.1 2014/02/06 15:12:17 fhajny Exp $
 SHA1 (mozjs-24.2.0.tar.bz2) = ce779081cc11bd0c871c6f303fc4a0091cf4fe66
 RMD160 (mozjs-24.2.0.tar.bz2) = c560f0ed343caa15f816a2cdea307a7015e0e8b1
 Size (mozjs-24.2.0.tar.bz2) = 15624530 bytes
-SHA1 (patch-Makefile.in) = 78c1087762a272a281856af379b1dcf987d9c2ef
-SHA1 (patch-config_Makefile.in) = 43985290e9b123c0d76e3a95cbda643f8be8f803
-SHA1 (patch-config_milestone.pl) = a25cf68657b78d513cf1d4007b5ea6c9ef3c686f
-SHA1 (patch-config_system-headers) = d31d330384f6049087f7779f47a1a8c895c5e859
-SHA1 (patch-ctypes_CTypes.h) = f644b8c71e4a229274f06c926e306b504c759e9f
-SHA1 (patch-ctypes_libffi_configure) = 6e92c8ad4e9526cae4e8afa89c4e6241483bd4c8
-SHA1 (patch-frontend_ParseMaps.cpp) = c6517717860cfde13585cdf015c23f5b7afcc09d
-SHA1 (patch-gdb_Makefile.in) = eb36c65a625129d55eb7aa0cc20df715541489d8
-SHA1 (patch-jit_AsmJSSignalHandlers.cpp) = d4081266eb216336b9d024689dbff34fc975010f
-SHA1 (patch-jsapi-tests_Makefile.in) = f9b7679b1398f314b5d228b2ad37b68af65c151e
-SHA1 (patch-jscompartment.h) = c1af14fb4dead68e382ecdbdb1cfd93a61aa6f20
-SHA1 (patch-jsmath.cpp) = 8d5d06c84f868ba12e03df32a3cc620ec0c4f421
-SHA1 (patch-jsnativestack.cpp) = 859b495a37631f0c9a700a2a8b53339a039f1083
-SHA1 (patch-shell_Makefile.in) = d78b2653b770c2e3e5d4c1026b6c7d45873a3e8d
-SHA1 (patch-vm_ObjectImpl-inl.h) = a1d46b86216c160d1ebc7a66af40a82391e2c42c
-SHA1 (patch-vm_SPSProfiler.cpp) = 1faa3875fd4cae031ae9cbc151ea06e7080d11bd
+SHA1 (patch-Makefile.in) = c7730e978ec83ad330329cd94b74c5110fd2d46d
+SHA1 (patch-config_Makefile.in) = 61d2baa6e223506a24135827d0f830f952150dd6
+SHA1 (patch-config_milestone.pl) = f2a886cd71a1ce8cb873be255d5b58700840af2e
+SHA1 (patch-config_system-headers) = 588557de68ea79a33c01e536da6564dcb180bc63
+SHA1 (patch-ctypes_CTypes.h) = 93d848ea735d66e581d7cfd5948f943777fed7b7
+SHA1 (patch-ctypes_libffi_configure) = fa89c36046a04b07cf482e30a895222d22fa5fea
+SHA1 (patch-frontend_ParseMaps.cpp) = 9ad59cdad3b94a31c03dad7e7301fd884ad43484
+SHA1 (patch-gdb_Makefile.in) = d48afa0f14cfea4a5f5d84c4b9e61a7fe9ed2617
+SHA1 (patch-jit_AsmJSSignalHandlers.cpp) = 2c629d30215f5edc270d30cbecbf768f574a1e0d
+SHA1 (patch-jsapi-tests_Makefile.in) = 078824b7298eff08a42dabdbcc2ece57fd692c8c
+SHA1 (patch-jscompartment.h) = 811b522ae1424c7daa7fcdf5f771e49b446d3e0f
+SHA1 (patch-jsmath.cpp) = 89032c0b056d1bd31f13e26a515ea8588580f4f3
+SHA1 (patch-jsnativestack.cpp) = 2fe079bb3fbb6ab80c12d7279b203b383db104c4
+SHA1 (patch-mfbt_Atomics.h) = 1a1df4189cf8da1182baa5c2e9909f9add6d2451
+SHA1 (patch-mfbt_Poison.cpp) = 7b2eadcac057269e113fb403dd8bf95dccc9e7e0
+SHA1 (patch-shell_Makefile.in) = 27241f2f2c674c53bb76cfc2f13905f03ef84f87
+SHA1 (patch-vm_ObjectImpl-inl.h) = 0f3e2a7ea7ee2fe2e0fdd66d557431ffc81745fb
+SHA1 (patch-vm_SPSProfiler.cpp) = ecdfaf281fd351b05ac560cdb7793a5d374c94c8
diff --git a/spidermonkey24/patches/patch-Makefile.in b/spidermonkey24/patches/patch-Makefile.in
index a795db057d..8307f259c8 100644
--- a/spidermonkey24/patches/patch-Makefile.in
+++ b/spidermonkey24/patches/patch-Makefile.in
@@ -1,7 +1,7 @@
 $NetBSD: patch-Makefile.in,v 1.1 2014/02/06 15:12:18 fhajny Exp $
 
---- Makefile.in.orig	2013-11-19 19:42:43.000000000 +0000
-+++ Makefile.in
+--- js/src/Makefile.in.orig	2013-11-19 19:42:43.000000000 +0000
++++ js/src/Makefile.in
 @@ -237,10 +237,14 @@ endif
  # ICU headers need to be available whether we build with the complete
  # Internationalization API or not - ICU stubs rely on them.
diff --git a/spidermonkey24/patches/patch-config_Makefile.in b/spidermonkey24/patches/patch-config_Makefile.in
index 234dbb345a..00e29f97d8 100644
--- a/spidermonkey24/patches/patch-config_Makefile.in
+++ b/spidermonkey24/patches/patch-config_Makefile.in
@@ -1,7 +1,7 @@
 $NetBSD: patch-config_Makefile.in,v 1.1 2014/02/06 15:12:18 fhajny Exp $
 
---- config/Makefile.in.orig	2013-10-29 20:40:26.000000000 +0000
-+++ config/Makefile.in
+--- js/src/config/Makefile.in.orig	2013-10-29 20:40:26.000000000 +0000
++++ js/src/config/Makefile.in
 @@ -59,6 +59,7 @@ export:: \
    $(call mkdir_deps,system_wrappers_js) \
    $(NULL)
diff --git a/spidermonkey24/patches/patch-config_milestone.pl b/spidermonkey24/patches/patch-config_milestone.pl
index 6dc387c19a..2c20fd9f19 100644
--- a/spidermonkey24/patches/patch-config_milestone.pl
+++ b/spidermonkey24/patches/patch-config_milestone.pl
@@ -2,8 +2,8 @@ $NetBSD$
 
 Use of defined() for array is deprecated.
 
---- config/milestone.pl.orig	2013-11-19 19:42:43.000000000 +0000
-+++ config/milestone.pl
+--- js/src/config/milestone.pl.orig	2013-11-19 19:42:43.000000000 +0000
++++ js/src/config/milestone.pl
 @@ -56,7 +56,7 @@ $MILESTONE_FILE  = "$TOPSRCDIR/config/mi
  #
  my $milestone = Moz::Milestone::getOfficialMilestone($MILESTONE_FILE);
diff --git a/spidermonkey24/patches/patch-config_system-headers b/spidermonkey24/patches/patch-config_system-headers
index a3adf7eee5..1bf26324d5 100644
--- a/spidermonkey24/patches/patch-config_system-headers
+++ b/spidermonkey24/patches/patch-config_system-headers
@@ -1,7 +1,7 @@
 $NetBSD: patch-config_system-headers,v 1.1 2014/02/06 15:12:18 fhajny Exp $
 
---- config/system-headers.orig	2013-12-06 22:52:35.000000000 +0000
-+++ config/system-headers
+--- js/src/config/system-headers.orig	2013-12-06 22:52:35.000000000 +0000
++++ js/src/config/system-headers
 @@ -1145,3 +1145,14 @@ kvm.h
  spawn.h
  err.h
diff --git a/spidermonkey24/patches/patch-ctypes_CTypes.h b/spidermonkey24/patches/patch-ctypes_CTypes.h
index 8effd8f28e..8db9841fdb 100644
--- a/spidermonkey24/patches/patch-ctypes_CTypes.h
+++ b/spidermonkey24/patches/patch-ctypes_CTypes.h
@@ -1,7 +1,7 @@
 $NetBSD: patch-ctypes_CTypes.h,v 1.1 2014/02/06 15:12:18 fhajny Exp $
 
---- ctypes/CTypes.h.orig	2013-11-19 19:42:43.000000000 +0000
-+++ ctypes/CTypes.h
+--- js/src/ctypes/CTypes.h.orig	2013-11-19 19:42:43.000000000 +0000
++++ js/src/ctypes/CTypes.h
 @@ -16,6 +16,23 @@
  
  #include "js/HashTable.h"
diff --git a/spidermonkey24/patches/patch-ctypes_libffi_configure b/spidermonkey24/patches/patch-ctypes_libffi_configure
index 820fbe4aee..d0fbc539d6 100644
--- a/spidermonkey24/patches/patch-ctypes_libffi_configure
+++ b/spidermonkey24/patches/patch-ctypes_libffi_configure
@@ -1,7 +1,7 @@
 $NetBSD: patch-ctypes_libffi_configure,v 1.1 2014/02/06 15:12:18 fhajny Exp $
 
---- ctypes/libffi/configure.orig	2013-10-29 20:40:26.000000000 +0000
-+++ ctypes/libffi/configure
+--- js/src/ctypes/libffi/configure.orig	2013-10-29 20:40:26.000000000 +0000
++++ js/src/ctypes/libffi/configure
 @@ -11278,7 +11278,7 @@ case "$host" in
    powerpc-*-aix* | rs6000-*-aix*)
  	TARGET=POWERPC_AIX; TARGETDIR=powerpc
diff --git a/spidermonkey24/patches/patch-frontend_ParseMaps.cpp b/spidermonkey24/patches/patch-frontend_ParseMaps.cpp
index 6749b0dd89..037194fa8c 100644
--- a/spidermonkey24/patches/patch-frontend_ParseMaps.cpp
+++ b/spidermonkey24/patches/patch-frontend_ParseMaps.cpp
@@ -1,7 +1,7 @@
 $NetBSD: patch-frontend_ParseMaps.cpp,v 1.1 2014/02/06 15:12:18 fhajny Exp $
 
---- frontend/ParseMaps.cpp.orig	2013-10-29 20:40:26.000000000 +0000
-+++ frontend/ParseMaps.cpp
+--- js/src/frontend/ParseMaps.cpp.orig	2013-10-29 20:40:26.000000000 +0000
++++ js/src/frontend/ParseMaps.cpp
 @@ -132,5 +132,5 @@ frontend::InitAtomMap(JSContext *cx, fro
      }
  }
diff --git a/spidermonkey24/patches/patch-gdb_Makefile.in b/spidermonkey24/patches/patch-gdb_Makefile.in
index 5ea3bf8eba..4875731a9c 100644
--- a/spidermonkey24/patches/patch-gdb_Makefile.in
+++ b/spidermonkey24/patches/patch-gdb_Makefile.in
@@ -1,7 +1,7 @@
 $NetBSD: patch-gdb_Makefile.in,v 1.1 2014/02/06 15:12:18 fhajny Exp $
 
---- gdb/Makefile.in.orig	2013-10-29 20:40:26.000000000 +0000
-+++ gdb/Makefile.in
+--- js/src/gdb/Makefile.in.orig	2013-10-29 20:40:26.000000000 +0000
++++ js/src/gdb/Makefile.in
 @@ -19,6 +19,10 @@ LIBS = $(DEPTH)/$(LIB_PREFIX)js_static.$
  
  LOCAL_INCLUDES += -I$(topsrcdir) -I..
diff --git a/spidermonkey24/patches/patch-jit_AsmJSSignalHandlers.cpp b/spidermonkey24/patches/patch-jit_AsmJSSignalHandlers.cpp
index fe352ab4c1..1b94ababe3 100644
--- a/spidermonkey24/patches/patch-jit_AsmJSSignalHandlers.cpp
+++ b/spidermonkey24/patches/patch-jit_AsmJSSignalHandlers.cpp
@@ -2,9 +2,20 @@ $NetBSD: patch-jit_AsmJSSignalHandlers.cpp,v 1.1 2014/02/06 15:12:18 fhajny Exp
 
 * REG_EIP is not defined on Solaris/SunOS, use REG_PC instead.
 
---- jit/AsmJSSignalHandlers.cpp.orig	2013-10-29 20:40:19.000000000 +0000
-+++ jit/AsmJSSignalHandlers.cpp
-@@ -59,10 +59,11 @@ using namespace mozilla;
+--- js/src/jit/AsmJSSignalHandlers.cpp.orig	2013-10-29 20:40:19.000000000 +0000
++++ js/src/jit/AsmJSSignalHandlers.cpp
+@@ -4,6 +4,10 @@
+  * License, v. 2.0. If a copy of the MPL was not distributed with this
+  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+ 
++#if defined(__sun)
++#include <sys/regset.h>
++#endif
++
+ #include "jscntxt.h"
+ 
+ #include "jstypedarrayinlines.h"
+@@ -59,10 +63,11 @@ using namespace mozilla;
  #elif defined(__linux__) || defined(SOLARIS)
  # if defined(__linux__)
  #  define XMM_sig(p,i) ((p)->uc_mcontext.fpregs->_xmm[i])
@@ -17,7 +28,7 @@ $NetBSD: patch-jit_AsmJSSignalHandlers.cpp,v 1.1 2014/02/06 15:12:18 fhajny Exp
  # define RIP_sig(p) ((p)->uc_mcontext.gregs[REG_RIP])
  # define PC_sig(p) ((p)->uc_mcontext.arm_pc)
  # define RAX_sig(p) ((p)->uc_mcontext.gregs[REG_RAX])
-@@ -269,7 +270,7 @@ LookupHeapAccess(const AsmJSModule &modu
+@@ -269,7 +274,7 @@ LookupHeapAccess(const AsmJSModule &modu
  # if defined(JS_CPU_X64)
  #  if defined(__DragonFly__)
  #   include <machine/npx.h> // for union savefpu
diff --git a/spidermonkey24/patches/patch-jsapi-tests_Makefile.in b/spidermonkey24/patches/patch-jsapi-tests_Makefile.in
index 07f8a063d3..ea16390495 100644
--- a/spidermonkey24/patches/patch-jsapi-tests_Makefile.in
+++ b/spidermonkey24/patches/patch-jsapi-tests_Makefile.in
@@ -1,7 +1,7 @@
 $NetBSD: patch-jsapi-tests_Makefile.in,v 1.1 2014/02/06 15:12:18 fhajny Exp $
 
---- jsapi-tests/Makefile.in.orig	2013-10-29 20:40:20.000000000 +0000
-+++ jsapi-tests/Makefile.in
+--- js/src/jsapi-tests/Makefile.in.orig	2013-10-29 20:40:20.000000000 +0000
++++ js/src/jsapi-tests/Makefile.in
 @@ -20,6 +20,10 @@ LIBS      = $(DEPTH)/$(LIB_PREFIX)js_sta
  
  LOCAL_INCLUDES += -I$(topsrcdir) -I..
diff --git a/spidermonkey24/patches/patch-jscompartment.h b/spidermonkey24/patches/patch-jscompartment.h
index 0b35929a20..eb80d5785b 100644
--- a/spidermonkey24/patches/patch-jscompartment.h
+++ b/spidermonkey24/patches/patch-jscompartment.h
@@ -1,7 +1,7 @@
 $NetBSD: patch-jscompartment.h,v 1.1 2014/02/06 15:12:18 fhajny Exp $
 
---- jscompartment.h.orig	2013-10-29 20:40:20.000000000 +0000
-+++ jscompartment.h
+--- js/src/jscompartment.h.orig	2013-10-29 20:40:20.000000000 +0000
++++ js/src/jscompartment.h
 @@ -402,9 +402,9 @@ class js::AutoDebugModeGC
              GC(rt, GC_NORMAL, JS::gcreason::DEBUG_MODE_GC);
      }
diff --git a/spidermonkey24/patches/patch-jsmath.cpp b/spidermonkey24/patches/patch-jsmath.cpp
index 3c8b8e45e0..d9e3be34ac 100644
--- a/spidermonkey24/patches/patch-jsmath.cpp
+++ b/spidermonkey24/patches/patch-jsmath.cpp
@@ -1,7 +1,7 @@
 $NetBSD: patch-jsmath.cpp,v 1.1 2014/02/06 15:12:18 fhajny Exp $
 
---- jsmath.cpp.orig	2013-10-29 20:40:20.000000000 +0000
-+++ jsmath.cpp
+--- js/src/jsmath.cpp.orig	2013-10-29 20:40:20.000000000 +0000
++++ js/src/jsmath.cpp
 @@ -244,7 +244,7 @@ js::ecmaAtan2(double y, double x)
      }
  #endif
diff --git a/spidermonkey24/patches/patch-jsnativestack.cpp b/spidermonkey24/patches/patch-jsnativestack.cpp
index 619db4d88e..ef0e003e4e 100644
--- a/spidermonkey24/patches/patch-jsnativestack.cpp
+++ b/spidermonkey24/patches/patch-jsnativestack.cpp
@@ -1,7 +1,7 @@
 $NetBSD: patch-jsnativestack.cpp,v 1.1 2014/02/06 15:12:18 fhajny Exp $
 
---- jsnativestack.cpp.orig	2013-10-29 20:40:20.000000000 +0000
-+++ jsnativestack.cpp
+--- js/src/jsnativestack.cpp.orig	2013-10-29 20:40:20.000000000 +0000
++++ js/src/jsnativestack.cpp
 @@ -114,7 +114,7 @@ js::GetNativeStackBaseImpl()
      pthread_attr_init(&sattr);
  #  if defined(__OpenBSD__)
diff --git a/spidermonkey24/patches/patch-mfbt_Atomics.h b/spidermonkey24/patches/patch-mfbt_Atomics.h
new file mode 100644
index 0000000000..91127bb952
--- /dev/null
+++ b/spidermonkey24/patches/patch-mfbt_Atomics.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-mfbt_Atomics.h,v 1.1 2014/02/06 15:12:18 fhajny Exp $
+
+--- mfbt/Atomics.h.orig	2013-09-10 03:43:48.000000000 +0000
++++ mfbt/Atomics.h
+@@ -37,7 +37,7 @@
+     */
+ #  if !defined(__linux__) && !defined(__OpenBSD__) && \
+       (__cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__)) && \
+-      __has_include(<atomic>)
++      __has_include_next(<atomic>)
+ #    define MOZ_HAVE_CXX11_ATOMICS
+ #  endif
+ /*
diff --git a/spidermonkey24/patches/patch-mfbt_Poison.cpp b/spidermonkey24/patches/patch-mfbt_Poison.cpp
new file mode 100644
index 0000000000..1ae8553061
--- /dev/null
+++ b/spidermonkey24/patches/patch-mfbt_Poison.cpp
@@ -0,0 +1,20 @@
+$NetBSD: patch-mfbt_Poison.cpp,v 1.1 2014/02/06 15:12:18 fhajny Exp $
+
+* Use posix_madvise(3) instead of madvise(3) for Solaris/SunOS.
+  Solaris/SunOS's madvise(3) is not enabled in this context,
+  and its first argument type is different from NetBSD/Linux's one.
+
+--- mfbt/Poison.cpp.orig	2013-09-11 03:22:45.000000000 +0000
++++ mfbt/Poison.cpp
+@@ -125,7 +125,11 @@ ReleaseRegion(void *region, uintptr_t si
+ static bool
+ ProbeRegion(uintptr_t region, uintptr_t size)
+ {
++#if !defined(__sun)
+   if (madvise(reinterpret_cast<void*>(region), size, MADV_NORMAL)) {
++#else
++  if (posix_madvise(reinterpret_cast<void*>(region), size, MADV_NORMAL)) {
++#endif
+     return true;
+   } else {
+     return false;
diff --git a/spidermonkey24/patches/patch-shell_Makefile.in b/spidermonkey24/patches/patch-shell_Makefile.in
index 108198dd75..41d97d3538 100644
--- a/spidermonkey24/patches/patch-shell_Makefile.in
+++ b/spidermonkey24/patches/patch-shell_Makefile.in
@@ -1,7 +1,7 @@
 $NetBSD: patch-shell_Makefile.in,v 1.1 2014/02/06 15:12:18 fhajny Exp $
 
---- shell/Makefile.in.orig	2013-10-29 20:40:20.000000000 +0000
-+++ shell/Makefile.in
+--- js/src/shell/Makefile.in.orig	2013-10-29 20:40:20.000000000 +0000
++++ js/src/shell/Makefile.in
 @@ -27,6 +27,9 @@ LIBS      = $(NSPR_LIBS) $(EDITLINE_LIBS
  ifdef MOZ_NATIVE_FFI
  EXTRA_LIBS += $(MOZ_FFI_LIBS)
diff --git a/spidermonkey24/patches/patch-vm_ObjectImpl-inl.h b/spidermonkey24/patches/patch-vm_ObjectImpl-inl.h
index 62dac767a8..8689e0b2e0 100644
--- a/spidermonkey24/patches/patch-vm_ObjectImpl-inl.h
+++ b/spidermonkey24/patches/patch-vm_ObjectImpl-inl.h
@@ -1,7 +1,7 @@
 $NetBSD: patch-vm_ObjectImpl-inl.h,v 1.1 2014/02/06 15:12:18 fhajny Exp $
 
---- vm/ObjectImpl-inl.h.orig	2013-10-29 20:40:17.000000000 +0000
-+++ vm/ObjectImpl-inl.h
+--- js/src/vm/ObjectImpl-inl.h.orig	2013-10-29 20:40:17.000000000 +0000
++++ js/src/vm/ObjectImpl-inl.h
 @@ -364,7 +364,7 @@ js::ObjectImpl::zone() const
  js::ObjectImpl::readBarrier(ObjectImpl *obj)
  {
diff --git a/spidermonkey24/patches/patch-vm_SPSProfiler.cpp b/spidermonkey24/patches/patch-vm_SPSProfiler.cpp
index f44d0ec606..43282ec612 100644
--- a/spidermonkey24/patches/patch-vm_SPSProfiler.cpp
+++ b/spidermonkey24/patches/patch-vm_SPSProfiler.cpp
@@ -3,9 +3,8 @@ $NetBSD: patch-vm_SPSProfiler.cpp,v 1.1 2014/02/06 15:12:18 fhajny Exp $
 Unclear fallout from our version of bug 840242, attachment v1: some architectures
 fail to link if we do not add the inlines here - might be compiler/arch specific.
 
-
---- vm/SPSProfiler.cpp.orig	2013-10-29 20:40:18.000000000 +0000
-+++ vm/SPSProfiler.cpp
+--- js/src/vm/SPSProfiler.cpp.orig	2013-10-29 20:40:18.000000000 +0000
++++ js/src/vm/SPSProfiler.cpp
 @@ -8,6 +8,7 @@
  
  #include "jsnum.h"
Home | Main Index | Thread Index | Old Index