| From 828a500d5be62ba6fc94bd4fac3fe4bf1b1d4f6d 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/PlatformHave.h | 2 +- |
| 2 files changed, 6 insertions(+), 6 deletions(-) |
| |
| --- a/Source/JavaScriptCore/runtime/MachineContext.h |
| +++ b/Source/JavaScriptCore/runtime/MachineContext.h |
| @@ -196,7 +196,7 @@ static inline void*& stackPointerImpl(mc |
| #error Unknown Architecture |
| #endif |
| |
| -#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) |
| +#elif defined(__linux__) |
| |
| #if CPU(X86) |
| return reinterpret_cast<void*&>((uintptr_t&) machineContext.gregs[REG_ESP]); |
| @@ -347,7 +347,7 @@ static inline void*& framePointerImpl(mc |
| #error Unknown Architecture |
| #endif |
| |
| -#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) |
| +#elif defined(__linux__) |
| |
| // The following sequence depends on glibc's sys/ucontext.h. |
| #if CPU(X86) |
| @@ -498,7 +498,7 @@ static inline void*& instructionPointerI |
| #error Unknown Architecture |
| #endif |
| |
| -#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) |
| +#elif defined(__linux__) |
| |
| // The following sequence depends on glibc's sys/ucontext.h. |
| #if CPU(X86) |
| @@ -656,7 +656,7 @@ inline void*& argumentPointer<1>(mcontex |
| #error Unknown Architecture |
| #endif |
| |
| -#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) |
| +#elif defined(__linux__) |
| |
| // The following sequence depends on glibc's sys/ucontext.h. |
| #if CPU(X86) |
| @@ -773,7 +773,7 @@ inline void*& llintInstructionPointer(mc |
| #error Unknown Architecture |
| #endif |
| |
| -#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) |
| +#elif defined(__linux__) |
| |
| // The following sequence depends on glibc's sys/ucontext.h. |
| #if CPU(X86) |
| --- a/Source/WTF/wtf/PlatformHave.h |
| +++ b/Source/WTF/wtf/PlatformHave.h |
| @@ -202,7 +202,7 @@ |
| #define HAVE_HOSTED_CORE_ANIMATION 1 |
| #endif |
| |
| -#if OS(DARWIN) || OS(FUCHSIA) || ((OS(FREEBSD) || defined(__GLIBC__) || defined(__BIONIC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS))) |
| +#if OS(DARWIN) || OS(FUCHSIA) || ((OS(FREEBSD) || defined(__linux__) || defined(__BIONIC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS))) |
| #define HAVE_MACHINE_CONTEXT 1 |
| #endif |
| |
| --- a/Source/WebCore/xml/XPathGrammar.cpp |
| +++ b/Source/WebCore/xml/XPathGrammar.cpp |
| @@ -966,7 +966,7 @@ int yydebug; |
| #if YYERROR_VERBOSE |
| |
| # ifndef yystrlen |
| -# if defined __GLIBC__ && defined _STRING_H |
| +# if defined __linux__ && defined _STRING_H |
| # define yystrlen strlen |
| # else |
| /* Return the length of YYSTR. */ |
| @@ -989,7 +989,7 @@ yystrlen (yystr) |
| # endif |
| |
| # ifndef yystpcpy |
| -# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE |
| +# if defined __linux__ && defined _STRING_H && defined _GNU_SOURCE |
| # define yystpcpy stpcpy |
| # else |
| /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in |