diff options
Diffstat (limited to 'extra/webkit2gtk/patches/fix-musl.patch')
| -rw-r--r-- | extra/webkit2gtk/patches/fix-musl.patch | 61 |
1 files changed, 29 insertions, 32 deletions
diff --git a/extra/webkit2gtk/patches/fix-musl.patch b/extra/webkit2gtk/patches/fix-musl.patch index ee53a2f6..c58e6269 100644 --- a/extra/webkit2gtk/patches/fix-musl.patch +++ b/extra/webkit2gtk/patches/fix-musl.patch @@ -1,8 +1,7 @@ -diff --git a/Source/JavaScriptCore/runtime/MachineContext.h b/Source/JavaScriptCore/runtime/MachineContext.h -index c5052527..dabd3733 100644 ---- a/Source/JavaScriptCore/runtime/MachineContext.h -+++ b/Source/JavaScriptCore/runtime/MachineContext.h -@@ -196,7 +196,7 @@ static inline void*& stackPointerImpl(mcontext_t& machineContext) +diff -u -r a/Source/JavaScriptCore/runtime/MachineContext.h b/Source/JavaScriptCore/runtime/MachineContext.h +--- a/Source/JavaScriptCore/runtime/MachineContext.h 2020-08-12 12:17:53.000000000 +0300 ++++ b/Source/JavaScriptCore/runtime/MachineContext.h 2020-09-11 14:22:18.584077655 +0300 +@@ -196,7 +196,7 @@ #error Unknown Architecture #endif @@ -11,7 +10,7 @@ index c5052527..dabd3733 100644 #if CPU(X86) return reinterpret_cast<void*&>((uintptr_t&) machineContext.gregs[REG_ESP]); -@@ -347,7 +347,7 @@ static inline void*& framePointerImpl(mcontext_t& machineContext) +@@ -347,7 +347,7 @@ #error Unknown Architecture #endif @@ -20,7 +19,7 @@ index c5052527..dabd3733 100644 // The following sequence depends on glibc's sys/ucontext.h. #if CPU(X86) -@@ -498,7 +498,7 @@ static inline void*& instructionPointerImpl(mcontext_t& machineContext) +@@ -498,7 +498,7 @@ #error Unknown Architecture #endif @@ -29,7 +28,7 @@ index c5052527..dabd3733 100644 // The following sequence depends on glibc's sys/ucontext.h. #if CPU(X86) -@@ -656,7 +656,7 @@ inline void*& argumentPointer<1>(mcontext_t& machineContext) +@@ -656,7 +656,7 @@ #error Unknown Architecture #endif @@ -38,7 +37,7 @@ index c5052527..dabd3733 100644 // The following sequence depends on glibc's sys/ucontext.h. #if CPU(X86) -@@ -773,7 +773,7 @@ inline void*& llintInstructionPointer(mcontext_t& machineContext) +@@ -773,7 +773,7 @@ #error Unknown Architecture #endif @@ -47,11 +46,26 @@ index c5052527..dabd3733 100644 // The following sequence depends on glibc's sys/ucontext.h. #if CPU(X86) -diff --git a/Source/WebCore/xml/XPathGrammar.cpp b/Source/WebCore/xml/XPathGrammar.cpp -index 0875a5ec..98d51533 100644 ---- a/Source/WebCore/xml/XPathGrammar.cpp -+++ b/Source/WebCore/xml/XPathGrammar.cpp -@@ -966,7 +966,7 @@ int yydebug; +diff -u -r a/Source/JavaScriptCore/runtime/OptionsList.h b/Source/JavaScriptCore/runtime/OptionsList.h +--- a/Source/JavaScriptCore/runtime/OptionsList.h 2020-08-12 12:17:53.000000000 +0300 ++++ b/Source/JavaScriptCore/runtime/OptionsList.h 2020-09-11 14:22:18.586077732 +0300 +@@ -90,9 +90,9 @@ + \ + v(Bool, reportMustSucceedExecutableAllocations, false, Normal, nullptr) \ + \ +- v(Unsigned, maxPerThreadStackUsage, 5 * MB, Normal, "Max allowed stack usage by the VM") \ +- v(Unsigned, softReservedZoneSize, 128 * KB, Normal, "A buffer greater than reservedZoneSize that reserves space for stringifying exceptions.") \ +- v(Unsigned, reservedZoneSize, 64 * KB, Normal, "The amount of stack space we guarantee to our clients (and to interal VM code that does not call out to clients).") \ ++ v(Unsigned, maxPerThreadStackUsage, 80 * KB , Normal, "Max allowed stack usage by the VM") \ ++ v(Unsigned, softReservedZoneSize, 32 * KB, Normal, "A buffer greater than reservedZoneSize that reserves space for stringifying exceptions.") \ ++ v(Unsigned, reservedZoneSize, 16 * KB, Normal, "The amount of stack space we guarantee to our clients (and to interal VM code that does not call out to clients).") \ + \ + v(Bool, crashOnDisallowedVMEntry, ASSERT_ENABLED, Normal, "Forces a crash if we attempt to enter the VM when disallowed") \ + v(Bool, crashIfCantAllocateJITMemory, false, Normal, nullptr) \ +diff -u -r a/Source/WebCore/xml/XPathGrammar.cpp b/Source/WebCore/xml/XPathGrammar.cpp +--- a/Source/WebCore/xml/XPathGrammar.cpp 2020-08-12 12:17:56.000000000 +0300 ++++ b/Source/WebCore/xml/XPathGrammar.cpp 2020-09-11 14:22:18.585077693 +0300 +@@ -966,7 +966,7 @@ #if YYERROR_VERBOSE # ifndef yystrlen @@ -60,7 +74,7 @@ index 0875a5ec..98d51533 100644 # define yystrlen strlen # else /* Return the length of YYSTR. */ -@@ -989,7 +989,7 @@ yystrlen (yystr) +@@ -989,7 +989,7 @@ # endif # ifndef yystpcpy @@ -69,20 +83,3 @@ index 0875a5ec..98d51533 100644 # define yystpcpy stpcpy # else /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in -diff --git a/Source/JavaScriptCore/runtime/OptionsList.h b/Source/JavaScriptCore/runtime/OptionsList.h -index 41cab118..2ac66c7a 100644 ---- a/Source/JavaScriptCore/runtime/OptionsList.h -+++ b/Source/JavaScriptCore/runtime/OptionsList.h -@@ -90,9 +90,9 @@ constexpr bool enableWebAssemblyStreamingApi = false; - \ - v(Bool, reportMustSucceedExecutableAllocations, false, Normal, nullptr) \ - \ -- v(Unsigned, maxPerThreadStackUsage, 5 * MB, Normal, "Max allowed stack usage by the VM") \ -- v(Unsigned, softReservedZoneSize, 128 * KB, Normal, "A buffer greater than reservedZoneSize that reserves space for stringifying exceptions.") \ -- v(Unsigned, reservedZoneSize, 64 * KB, Normal, "The amount of stack space we guarantee to our clients (and to interal VM code that does not call out to clients).") \ -+ v(Unsigned, maxPerThreadStackUsage, 80 * KB , Normal, "Max allowed stack usage by the VM") \ -+ v(Unsigned, softReservedZoneSize, 32 * KB, Normal, "A buffer greater than reservedZoneSize that reserves space for stringifying exceptions.") \ -+ v(Unsigned, reservedZoneSize, 16 * KB, Normal, "The amount of stack space we guarantee to our clients (and to interal VM code that does not call out to clients).") \ - \ - v(Bool, crashIfCantAllocateJITMemory, false, Normal, nullptr) \ - v(Unsigned, jitMemoryReservationSize, 0, Normal, "Set this number to change the executable allocation size in ExecutableAllocatorFixedVMPool. (In bytes.)") \ |