| From 415e31bd5444fa360af58b069f1b9db6607fca7d Mon Sep 17 00:00:00 2001 |
| From: Alexander Kanavin <alex.kanavin@gmail.com> |
| Date: Fri, 6 Oct 2017 17:00:08 +0300 |
| Subject: [PATCH] Fix build with musl |
| |
| Upstream-Status: Pending |
| Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
| --- |
| Source/JavaScriptCore/runtime/MachineContext.h | 10 +++++----- |
| Source/WTF/wtf/Platform.h | 2 +- |
| 2 files changed, 6 insertions(+), 6 deletions(-) |
| |
| diff --git a/Source/JavaScriptCore/runtime/MachineContext.h b/Source/JavaScriptCore/runtime/MachineContext.h |
| index 95080b9..2bb689c 100644 |
| --- a/Source/JavaScriptCore/runtime/MachineContext.h |
| +++ b/Source/JavaScriptCore/runtime/MachineContext.h |
| @@ -146,7 +146,7 @@ inline void*& stackPointer(mcontext_t& machineContext) |
| #error Unknown Architecture |
| #endif |
| |
| -#elif defined(__GLIBC__) |
| +#elif defined(__linux__) |
| |
| #if CPU(X86) |
| return reinterpret_cast<void*&>((uintptr_t&) machineContext.gregs[REG_ESP]); |
| @@ -251,7 +251,7 @@ inline void*& framePointer(mcontext_t& machineContext) |
| #error Unknown Architecture |
| #endif |
| |
| -#elif defined(__GLIBC__) |
| +#elif defined(__linux__) |
| |
| // The following sequence depends on glibc's sys/ucontext.h. |
| #if CPU(X86) |
| @@ -354,7 +354,7 @@ inline void*& instructionPointer(mcontext_t& machineContext) |
| #error Unknown Architecture |
| #endif |
| |
| -#elif defined(__GLIBC__) |
| +#elif defined(__linux__) |
| |
| // The following sequence depends on glibc's sys/ucontext.h. |
| #if CPU(X86) |
| @@ -466,7 +466,7 @@ inline void*& argumentPointer<1>(mcontext_t& machineContext) |
| #error Unknown Architecture |
| #endif |
| |
| -#elif defined(__GLIBC__) |
| +#elif defined(__linux__) |
| |
| // The following sequence depends on glibc's sys/ucontext.h. |
| #if CPU(X86) |
| @@ -583,7 +583,7 @@ inline void*& llintInstructionPointer(mcontext_t& machineContext) |
| #error Unknown Architecture |
| #endif |
| |
| -#elif defined(__GLIBC__) |
| +#elif defined(__linux__) |
| |
| // The following sequence depends on glibc's sys/ucontext.h. |
| #if CPU(X86) |
| diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h |
| index 5a2863b..b36c3ff 100644 |
| --- a/Source/WTF/wtf/Platform.h |
| +++ b/Source/WTF/wtf/Platform.h |
| @@ -680,7 +680,7 @@ |
| #define HAVE_CFNETWORK_STORAGE_PARTITIONING 1 |
| #endif |
| |
| -#if OS(DARWIN) || ((OS(FREEBSD) || defined(__GLIBC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS))) |
| +#if OS(DARWIN) || ((OS(FREEBSD) || defined(__linux__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS))) |
| #define HAVE_MACHINE_CONTEXT 1 |
| #endif |
| |
| -- |
| 2.14.1 |
| |