1From c4ceb318aa1064bfa677cdd800c52155eb1bed3a Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 23 Aug 2018 04:06:17 +0000
4Subject: [PATCH] Fix build with non-glibc libc on musl
5
6Need to ensure glibc features are not assumed to be linux-wide
7
8Upstream-Status: Pending
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10---
11 Source/JavaScriptCore/heap/MachineStackMarker.cpp         | 8 ++++----
12 .../inspector/JSGlobalObjectInspectorController.cpp       | 2 ++
13 2 files changed, 6 insertions(+), 4 deletions(-)
14
15diff --git a/Source/JavaScriptCore/heap/MachineStackMarker.cpp b/Source/JavaScriptCore/heap/MachineStackMarker.cpp
16index 883914fd3..ce4e8d331 100644
17--- a/Source/JavaScriptCore/heap/MachineStackMarker.cpp
18+++ b/Source/JavaScriptCore/heap/MachineStackMarker.cpp
19@@ -566,7 +566,7 @@ void* MachineThreads::Thread::Registers::stackPointer() const
20 #error Unknown Architecture
21 #endif
22
23-#elif defined(__GLIBC__) && ENABLE(JIT)
24+#elif defined(__linux__) && ENABLE(JIT)
25
26 #if CPU(X86)
27     return reinterpret_cast<void*>((uintptr_t) regs.machineContext.gregs[REG_ESP]);
28@@ -665,7 +665,7 @@ void* MachineThreads::Thread::Registers::framePointer() const
29 #error Unknown Architecture
30 #endif
31
32-#elif defined(__GLIBC__)
33+#elif defined(__linux__)
34
35 // The following sequence depends on glibc's sys/ucontext.h.
36 #if CPU(X86)
37@@ -747,7 +747,7 @@ void* MachineThreads::Thread::Registers::instructionPointer() const
38 #error Unknown Architecture
39 #endif
40
41-#elif defined(__GLIBC__)
42+#elif defined(__linux__)
43
44 // The following sequence depends on glibc's sys/ucontext.h.
45 #if CPU(X86)
46@@ -838,7 +838,7 @@ void* MachineThreads::Thread::Registers::llintPC() const
47 #error Unknown Architecture
48 #endif
49
50-#elif defined(__GLIBC__)
51+#elif defined(__linux__)
52
53 // The following sequence depends on glibc's sys/ucontext.h.
54 #if CPU(X86)
55diff --git a/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp b/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp
56index fd7f869d4..e95391b32 100644
57--- a/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp
58+++ b/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp
59@@ -51,8 +51,10 @@
60 #include <cxxabi.h>
61 #if OS(DARWIN) || (OS(LINUX) && !PLATFORM(GTK))
62 #include <dlfcn.h>
63+#if defined(__GLIBC__)
64 #include <execinfo.h>
65 #endif
66+#endif
67
68 #if ENABLE(REMOTE_INSPECTOR)
69 #include "JSGlobalObjectDebuggable.h"
70