Mercurial > vanilla
comparison www/webkitgtk/patch-musl.patch @ 743:a6ccd21107cb
www/webkit: initial import, closes #1752
author | David Demelier <markand@malikania.fr> |
---|---|
date | Wed, 07 Aug 2019 07:13:31 +0200 |
parents | |
children |
comparison
equal
deleted
inserted
replaced
742:aa3c1de1780a | 743:a6ccd21107cb |
---|---|
1 From c4d4d9f1aa74addefdad40294cf16d9e0b3dd6ec Mon Sep 17 00:00:00 2001 | |
2 From: Alexander Kanavin <alex.kanavin@gmail.com> | |
3 Date: Fri, 6 Oct 2017 17:00:08 +0300 | |
4 Subject: [PATCH] Fix build with musl | |
5 | |
6 Upstream-Status: Pending | |
7 Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | |
8 | |
9 --- | |
10 Source/JavaScriptCore/runtime/MachineContext.h | 10 +++++----- | |
11 Source/WTF/wtf/Platform.h | 2 +- | |
12 2 files changed, 6 insertions(+), 6 deletions(-) | |
13 | |
14 diff --git a/Source/JavaScriptCore/runtime/MachineContext.h b/Source/JavaScriptCore/runtime/MachineContext.h | |
15 index 823964c2..00841146 100644 | |
16 --- a/Source/JavaScriptCore/runtime/MachineContext.h | |
17 +++ b/Source/JavaScriptCore/runtime/MachineContext.h | |
18 @@ -188,7 +188,7 @@ static inline void*& stackPointerImpl(mcontext_t& machineContext) | |
19 #error Unknown Architecture | |
20 #endif | |
21 | |
22 -#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) | |
23 +#elif defined(__linux__) | |
24 | |
25 #if CPU(X86) | |
26 return reinterpret_cast<void*&>((uintptr_t&) machineContext.gregs[REG_ESP]); | |
27 @@ -335,7 +335,7 @@ static inline void*& framePointerImpl(mcontext_t& machineContext) | |
28 #error Unknown Architecture | |
29 #endif | |
30 | |
31 -#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) | |
32 +#elif defined(__linux__) | |
33 | |
34 // The following sequence depends on glibc's sys/ucontext.h. | |
35 #if CPU(X86) | |
36 @@ -482,7 +482,7 @@ static inline void*& instructionPointerImpl(mcontext_t& machineContext) | |
37 #error Unknown Architecture | |
38 #endif | |
39 | |
40 -#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) | |
41 +#elif defined(__linux__) | |
42 | |
43 // The following sequence depends on glibc's sys/ucontext.h. | |
44 #if CPU(X86) | |
45 @@ -639,7 +639,7 @@ inline void*& argumentPointer<1>(mcontext_t& machineContext) | |
46 #error Unknown Architecture | |
47 #endif | |
48 | |
49 -#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) | |
50 +#elif defined(__linux__) | |
51 | |
52 // The following sequence depends on glibc's sys/ucontext.h. | |
53 #if CPU(X86) | |
54 @@ -756,7 +756,7 @@ inline void*& llintInstructionPointer(mcontext_t& machineContext) | |
55 #error Unknown Architecture | |
56 #endif | |
57 | |
58 -#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) | |
59 +#elif defined(__linux__) | |
60 | |
61 // The following sequence depends on glibc's sys/ucontext.h. | |
62 #if CPU(X86) | |
63 diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h | |
64 index 34f7cb14..32ad9150 100644 | |
65 --- a/Source/WTF/wtf/Platform.h | |
66 +++ b/Source/WTF/wtf/Platform.h | |
67 @@ -714,7 +714,7 @@ | |
68 | |
69 #endif /* OS(DARWIN) */ | |
70 | |
71 -#if OS(DARWIN) || OS(FUCHSIA) || ((OS(FREEBSD) || defined(__GLIBC__) || defined(__BIONIC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS))) | |
72 +#if OS(DARWIN) || OS(FUCHSIA) || ((OS(FREEBSD) || defined(__linux__) || defined(__BIONIC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS))) | |
73 #define HAVE_MACHINE_CONTEXT 1 | |
74 #endif | |
75 |