Gitiles
Code Review Sign In
gerrit.openbmc.org / openbmc / owners-plugin-test / 1a4b7ee28bf7413af6513fb45ad0d0736048f866 / . / poky / meta / recipes-sato / webkit / webkitgtk / 0001-Fix-build-with-musl.patch
blob: 041ec4675f1935a3b7f4a4cee25365db3e4e9936 [file] [log] [blame]
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame^]1From 4f9d736e0458ed33cd161cd164ad0acdac939f44 Mon Sep 17 00:00:00 2001
Brad Bishop6e60e8b2018-02-01 10:27:11 -0500[diff] [blame]2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Fri, 6 Oct 2017 17:00:08 +0300
4Subject: [PATCH] Fix build with musl
5
6Upstream-Status: Pending
7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame^]8
Brad Bishop6e60e8b2018-02-01 10:27:11 -0500[diff] [blame]9---
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame^]10 Source/JavaScriptCore/runtime/MachineContext.h | 18 +++++++++++++++++-
Brad Bishop6e60e8b2018-02-01 10:27:11 -0500[diff] [blame]11 Source/WTF/wtf/Platform.h | 2 +-
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame^]12 2 files changed, 18 insertions(+), 2 deletions(-)
Brad Bishop6e60e8b2018-02-01 10:27:11 -0500[diff] [blame]13
14diff --git a/Source/JavaScriptCore/runtime/MachineContext.h b/Source/JavaScriptCore/runtime/MachineContext.h
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame^]15index bf0bdc7..84b8a8a 100644
Brad Bishop6e60e8b2018-02-01 10:27:11 -0500[diff] [blame]16--- a/Source/JavaScriptCore/runtime/MachineContext.h
17+++ b/Source/JavaScriptCore/runtime/MachineContext.h
18@@ -146,7 +146,7 @@ inline void*& stackPointer(mcontext_t& machineContext)
19 #error Unknown Architecture
20 #endif
21
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame^]22-#elif defined(__GLIBC__) || defined(__BIONIC__)
Brad Bishop6e60e8b2018-02-01 10:27:11 -0500[diff] [blame]23+#elif defined(__linux__)
24
25 #if CPU(X86)
26 return reinterpret_cast<void*&>((uintptr_t&) machineContext.gregs[REG_ESP]);
27@@ -251,7 +251,7 @@ inline void*& framePointer(mcontext_t& machineContext)
28 #error Unknown Architecture
29 #endif
30
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame^]31-#elif defined(__GLIBC__) || defined(__BIONIC__)
Brad Bishop6e60e8b2018-02-01 10:27:11 -0500[diff] [blame]32+#elif defined(__linux__)
33
34 // The following sequence depends on glibc's sys/ucontext.h.
35 #if CPU(X86)
36@@ -354,7 +354,7 @@ inline void*& instructionPointer(mcontext_t& machineContext)
37 #error Unknown Architecture
38 #endif
39
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame^]40-#elif defined(__GLIBC__) || defined(__BIONIC__)
Brad Bishop6e60e8b2018-02-01 10:27:11 -0500[diff] [blame]41+#elif defined(__linux__)
42
43 // The following sequence depends on glibc's sys/ucontext.h.
44 #if CPU(X86)
45@@ -466,7 +466,7 @@ inline void*& argumentPointer<1>(mcontext_t& machineContext)
46 #error Unknown Architecture
47 #endif
48
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame^]49-#elif defined(__GLIBC__) || defined(__BIONIC__)
Brad Bishop6e60e8b2018-02-01 10:27:11 -0500[diff] [blame]50+#elif defined(__linux__)
51
52 // The following sequence depends on glibc's sys/ucontext.h.
53 #if CPU(X86)
54@@ -583,7 +583,7 @@ inline void*& llintInstructionPointer(mcontext_t& machineContext)
55 #error Unknown Architecture
56 #endif
57
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame^]58-#elif defined(__GLIBC__) || defined(__BIONIC__)
Brad Bishop6e60e8b2018-02-01 10:27:11 -0500[diff] [blame]59+#elif defined(__linux__)
60
61 // The following sequence depends on glibc's sys/ucontext.h.
62 #if CPU(X86)
63diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame^]64index 551c047..e50b05a 100644
Brad Bishop6e60e8b2018-02-01 10:27:11 -0500[diff] [blame]65--- a/Source/WTF/wtf/Platform.h
66+++ b/Source/WTF/wtf/Platform.h
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame^]67@@ -683,7 +683,7 @@
Brad Bishop6e60e8b2018-02-01 10:27:11 -0500[diff] [blame]68 #define HAVE_CFNETWORK_STORAGE_PARTITIONING 1
69 #endif
70
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame^]71-#if OS(DARWIN) || ((OS(FREEBSD) || defined(__GLIBC__) || defined(__BIONIC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)))
Brad Bishop6e60e8b2018-02-01 10:27:11 -0500[diff] [blame]72+#if OS(DARWIN) || ((OS(FREEBSD) || defined(__linux__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)))
73 #define HAVE_MACHINE_CONTEXT 1
74 #endif
75