Skip to content

Commit 82b96a2

Browse files
committed
Fix JSC execinfo patch
1 parent 9368b30 commit 82b96a2

File tree

1 file changed

+15
-4
lines changed

1 file changed

+15
-4
lines changed

patches/jsc.patch

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
diff --exclude=.svn -aur JavaScriptCore-org/CMakeLists.txt JavaScriptCore/CMakeLists.txt
2-
--- JavaScriptCore-org/CMakeLists.txt 2017-02-10 02:49:33.000000000 +0100
3-
+++ JavaScriptCore/CMakeLists.txt 2017-06-05 12:00:20.000000000 +0200
2+
--- JavaScriptCore-org/CMakeLists.txt 2017-02-10 02:49:33.000000000 +0100
3+
+++ JavaScriptCore/CMakeLists.txt 2017-06-05 12:00:20.000000000 +0200
44
@@ -18,7 +18,7 @@
55
"${JAVASCRIPTCORE_DIR}/dfg"
66
"${JAVASCRIPTCORE_DIR}/disassembler"
@@ -28,8 +28,8 @@ diff --exclude=.svn -aur JavaScriptCore-org/CMakeLists.txt JavaScriptCore/CMakeL
2828
# Force staging of shared scripts, even if they aren't directly used to build JavaScriptCore.
2929

3030
diff --exclude=.svn -aur JavaScriptCore-org/heap/EdenGCActivityCallback.cpp JavaScriptCore/heap/EdenGCActivityCallback.cpp
31-
--- JavaScriptCore-org/heap/EdenGCActivityCallback.cpp 2016-11-02 23:01:04.000000000 +0100
32-
+++ JavaScriptCore/heap/EdenGCActivityCallback.cpp 2017-05-30 15:57:45.000000000 +0200
31+
--- JavaScriptCore-org/heap/EdenGCActivityCallback.cpp 2016-11-02 23:01:04.000000000 +0100
32+
+++ JavaScriptCore/heap/EdenGCActivityCallback.cpp 2017-05-30 15:57:45.000000000 +0200
3333
@@ -30,7 +30,7 @@
3434

3535
namespace JSC {
@@ -39,3 +39,14 @@ diff --exclude=.svn -aur JavaScriptCore-org/heap/EdenGCActivityCallback.cpp Java
3939

4040
EdenGCActivityCallback::EdenGCActivityCallback(Heap* heap)
4141
: GCActivityCallback(heap)
42+
diff --exclude=.svn -aur JavaScriptCore-org/inspector/JSGlobalObjectInspectorController.cpp JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp
43+
--- JavaScriptCore-org/inspector/JSGlobalObjectInspectorController.cpp 2016-12-14 17:04:30.000000000 +0100
44+
+++ JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp 2017-06-06 13:23:24.000000000 +0200
45+
@@ -52,7 +52,6 @@
46+
#if OS(DARWIN) || (OS(LINUX) && !PLATFORM(GTK))
47+
#include <cxxabi.h>
48+
#include <dlfcn.h>
49+
-#include <execinfo.h>
50+
#endif
51+
52+
#if ENABLE(REMOTE_INSPECTOR)

0 commit comments

Comments
 (0)