<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/a438e2fe2638740f1496894d5503399af59f411d">https://github.com/macports/macports-ports/commit/a438e2fe2638740f1496894d5503399af59f411d</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new a438e2fe263 LLVM Devel: Remove obsolete patchfiles
</span>a438e2fe263 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit a438e2fe2638740f1496894d5503399af59f411d
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Fri Mar 8 18:54:29 2024 +0000
<span style='display:block; white-space:pre;color:#404040;'> LLVM Devel: Remove obsolete patchfiles
</span>---
lang/llvm-devel/Portfile | 22 ++------
...ss-libcxx-work-around-no-reexported_symbo.patch | 43 ---------------
...ss-work-around-no-directory-watcher-befor.patch | 25 ---------
...nd-less-libcxx-disable-Availability-tests.patch | 32 -----------
.../0022-10.5-and-less-default-to-fno-blocks.patch | 24 --------
...ss-compiler-rt-work-around-no-libdispatch.patch | 64 ----------------------
6 files changed, 5 insertions(+), 205 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-devel/Portfile b/lang/llvm-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 91c07c4d301..ecc60e0a71a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -161,19 +161,6 @@ if {${os.platform} eq "darwin" && ${os.major} < 14} {
</span> 0016-10.10-and-less-compiler-rt-find-macosx-sdk.patch
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.platform} eq "darwin" && ${os.major} < 11} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0017-10.6-and-less-libcxx-work-around-no-reexported_symbo.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0020-10.6-and-less-work-around-no-directory-watcher-befor.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0021-10.6-and-less-libcxx-disable-Availability-tests.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.platform} eq "darwin" && ${os.major} < 10} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0022-10.5-and-less-default-to-fno-blocks.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0024-10.5-and-less-compiler-rt-work-around-no-libdispatch.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> if {${os.platform} eq "darwin" && ${os.major} < 16} {
# error: 'TARGET_OS_OSX' is not defined, evaluates to 0 [-Werror,-Wundef-prefix=TARGET_OS_]
patchfiles-append 0100-define-target-os-osx.patch
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -209,10 +196,11 @@ if {${os.platform} eq "darwin" && ${os.major} <= 16} {
</span> patchfiles-append 0041-no-Werror-unguarded-availability-new.patch
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.platform} eq "darwin" && ${os.major} <= 16} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://github.com/llvm/llvm-project/issues/64226
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append 0042-mbstate_t-not-defined.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Maybe no longer needed...
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if {${os.platform} eq "darwin" && ${os.major} <= 16} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# # https://github.com/llvm/llvm-project/issues/64226
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# patchfiles-append 0042-mbstate_t-not-defined.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#}
</span>
post-patch {
reinplace "s|@@PREFIX@@|${prefix}|" \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-devel/files/0017-10.6-and-less-libcxx-work-around-no-reexported_symbo.patch b/lang/llvm-devel/files/0017-10.6-and-less-libcxx-work-around-no-reexported_symbo.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 64696ae573b..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-devel/files/0017-10.6-and-less-libcxx-work-around-no-reexported_symbo.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,43 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From f1342ea845c1126f17dc6a8e73244c645e80d20f Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Mon, 17 May 2021 17:58:11 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 17/24] 10.6 and less: libcxx work around no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reexported_symbols_list before 10.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libcxx/src/CMakeLists.txt | 13 +++++++++++++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 13 insertions(+)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/libcxx/src/CMakeLists.txt b/libcxx/src/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 9965104cb5b2..3d64f728016f 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/libcxx/src/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/libcxx/src/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -222,6 +222,8 @@ if (LIBCXX_ENABLE_SHARED)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(LIBCXX_OSX_REEXPORT_LIBCXXABI_SYMBOLS ON)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# MacPorts: work around no OS support for reexported_symbols_list before 10.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if (CMAKE_OSX_DEPLOYMENT_TARGET GREATER_EQUAL 10.7)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (LIBCXX_OSX_REEXPORT_LIBCXXABI_SYMBOLS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- target_link_libraries(cxx_shared PRIVATE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "-Wl,-unexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/../lib/libc++unexp.exp"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -231,6 +233,17 @@ if (LIBCXX_ENABLE_SHARED)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- target_link_libraries(cxx_shared PRIVATE $<TARGET_NAME_IF_EXISTS:cxxabi-reexports>)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+else()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (LIBCXX_OSX_REEXPORT_LIBCXXABI_SYMBOLS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ target_link_libraries(cxx_shared PRIVATE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "-Wl,-unexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/../lib/libc++unexp.exp"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "-Wl,-reexport_library,/usr/lib/libc++abi.dylib"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "-Wl,-force_symbols_not_weak_list,${CMAKE_CURRENT_SOURCE_DIR}/../lib/notweak.exp"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "-Wl,-force_symbols_weak_list,${CMAKE_CURRENT_SOURCE_DIR}/../lib/weak.exp")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ target_link_libraries(cxx_shared PRIVATE $<TARGET_NAME_IF_EXISTS:cxxabi-reexports>)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Generate a linker script in place of a libc++.so symlink.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (LIBCXX_ENABLE_ABI_LINKER_SCRIPT)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.21.1 (Apple Git-122.3)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-devel/files/0020-10.6-and-less-work-around-no-directory-watcher-befor.patch b/lang/llvm-devel/files/0020-10.6-and-less-work-around-no-directory-watcher-befor.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 23796f9b30a..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-devel/files/0020-10.6-and-less-work-around-no-directory-watcher-befor.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,25 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 8931e4b417d14e257b7afe0ec00cb5ba56d3208f Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Mon, 17 May 2021 17:46:27 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 20/24] 10.6 and less work around no directory watcher before
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 10.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- clang/lib/DirectoryWatcher/CMakeLists.txt | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 1 insertion(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/clang/lib/DirectoryWatcher/CMakeLists.txt b/clang/lib/DirectoryWatcher/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 5a8796982113..d826529026fb 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/clang/lib/DirectoryWatcher/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/clang/lib/DirectoryWatcher/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5,7 +5,7 @@ set(LLVM_LINK_COMPONENTS support)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(DIRECTORY_WATCHER_SOURCES DirectoryScanner.cpp)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(DIRECTORY_WATCHER_LINK_LIBS "")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if(APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if(APPLE AND (CMAKE_OSX_DEPLOYMENT_TARGET GREATER_EQUAL 10.7))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- check_include_files("CoreServices/CoreServices.h" HAVE_CORESERVICES)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(HAVE_CORESERVICES)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- list(APPEND DIRECTORY_WATCHER_SOURCES mac/DirectoryWatcher-mac.cpp)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.21.1 (Apple Git-122.3)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-devel/files/0021-10.6-and-less-libcxx-disable-Availability-tests.patch b/lang/llvm-devel/files/0021-10.6-and-less-libcxx-disable-Availability-tests.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index b527d29d62b..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-devel/files/0021-10.6-and-less-libcxx-disable-Availability-tests.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,32 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 62174518a09fd4c8375abc79e27acf22b344c13b Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Sun, 16 May 2021 13:20:14 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 21/24] 10.6 and less: libcxx disable Availability tests
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-the libc++.dylib installed by MacPorts has different features than
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-the OS default-installed version, so the Availability tests are
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-not valid.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Currently this is done by default on SnowLeopard and earlier.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-note this patch is disappearing. The new way to specify this will be
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-with a Cmake define
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-LIBCXX_ENABLE_VENDOR_AVAILABILITY_ANNOTATIONS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libcxx/include/__config | 3 +++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 3 insertions(+)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/libcxx/include/__config b/libcxx/include/__config
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index a3838c89e8e1..685827372fd5 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/libcxx/include/__config
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/libcxx/include/__config
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -12,6 +12,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <__config_site>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// for MacPorts, our installed libcxx does not require Apple system Availability tests
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define _LIBCPP_DISABLE_AVAILABILITY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifndef _LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # pragma GCC system_header
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-devel/files/0022-10.5-and-less-default-to-fno-blocks.patch b/lang/llvm-devel/files/0022-10.5-and-less-default-to-fno-blocks.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index b7f34605708..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-devel/files/0022-10.5-and-less-default-to-fno-blocks.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,24 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From b1b759b8b3e7eace0c286d512df359f9995eb490 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Sun, 16 May 2021 12:56:51 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 22/24] 10.5 and less: default to -fno-blocks
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- clang/lib/Driver/ToolChains/Darwin.h | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 1 insertion(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/clang/lib/Driver/ToolChains/Darwin.h b/clang/lib/Driver/ToolChains/Darwin.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 25c63fed922a..0b1ecc7054c6 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/clang/lib/Driver/ToolChains/Darwin.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/clang/lib/Driver/ToolChains/Darwin.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -217,7 +217,7 @@ public:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool IsBlocksDefault() const override {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Always allow blocks on Apple; users interested in versioning are
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // expected to use /usr/include/Block.h.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return true;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return false;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool IsIntegratedAssemblerDefault() const override {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Default integrated assembler to on for Apple's MachO targets.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.21.1 (Apple Git-122.3)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-devel/files/0024-10.5-and-less-compiler-rt-work-around-no-libdispatch.patch b/lang/llvm-devel/files/0024-10.5-and-less-compiler-rt-work-around-no-libdispatch.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 7076fe382aa..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-devel/files/0024-10.5-and-less-compiler-rt-work-around-no-libdispatch.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,64 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From ac50612f4448d329ff68bfc35f25161cb42c0510 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Mon, 17 May 2021 17:14:45 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 24/24] 10.5 and less: compiler-rt work around no libdispatch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- before 10.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler-rt/lib/builtins/os_version_check.c | 13 +++++++++++++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 13 insertions(+)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/compiler-rt/lib/builtins/os_version_check.c b/compiler-rt/lib/builtins/os_version_check.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index d7194b99ae54..57a065b7da48 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/compiler-rt/lib/builtins/os_version_check.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/compiler-rt/lib/builtins/os_version_check.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -13,8 +13,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <AvailabilityMacros.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <TargetConditionals.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <dispatch/dispatch.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <dlfcn.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdint.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -23,8 +26,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // These three variables hold the host's OS version.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static int32_t GlobalMajor, GlobalMinor, GlobalSubminor;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static dispatch_once_t DispatchOnceCounter;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static dispatch_once_t CompatibilityDispatchOnceCounter;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // _availability_version_check darwin API support.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- typedef uint32_t dyld_platform_t;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -247,8 +252,14 @@ static void initializeAvailabilityCheck(void *Unused) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // usable when linked with new compiler-rt.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int32_t __isOSVersionAtLeast(int32_t Major, int32_t Minor, int32_t Subminor) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Populate the global version variables, if they haven't already.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dispatch_once_f(&CompatibilityDispatchOnceCounter, NULL,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compatibilityInitializeAvailabilityCheck);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* expensive procedure, only do once. GlobalMajor will not be 0 once run. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (GlobalMajor == 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _initializeAvailabilityCheck(/*LoadPlist=*/true);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (Major < GlobalMajor)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -268,7 +279,9 @@ static inline uint32_t ConstructVersion(uint32_t Major, uint32_t Minor,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int32_t __isPlatformVersionAtLeast(uint32_t Platform, uint32_t Major,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- uint32_t Minor, uint32_t Subminor) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dispatch_once_f(&DispatchOnceCounter, NULL, initializeAvailabilityCheck);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!AvailabilityVersionCheck) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return __isOSVersionAtLeast(Major, Minor, Subminor);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.21.1 (Apple Git-122.3)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>