webkit-gtk: Update to 2.32.1

pkgsrc changes:
 - Remove patches applied upstream

Changes:
2.32.1
------
 - Support building against the Musl C library.
 - Support building against ICU version 69 or newer.
 - Improve handling of Media Capture devices.
 - Improve WebAudio playback.
 - Improve video orientation handling.
 - Improve seeking support for MSE playback.
 - Improve flush support in EME decryptors.
 - Fix HTTP status codes for requests done through a custom URI handler.
 - Fix the Bubblewrap sandbox in certain 32-bit systems.
 - Fix inconsistencies between the WebKitWebView.is-muted property state
   and values returned by webkit_web_view_is_playing_audio().
 - Fix the build with ENABLE_VIDEO=OFF.
 - Fix wrong timestamps for long-lived cookies.
 - Fix UI process crash when failing to load favicons.
 - Fix several crashes and rendering issues.
 - Translation updates: Swedish.

10 files changed, 38 insertions, 183 deletions

diff --git a/www/webkit-gtk/Makefile b/www/webkit-gtk/Makefile
index 20c8a6af70a..6b9ca71dcc0 100644
--- a/www/webkit-gtk/Makefile
+++ b/www/webkit-gtk/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.205 2021/04/25 12:00:24 leot Exp $
+# $NetBSD: Makefile,v 1.206 2021/05/13 08:20:58 leot Exp $
 
-DISTNAME=	webkitgtk-2.32.0
+DISTNAME=	webkitgtk-2.32.1
 PKGNAME=	${DISTNAME:S/webkitgtk/webkit-gtk/}
-PKGREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	https://www.webkitgtk.org/releases/
 EXTRACT_SUFX=	.tar.xz
diff --git a/www/webkit-gtk/PLIST b/www/webkit-gtk/PLIST
index 37647b62090..e2137e9426e 100644
--- a/www/webkit-gtk/PLIST
+++ b/www/webkit-gtk/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.71 2021/03/30 22:32:40 leot Exp $
+@comment $NetBSD: PLIST,v 1.72 2021/05/13 08:20:58 leot Exp $
 bin/WebKitWebDriver
 include/webkitgtk-4.0/JavaScriptCore/JSBase.h
 include/webkitgtk-4.0/JavaScriptCore/JSContextRef.h
@@ -219,10 +219,10 @@ ${PLIST.introspection}lib/girepository-1.0/WebKit2-4.0.typelib
 ${PLIST.introspection}lib/girepository-1.0/WebKit2WebExtension-4.0.typelib
 lib/libjavascriptcoregtk-4.0.so
 lib/libjavascriptcoregtk-4.0.so.18
-lib/libjavascriptcoregtk-4.0.so.18.18.4
+lib/libjavascriptcoregtk-4.0.so.18.18.5
 lib/libwebkit2gtk-4.0.so
 lib/libwebkit2gtk-4.0.so.37
-lib/libwebkit2gtk-4.0.so.37.53.1
+lib/libwebkit2gtk-4.0.so.37.53.2
 lib/pkgconfig/javascriptcoregtk-4.0.pc
 lib/pkgconfig/webkit2gtk-4.0.pc
 lib/pkgconfig/webkit2gtk-web-extension-4.0.pc
diff --git a/www/webkit-gtk/distinfo b/www/webkit-gtk/distinfo
index fa1eb3b438b..9ca0fdb0aa6 100644
--- a/www/webkit-gtk/distinfo
+++ b/www/webkit-gtk/distinfo
@@ -1,29 +1,24 @@
-$NetBSD: distinfo,v 1.149 2021/04/27 07:57:06 leot Exp $
+$NetBSD: distinfo,v 1.150 2021/05/13 08:20:58 leot Exp $
 
-SHA1 (webkitgtk-2.32.0.tar.xz) = 8abdb3ba2732c892dd06bb2bd63208b090462bf7
-RMD160 (webkitgtk-2.32.0.tar.xz) = c825873ec544e505f84e3b8a900619dac08e01ce
-SHA512 (webkitgtk-2.32.0.tar.xz) = 4832a4614be24481028ca8a6480a8e6cfacd8e22f5ba9f936703c09944550056f06f75ccf8fffa7dee3f5a1d11ab1870841407745be2e61ebad6557a0934db15
-Size (webkitgtk-2.32.0.tar.xz) = 23315936 bytes
+SHA1 (webkitgtk-2.32.1.tar.xz) = c8c507d3c98c891ea5bfcfb6407320959dc77a2b
+RMD160 (webkitgtk-2.32.1.tar.xz) = b792418886a7d0f83abb6ad5fcf9da470605d1b0
+SHA512 (webkitgtk-2.32.1.tar.xz) = ff49522c585d3c5c9b88c4176673aebfdf7f2a127d7bc4007008a66c493476ae6551189865e4f0f330a7b332a438b6c951bf1a4c21cd0acf69b7051903d24843
+Size (webkitgtk-2.32.1.tar.xz) = 23321600 bytes
 SHA1 (patch-Source_JavaScriptCore_Scripts_check-xcfilelists.sh) = f4f117e6c1cd8eb8e4905f74946e0367156ed528
 SHA1 (patch-Source_JavaScriptCore_Scripts_generate-unified-sources.sh) = 308a7c8f687253b4fc75de0c66016dd18666e697
-SHA1 (patch-Source_JavaScriptCore_Sources.txt) = 51de2568e6255ee77f6ea7f3ab657eb3c43c8ce6
 SHA1 (patch-Source_JavaScriptCore_assembler_ARM64Assembler.h) = 79c282ca90d0ba2ef4769da40d4648f5f709951b
 SHA1 (patch-Source_JavaScriptCore_assembler_ARMv7Assembler.h) = 70975aac175ec4131a4ed26a54dfe51e16ffb7cd
 SHA1 (patch-Source_JavaScriptCore_heap_MarkedSpace.cpp) = 709e5dcf4cdb834617c2ef542686bb2aa4aa37b3
 SHA1 (patch-Source_JavaScriptCore_jit_ExecutableAllocator.cpp) = 7f6c0c57d46478e83c4ff21dae2415f44085ba32
 SHA1 (patch-Source_JavaScriptCore_offlineasm_arm64.rb) = 8c05dafa317667bbf55504d05eeb8ae06fba4e93
-SHA1 (patch-Source_JavaScriptCore_runtime_IntlSegmenter.cpp) = 326b0405fc433e579c115e174e516f1c79e8edc5
-SHA1 (patch-Source_JavaScriptCore_runtime_IntlSegmenter.h) = 36abe8dd1cf6fceefc05d8f6fe0d1a6c18f4d0c5
-SHA1 (patch-Source_JavaScriptCore_runtime_IntlSegments.cpp) = 8c357e32a256c06f05c0aeb6bea485f90ef8219d
-SHA1 (patch-Source_JavaScriptCore_runtime_IntlWorkaround.cpp) = b4a793edefa3c500b167d6fe3cdb9244ec38bcf5
-SHA1 (patch-Source_JavaScriptCore_runtime_MachineContext.h) = 23bc86a389f8009ec829c3ee0fe3effe3f20b012
+SHA1 (patch-Source_JavaScriptCore_runtime_MachineContext.h) = 3bf3c200917ba49573388081ea9c5f6c55605b9b
 SHA1 (patch-Source_ThirdParty_ANGLE_src_common_third__party_smhasher_src_PMurHash.cpp) = 73dfe781efe7e8aa7d49094af8820a87c501818f
 SHA1 (patch-Source_ThirdParty_ANGLE_src_compiler_translator_SymbolTable.h) = 10debffda84bc752ed434657a337a466aad19a3a
 SHA1 (patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h) = a5454eb891ad1f9d8285c28af2e9efb4ff439e6b
 SHA1 (patch-Source_WTF_wtf_Assertions.h) = 427de20eba4627578087feaa7de2f23e80b9debf
 SHA1 (patch-Source_WTF_wtf_FileSystem.cpp) = 2fe7b7755646d9a1cc022aec3d01091766378aba
 SHA1 (patch-Source_WTF_wtf_PlatformEnable.h) = eb5598c20c8453314daba7897066f15827bbede7
-SHA1 (patch-Source_WTF_wtf_PlatformHave.h) = 3787817a0e288d00aa747c417aecd9abf52866d1
+SHA1 (patch-Source_WTF_wtf_PlatformHave.h) = 1c96cc094a4f62f17d11890a17f164d214fa0f1f
 SHA1 (patch-Source_WTF_wtf_PlatformOS.h) = 80aa6ff20f10407d447fdb41606d4bb4989351aa
 SHA1 (patch-Source_WTF_wtf_PlatformUse.h) = 595486b48e7d89378208c0a209a121ef136415e6
 SHA1 (patch-Source_WTF_wtf_StackBounds.cpp) = 22a71daac8443f079ad8bcc7285cfd7319c972b3
diff --git a/www/webkit-gtk/patches/patch-Source_JavaScriptCore_Sources.txt b/www/webkit-gtk/patches/patch-Source_JavaScriptCore_Sources.txt
deleted file mode 100644
index 8af78d2afa3..00000000000
--- a/www/webkit-gtk/patches/patch-Source_JavaScriptCore_Sources.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-Source_JavaScriptCore_Sources.txt,v 1.1 2021/04/25 12:00:24 leot Exp $
-
-Fix build for ICU >= 69.
-
-From:
-
- https://trac.webkit.org/changeset/275920/webkit?format=diff&new=275920
-
---- Source/JavaScriptCore/Sources.txt.orig	2021-02-26 09:57:05.000000000 +0000
-+++ Source/JavaScriptCore/Sources.txt
-@@ -848,6 +848,7 @@ runtime/IntlSegmenterConstructor.cpp
- runtime/IntlSegmenterPrototype.cpp
- runtime/IntlSegments.cpp
- runtime/IntlSegmentsPrototype.cpp
-+runtime/IntlWorkaround.cpp @no-unify // Confine U_HIDE_DRAFT_API's effect to this file.
- runtime/IteratorOperations.cpp
- runtime/IteratorPrototype.cpp
- runtime/JSArray.cpp
diff --git a/www/webkit-gtk/patches/patch-Source_JavaScriptCore_runtime_IntlSegmenter.cpp b/www/webkit-gtk/patches/patch-Source_JavaScriptCore_runtime_IntlSegmenter.cpp
deleted file mode 100644
index 71aebf4be8b..00000000000
--- a/www/webkit-gtk/patches/patch-Source_JavaScriptCore_runtime_IntlSegmenter.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-Source_JavaScriptCore_runtime_IntlSegmenter.cpp,v 1.1 2021/04/25 12:00:24 leot Exp $
-
-Fix build for ICU >= 69.
-
-From:
-
- https://trac.webkit.org/changeset/275920/webkit?format=diff&new=275920
-
---- Source/JavaScriptCore/runtime/IntlSegmenter.cpp.orig	2021-02-26 09:57:05.000000000 +0000
-+++ Source/JavaScriptCore/runtime/IntlSegmenter.cpp
-@@ -125,7 +125,7 @@ JSValue IntlSegmenter::segment(JSGlobalO
-     auto upconvertedCharacters = Box<Vector<UChar>>::create(string.charactersWithoutNullTermination());
- 
-     UErrorCode status = U_ZERO_ERROR;
--    auto segmenter = std::unique_ptr<UBreakIterator, UBreakIteratorDeleter>(ubrk_safeClone(m_segmenter.get(), nullptr, nullptr, &status));
-+    auto segmenter = std::unique_ptr<UBreakIterator, UBreakIteratorDeleter>(cloneUBreakIterator(m_segmenter.get(), &status));
-     if (U_FAILURE(status)) {
-         throwTypeError(globalObject, scope, "failed to initialize Segments"_s);
-         return { };
diff --git a/www/webkit-gtk/patches/patch-Source_JavaScriptCore_runtime_IntlSegmenter.h b/www/webkit-gtk/patches/patch-Source_JavaScriptCore_runtime_IntlSegmenter.h
deleted file mode 100644
index 1ddc9eb99dd..00000000000
--- a/www/webkit-gtk/patches/patch-Source_JavaScriptCore_runtime_IntlSegmenter.h
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-Source_JavaScriptCore_runtime_IntlSegmenter.h,v 1.1 2021/04/25 12:00:24 leot Exp $
-
-Fix build for ICU >= 69.
-
-From:
-
- https://trac.webkit.org/changeset/275920/webkit?format=diff&new=275920
-
---- Source/JavaScriptCore/runtime/IntlSegmenter.h.orig	2021-02-26 09:57:05.000000000 +0000
-+++ Source/JavaScriptCore/runtime/IntlSegmenter.h
-@@ -75,4 +75,8 @@ private:
-     Granularity m_granularity { Granularity::Grapheme };
- };
- 
-+// Abstraction to call ubrk_safeClone or ubrk_clone depending on ICU version.
-+// This is implemented in IntlWorkaround.cpp in order to confine draft API visibility.
-+UBreakIterator* cloneUBreakIterator(const UBreakIterator*, UErrorCode*);
-+
- } // namespace JSC
diff --git a/www/webkit-gtk/patches/patch-Source_JavaScriptCore_runtime_IntlSegments.cpp b/www/webkit-gtk/patches/patch-Source_JavaScriptCore_runtime_IntlSegments.cpp
deleted file mode 100644
index 17f87e1ad84..00000000000
--- a/www/webkit-gtk/patches/patch-Source_JavaScriptCore_runtime_IntlSegments.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-Source_JavaScriptCore_runtime_IntlSegments.cpp,v 1.1 2021/04/25 12:00:24 leot Exp $
-
-Fix build for ICU >= 69.
-
-From:
-
- https://trac.webkit.org/changeset/275920/webkit?format=diff&new=275920
-
---- Source/JavaScriptCore/runtime/IntlSegments.cpp.orig	2021-02-26 09:57:05.000000000 +0000
-+++ Source/JavaScriptCore/runtime/IntlSegments.cpp
-@@ -100,7 +100,7 @@ JSObject* IntlSegments::createSegmentIte
-     auto scope = DECLARE_THROW_SCOPE(vm);
- 
-     UErrorCode status = U_ZERO_ERROR;
--    auto segmenter = std::unique_ptr<UBreakIterator, UBreakIteratorDeleter>(ubrk_safeClone(m_segmenter.get(), nullptr, nullptr, &status));
-+    auto segmenter = std::unique_ptr<UBreakIterator, UBreakIteratorDeleter>(cloneUBreakIterator(m_segmenter.get(), &status));
-     if (U_FAILURE(status)) {
-         throwTypeError(globalObject, scope, "failed to initialize SegmentIterator"_s);
-         return nullptr;
diff --git a/www/webkit-gtk/patches/patch-Source_JavaScriptCore_runtime_IntlWorkaround.cpp b/www/webkit-gtk/patches/patch-Source_JavaScriptCore_runtime_IntlWorkaround.cpp
deleted file mode 100644
index 56b52786cd6..00000000000
--- a/www/webkit-gtk/patches/patch-Source_JavaScriptCore_runtime_IntlWorkaround.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-$NetBSD: patch-Source_JavaScriptCore_runtime_IntlWorkaround.cpp,v 1.1 2021/04/25 12:00:24 leot Exp $
-
-Fix build for ICU >= 69.
-
-From:
-
- https://trac.webkit.org/changeset/275920/webkit?format=diff&new=275920
-
---- Source/JavaScriptCore/runtime/IntlWorkaround.cpp.orig	2021-04-25 09:57:43.581734903 +0000
-+++ Source/JavaScriptCore/runtime/IntlWorkaround.cpp
-@@ -0,0 +1,53 @@
-+/*
-+ * Copyright (C) 2021 Sony Interactive Entertainment Inc.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ *    notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ *    notice, this list of conditions and the following disclaimer in the
-+ *    documentation and/or other materials provided with the distribution.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
-+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
-+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-+ * THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+#include "config.h"
-+
-+#include <unicode/uvernum.h>
-+
-+// ICU 69 introduces draft API ubrk_clone and deprecates ubrk_safeClone.
-+#if U_ICU_VERSION_MAJOR_NUM >= 69
-+#define HAVE_ICU_UBRK_CLONE 1
-+#endif
-+
-+#if defined(U_HIDE_DRAFT_API)
-+#undef U_HIDE_DRAFT_API
-+#endif
-+#include <unicode/ubrk.h>
-+
-+namespace JSC {
-+
-+UBreakIterator* cloneUBreakIterator(const UBreakIterator*, UErrorCode*);
-+
-+UBreakIterator* cloneUBreakIterator(const UBreakIterator* iterator, UErrorCode* status)
-+{
-+#if HAVE(ICU_UBRK_CLONE)
-+    return ubrk_clone(iterator, status);
-+#else
-+    return ubrk_safeClone(iterator, nullptr, nullptr, status);
-+#endif
-+}
-+
-+} // namespace JSC
diff --git a/www/webkit-gtk/patches/patch-Source_JavaScriptCore_runtime_MachineContext.h b/www/webkit-gtk/patches/patch-Source_JavaScriptCore_runtime_MachineContext.h
index 6ed0f90019d..31388c8cf2e 100644
--- a/www/webkit-gtk/patches/patch-Source_JavaScriptCore_runtime_MachineContext.h
+++ b/www/webkit-gtk/patches/patch-Source_JavaScriptCore_runtime_MachineContext.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-Source_JavaScriptCore_runtime_MachineContext.h,v 1.1 2018/10/24 18:31:07 leot Exp $
+$NetBSD: patch-Source_JavaScriptCore_runtime_MachineContext.h,v 1.2 2021/05/13 08:20:58 leot Exp $
 
 Add support for NetBSD.
 
---- Source/JavaScriptCore/runtime/MachineContext.h.orig	2018-08-21 16:06:10.000000000 +0000
+--- Source/JavaScriptCore/runtime/MachineContext.h.orig	2021-05-05 05:33:24.000000000 +0000
 +++ Source/JavaScriptCore/runtime/MachineContext.h
-@@ -188,6 +188,22 @@ static inline void*& stackPointerImpl(mc
+@@ -196,6 +196,22 @@ static inline void*& stackPointerImpl(mc
  #error Unknown Architecture
  #endif
  
@@ -24,10 +24,10 @@ Add support for NetBSD.
 +#error Unknown Architecture
 +#endif
 +
- #elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
+ #elif OS(FUCHSIA) || OS(LINUX)
  
  #if CPU(X86)
-@@ -335,6 +351,22 @@ static inline void*& framePointerImpl(mc
+@@ -347,6 +363,22 @@ static inline void*& framePointerImpl(mc
  #error Unknown Architecture
  #endif
  
@@ -47,13 +47,14 @@ Add support for NetBSD.
 +#error Unknown Architecture
 +#endif
 +
- #elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
+ #elif OS(FUCHSIA) || OS(LINUX)
  
  // The following sequence depends on glibc's sys/ucontext.h.
-@@ -482,6 +514,22 @@ static inline void*& instructionPointerI
+@@ -497,6 +529,22 @@ static inline void*& instructionPointerI
+ #else
  #error Unknown Architecture
  #endif
- 
++ 
 +#elif OS(NETBSD)
 +
 +#if CPU(X86)
@@ -69,14 +70,14 @@ Add support for NetBSD.
 +#else
 +#error Unknown Architecture
 +#endif
-+
- #elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
  
- // The following sequence depends on glibc's sys/ucontext.h.
-@@ -639,6 +687,22 @@ inline void*& argumentPointer<1>(mcontex
+ #elif OS(FUCHSIA) || OS(LINUX)
+ 
+@@ -655,6 +703,22 @@ inline void*& argumentPointer<1>(mcontex
+ #else
  #error Unknown Architecture
  #endif
- 
++ 
 +#elif OS(NETBSD)
 +
 +#if CPU(X86)
@@ -92,14 +93,14 @@ Add support for NetBSD.
 +#else
 +#error Unknown Architecture
 +#endif
-+
- #elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
  
- // The following sequence depends on glibc's sys/ucontext.h.
-@@ -756,6 +820,22 @@ inline void*& llintInstructionPointer(mc
+ #elif OS(FUCHSIA) || OS(LINUX)
+ 
+@@ -772,6 +836,22 @@ inline void*& llintInstructionPointer(mc
+ #else
  #error Unknown Architecture
  #endif
- 
++ 
 +#elif OS(NETBSD)
 +
 +#if CPU(X86)
@@ -115,7 +116,6 @@ Add support for NetBSD.
 +#else
 +#error Unknown Architecture
 +#endif
-+
- #elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
  
- // The following sequence depends on glibc's sys/ucontext.h.
+ #elif OS(FUCHSIA) || OS(LINUX)
+ 
diff --git a/www/webkit-gtk/patches/patch-Source_WTF_wtf_PlatformHave.h b/www/webkit-gtk/patches/patch-Source_WTF_wtf_PlatformHave.h
index 0e54ba2e323..156e4d2680e 100644
--- a/www/webkit-gtk/patches/patch-Source_WTF_wtf_PlatformHave.h
+++ b/www/webkit-gtk/patches/patch-Source_WTF_wtf_PlatformHave.h
@@ -1,15 +1,15 @@
-$NetBSD: patch-Source_WTF_wtf_PlatformHave.h,v 1.1 2020/03/10 18:14:04 leot Exp $
+$NetBSD: patch-Source_WTF_wtf_PlatformHave.h,v 1.2 2021/05/13 08:20:58 leot Exp $
 
 Add support for NetBSD.
 
---- Source/WTF/wtf/PlatformHave.h.orig	2020-02-26 10:34:01.000000000 +0000
+--- Source/WTF/wtf/PlatformHave.h.orig	2021-05-05 05:33:24.000000000 +0000
 +++ Source/WTF/wtf/PlatformHave.h
-@@ -222,7 +222,7 @@
+@@ -206,7 +206,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) || OS(NETBSD) || defined(__GLIBC__) || defined(__BIONIC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)))
+-#if OS(DARWIN) || OS(FUCHSIA) || ((OS(FREEBSD) || OS(LINUX)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)))
++#if OS(DARWIN) || OS(FUCHSIA) || ((OS(FREEBSD) || OS(NETBSD) || OS(LINUX)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)))
  #define HAVE_MACHINE_CONTEXT 1
  #endif