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