Import of pkgsrc-2014Q1

This commit is contained in:
2014-04-17 16:38:45 +02:00
parent 785076ae39
commit 9a8c06dafb
19365 changed files with 828089 additions and 278039 deletions

View File

@@ -1,16 +1,24 @@
$NetBSD: patch-js__src__vm__SPSProfiler.cpp,v 1.1 2013/06/21 23:11:42 ryoon Exp $
$NetBSD: patch-js__src__vm__SPSProfiler.cpp,v 1.6 2014/02/20 13:19:03 ryoon 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.
--- js/src/vm/SPSProfiler.cpp.orig 2013-05-11 21:19:36.000000000 +0200
+++ js/src/vm/SPSProfiler.cpp 2013-06-15 11:49:39.000000000 +0200
@@ -9,6 +9,7 @@
--- js/src/vm/SPSProfiler.cpp.orig 2013-12-05 16:07:40.000000000 +0000
+++ js/src/vm/SPSProfiler.cpp
@@ -4,12 +4,15 @@
* 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/. */
+#include "jscntxtinlines.h"
+
#include "vm/SPSProfiler.h"
#include "mozilla/DebugOnly.h"
#include "jsnum.h"
#include "jsscript.h"
+#include "jscntxtinlines.h"
#include "methodjit/MethodJIT.h"
#include "methodjit/Compiler.h"
#include "jit/BaselineJIT.h"
#include "vm/StringBuffer.h"