blob: 4fdd56fea0428438e5430053bd4008c2318daea3 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
|
Replace __GLIBC__ with __linux__ since musl also supports it
so checking __linux__ is more accomodating
See http://git.alpinelinux.org/cgit/aports/tree/community/webkit2gtk/musl-fixes.patch?id=219435d86d7e8fac9474344a7431c62bd2525184
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Index: webkitgtk-2.12.1/Source/JavaScriptCore/heap/MachineStackMarker.cpp
===================================================================
--- webkitgtk-2.12.1.orig/Source/JavaScriptCore/heap/MachineStackMarker.cpp
+++ webkitgtk-2.12.1/Source/JavaScriptCore/heap/MachineStackMarker.cpp
@@ -566,7 +566,7 @@ void* MachineThreads::Thread::Registers:
#error Unknown Architecture
#endif
-#elif defined(__GLIBC__) && ENABLE(JIT)
+#elif defined(__linux__) && ENABLE(JIT)
#if CPU(X86)
return reinterpret_cast<void*>((uintptr_t) regs.machineContext.gregs[REG_ESP]);
@@ -665,7 +665,7 @@ void* MachineThreads::Thread::Registers:
#error Unknown Architecture
#endif
-#elif defined(__GLIBC__)
+#elif defined(__linux__) // glibc and musl
// The following sequence depends on glibc's sys/ucontext.h.
#if CPU(X86)
@@ -747,7 +747,7 @@ void* MachineThreads::Thread::Registers:
#error Unknown Architecture
#endif
-#elif defined(__GLIBC__)
+#elif defined(__linux__) // glibc and musl
// The following sequence depends on glibc's sys/ucontext.h.
#if CPU(X86)
@@ -838,7 +838,7 @@ void* MachineThreads::Thread::Registers:
#error Unknown Architecture
#endif
-#elif defined(__GLIBC__)
+#elif defined(__linux__) // glibc and musl
// The following sequence depends on glibc's sys/ucontext.h.
#if CPU(X86)
|