<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/bb37763eb420f8a692ec16ccb058a04d77f8266b">https://github.com/macports/macports-ports/commit/bb37763eb420f8a692ec16ccb058a04d77f8266b</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit bb37763eb420f8a692ec16ccb058a04d77f8266b
</span>Author: Kirill A. Korinsky <kirill@korins.ky>
AuthorDate: Thu Aug 18 15:36:49 2022 +0200
<span style='display:block; white-space:pre;color:#404040;'> clang-11-bootstrap: fix building compiler-rt
</span>---
lang/clang-11-bootstrap/Portfile | 90 +++---
...MASK_CRASH-and-MACH_EXCEPTION_CODES-if-th.patch | 2 +-
...ly-Don-t-embed-the-deployment-target-in-t.patch | 2 +-
...ssues-pre-Lion-due-to-missing-a-strnlen-d.patch | 2 +-
...ssues-pre-Lion-due-to-missing-a-memmem-de.patch | 58 ++++
...ly-call-pthread_setname_np-on-SnowLeopar.patch} | 4 +-
...tpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch} | 4 +-
...ch => 0007-dsymutil-fix-build-on-Leopard.patch} | 4 +-
...Unix-Path.inc-define-COPYFILE_CLONE-if-n.patch} | 4 +-
...y-Fix-name-of-scan-view-executable-insid.patch} | 4 +-
...=> 0010-default-to-libcxx-on-all-systems.patch} | 4 +-
...ragile-ObjC-runtime-when-targeting-darwi.patch} | 4 +-
...c-header-search-paths-for-older-versions.patch} | 4 +-
...at.h-to-work-on-Snow-Leopard-and-earlier.patch} | 4 +-
...r-rt-add-some-defs-missing-in-older-SDKs.patch} | 4 +-
...s-compiler-rt-work-around-no-libdispatch.patch} | 4 +-
...long-long-math-prototypes-when-using-the.patch} | 4 +-
...omic-using-mutex-lock_guard-for-64b-ops-.patch} | 4 +-
...x-src-chrono.cpp-fix-build-by-older-SDKs.patch} | 4 +-
...0019-compiler-rt-allow-build-before-10.7.patch} | 4 +-
...added-CMAKE_OSX_DEPLOYMENT_TARGET-fallba.patch} | 4 +-
...-runtime-libraries-used-on-10.4-and-10.5.patch} | 4 +-
...nto-sysroot-for-C-headers-if-they-are-fo.patch} | 4 +-
...able-DirectoryWatcher-when-builds-by-GCC.patch} | 4 +-
...> 0024-Use-for-long-options-in-help-text.patch} | 4 +-
...025-compatibility-with-xar-on-macOS-10.5.patch} | 4 +-
...=> 0026-clang-support-macports-libstdcxx.patch} | 4 +-
.../0027-compiler-rt-fix-building-by-GCC.patch | 38 +++
...ompiler-rt-allow-to-define-required-archs.patch | 61 ++++
...er-rt-atomic-which-can-be-compiled-by-GCC.patch | 338 +++++++++++++++++++++
... => 0030-fix-building-on-10.10-by-GCC-10.patch} | 4 +-
...-fix-build-of-shared-libc-.dylib-on-10.7.patch} | 4 +-
...32-disable-Apple-libc-Availability-tests.patch} | 4 +-
...ch => 0033-Leopard-Default-to-fno-blocks.patch} | 4 +-
...=> 0034-Support-emulated-TLS-before-10.7.patch} | 4 +-
35 files changed, 607 insertions(+), 92 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/clang-11-bootstrap/Portfile b/lang/clang-11-bootstrap/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ee1dfecef77..f8685b66329 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/clang-11-bootstrap/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/clang-11-bootstrap/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,7 +8,7 @@ PortGroup muniversal 1.0
</span> name clang-11-bootstrap
version 11.1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> epoch 0
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -71,28 +71,32 @@ patch.pre_args -p1
</span> patchfiles 0001-Define-EXC_MASK_CRASH-and-MACH_EXCEPTION_CODES-if-th.patch \
0002-MacPorts-Only-Don-t-embed-the-deployment-target-in-t.patch \
0003-Fix-build-issues-pre-Lion-due-to-missing-a-strnlen-d.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 0004-Threading-Only-call-pthread_setname_np-on-SnowLeopar.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0005-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0006-dsymutil-fix-build-on-Leopard.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0007-lib-Support-Unix-Path.inc-define-COPYFILE_CLONE-if-n.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0008-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0009-default-to-libcxx-on-all-systems.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0010-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0011-Fixup-libstdc-header-search-paths-for-older-versions.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0012-Fix-float.h-to-work-on-Snow-Leopard-and-earlier.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0013-compiler-rt-add-some-defs-missing-in-older-SDKs.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0014-10.5-and-less-compiler-rt-work-around-no-libdispatch.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0015-Fix-missing-long-long-math-prototypes-when-using-the.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0016-implement-atomic-using-mutex-lock_guard-for-64b-ops-.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0017-libcxx-src-chrono.cpp-fix-build-by-older-SDKs.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0018-compiler-rt-allow-build-before-10.7.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0019-compiler-rt-added-CMAKE_OSX_DEPLOYMENT_TARGET-fallba.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0020-add-back-runtime-libraries-used-on-10.4-and-10.5.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0021-Don-t-look-into-sysroot-for-C-headers-if-they-are-fo.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0022-disable-DirectoryWatcher-when-builds-by-GCC.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0023-Use-for-long-options-in-help-text.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0024-compatibility-with-xar-on-macOS-10.5.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0025-clang-support-macports-libstdcxx.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0004-Fix-build-issues-pre-Lion-due-to-missing-a-memmem-de.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0005-Threading-Only-call-pthread_setname_np-on-SnowLeopar.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0006-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0007-dsymutil-fix-build-on-Leopard.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0008-lib-Support-Unix-Path.inc-define-COPYFILE_CLONE-if-n.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0009-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0010-default-to-libcxx-on-all-systems.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0011-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0012-Fixup-libstdc-header-search-paths-for-older-versions.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0013-Fix-float.h-to-work-on-Snow-Leopard-and-earlier.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0014-compiler-rt-add-some-defs-missing-in-older-SDKs.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0015-10.5-and-less-compiler-rt-work-around-no-libdispatch.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0016-Fix-missing-long-long-math-prototypes-when-using-the.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0017-implement-atomic-using-mutex-lock_guard-for-64b-ops-.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0018-libcxx-src-chrono.cpp-fix-build-by-older-SDKs.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0019-compiler-rt-allow-build-before-10.7.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0020-compiler-rt-added-CMAKE_OSX_DEPLOYMENT_TARGET-fallba.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0021-add-back-runtime-libraries-used-on-10.4-and-10.5.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0022-Don-t-look-into-sysroot-for-C-headers-if-they-are-fo.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0023-disable-DirectoryWatcher-when-builds-by-GCC.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0024-Use-for-long-options-in-help-text.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0025-compatibility-with-xar-on-macOS-10.5.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0026-clang-support-macports-libstdcxx.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0027-compiler-rt-fix-building-by-GCC.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0028-compiler-rt-allow-to-define-required-archs.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0029-compiler-rt-atomic-which-can-be-compiled-by-GCC.patch
</span>
# sterilize MacPorts build environment; we want nothing picked up from MP prefix
compiler.cpath
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -147,21 +151,18 @@ configure.pre_args-delete \
</span>
platform darwin {
if {${os.major} == 14} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Building Xray forces build of sanitizer_common, even if
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # COMPILER_RT_BUILD_SANITIZERS=OFF, and this fails on 10.10
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # TODO: See why sanitizer_common fails on 10.10
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCOMPILER_RT_BUILD_XRAY=OFF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> patchfiles-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 0026-fix-building-on-10.10-by-GCC-10.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0030-dsymutil-fix-building-on-10.10-by-GCC-10.patch
</span> }
if {${os.major} <= 14} {
# We unfortunately don't have an option to just turn off tsan
# https://llvm.org/bugs/show_bug.cgi?id=27715
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Building Xray forces build of sanitizer_common, even if
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # COMPILER_RT_BUILD_SANITIZERS=OFF, and this fails up to 10.10
</span> configure.args-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCOMPILER_RT_BUILD_SANITIZERS=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCOMPILER_RT_BUILD_SANITIZERS=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCOMPILER_RT_BUILD_XRAY=OFF
</span> }
if {${os.major} <= 11} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -180,28 +181,35 @@ platform darwin {
</span>
# reexported_symbols_list is available on 10.7+ only, used by libcxx
patchfiles-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 0027-fix-build-of-shared-libc-.dylib-on-10.7.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0031-fix-build-of-shared-libc-.dylib-on-10.7.patch
</span>
# the libcxx installed by MacPorts on darwin 10 and less does not correspond to Apple's builtin libcxx
patchfiles-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 0028-disable-Apple-libc-Availability-tests.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0032-disable-Apple-libc-Availability-tests.patch
</span> }
if {${os.major} <= 9} {
# TO DO: the blocks functionality can be replaced by libblocksruntime
# this might be integrated into clang on < 10.6
patchfiles-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 0029-Leopard-Default-to-fno-blocks.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0033-Leopard-Default-to-fno-blocks.patch
</span> }
}
configure.args-append \
-DCLANG_ENABLE_ARCMT=OFF \
-DCLANG_ENABLE_STATIC_ANALYZER=OFF \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCOMPILER_RT_ENABLE_IOS=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCOMPILER_RT_ENABLE_TVOS=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCOMPILER_RT_ENABLE_WATCHOS=OFF \
</span> -DDARWIN_PREFER_PUBLIC_SDK=ON \
-DLLVM_BINDINGS_LIST=none \
-DLLVM_BUILD_UTILS=OFF \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DLLVM_ENABLE_LIBEDIT=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DLLVM_ENABLE_LIBXML2=OFF \
</span> -DLLVM_ENABLE_PROJECTS="clang\;compiler-rt" \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DLLVM_ENABLE_TERMINFO=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DLLVM_ENABLE_ZLIB=OFF \
</span> -DLLVM_INCLUDE_BENCHMARKS=OFF \
-DLLVM_INCLUDE_DOCS=OFF \
-DLLVM_INCLUDE_EXAMPLES=OFF \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -240,7 +248,7 @@ if {${os.major} < 11} {
</span> variant emulated_tls description { enable c11/c++11 thread_local_storage support on older systems using emulated-tls } {
# use emulated-tls to support thread_local on systems prior to 10.7
patchfiles-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 0030-Support-emulated-TLS-before-10.7.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0034-Support-emulated-TLS-before-10.7.patch
</span> }
default_variants-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -284,6 +292,12 @@ if {${os.platform} eq "darwin" && ${os.major} < 16} {
</span> # prevent it from linking against gcc's libstdc++.6.dylib and libgcc_s.1.1.dylib
configure.ldflags-append \
-static-libstdc++ -static-libgcc
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Profiling can't be build by GCC with unknown reason.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Some part of profiling is used by cc_kext also.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCOMPILER_RT_BUILD_PROFILE=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DDARWIN_osx_SKIP_CC_KEXT=ON
</span> }
post-patch {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -335,7 +349,13 @@ if {${universal_possible} && [variant_isset universal]} {
</span> foreach arch ${universal_archs_supported} {
lappend merger_configure_env(${arch}) BUILD_ARCH=${arch}
lappend merger_build_env(${arch}) BUILD_ARCH=${arch}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_configure_args(${arch}) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCOMPILER_RT_TOOLCHAIN_ARCHES=${arch} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DDARWIN_osx_BUILTIN_ALL_POSSIBLE_ARCHS=${arch}
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DCOMPILER_RT_TOOLCHAIN_ARCHES=${build_arch} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DDARWIN_osx_BUILTIN_ALL_POSSIBLE_ARCHS=${build_arch}
</span> }
merger_arch_flag yes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/clang-11-bootstrap/files/0001-Define-EXC_MASK_CRASH-and-MACH_EXCEPTION_CODES-if-th.patch b/lang/clang-11-bootstrap/files/0001-Define-EXC_MASK_CRASH-and-MACH_EXCEPTION_CODES-if-th.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 04851224473..359b61e7e21 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/clang-11-bootstrap/files/0001-Define-EXC_MASK_CRASH-and-MACH_EXCEPTION_CODES-if-th.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/clang-11-bootstrap/files/0001-Define-EXC_MASK_CRASH-and-MACH_EXCEPTION_CODES-if-th.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span> From 3998ef54ce5a2d63be2a5763170a98d464d59762 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sun, 18 Jan 2015 11:18:13 -0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 01/30] Define EXC_MASK_CRASH and MACH_EXCEPTION_CODES if
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 01/34] Define EXC_MASK_CRASH and MACH_EXCEPTION_CODES if
</span> they're not defined in the SDK
The 10.4 SDK does not define these macros
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/clang-11-bootstrap/files/0002-MacPorts-Only-Don-t-embed-the-deployment-target-in-t.patch b/lang/clang-11-bootstrap/files/0002-MacPorts-Only-Don-t-embed-the-deployment-target-in-t.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 4cf004c090b..af7a93a040b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/clang-11-bootstrap/files/0002-MacPorts-Only-Don-t-embed-the-deployment-target-in-t.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/clang-11-bootstrap/files/0002-MacPorts-Only-Don-t-embed-the-deployment-target-in-t.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span> From 9cf659947ce441ab497be344ede8025f0f347bd2 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sat, 17 Jan 2015 16:41:30 -0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 02/30] MacPorts Only: Don't embed the deployment target in the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 02/34] MacPorts Only: Don't embed the deployment target in the
</span> asm when using -fno-integrated-as
http://llvm.org/bugs/show_bug.cgi?id=21636
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/clang-11-bootstrap/files/0003-Fix-build-issues-pre-Lion-due-to-missing-a-strnlen-d.patch b/lang/clang-11-bootstrap/files/0003-Fix-build-issues-pre-Lion-due-to-missing-a-strnlen-d.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 87bd910b7d4..3c42e7c6304 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/clang-11-bootstrap/files/0003-Fix-build-issues-pre-Lion-due-to-missing-a-strnlen-d.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/clang-11-bootstrap/files/0003-Fix-build-issues-pre-Lion-due-to-missing-a-strnlen-d.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span> From d55a5be574088cf71a7707797e70dbf8b7ec6180 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Tue, 20 Dec 2016 12:41:21 -0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 03/30] Fix build issues pre-Lion due to missing a strnlen
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 03/34] Fix build issues pre-Lion due to missing a strnlen
</span> definition
https://trac.macports.org/ticket/51520
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/clang-11-bootstrap/files/0004-Fix-build-issues-pre-Lion-due-to-missing-a-memmem-de.patch b/lang/clang-11-bootstrap/files/0004-Fix-build-issues-pre-Lion-due-to-missing-a-memmem-de.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..099523c2288
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/clang-11-bootstrap/files/0004-Fix-build-issues-pre-Lion-due-to-missing-a-memmem-de.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,58 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From a509cabf15ac7d231c902aa850499e144dc57eff Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: "Kirill A. Korinsky" <kirill@korins.ky>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Wed, 17 Aug 2022 16:07:55 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 04/34] Fix build issues pre-Lion due to missing a memmem
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ definition
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler-rt/lib/fuzzer/FuzzerUtilPosix.cpp | 34 ++++++++++++++++++++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 34 insertions(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/compiler-rt/lib/fuzzer/FuzzerUtilPosix.cpp b/compiler-rt/lib/fuzzer/FuzzerUtilPosix.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index fc57b724db10..f538696facff 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/compiler-rt/lib/fuzzer/FuzzerUtilPosix.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/compiler-rt/lib/fuzzer/FuzzerUtilPosix.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -27,6 +27,40 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <thread>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <unistd.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <Availability.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if __MAC_OS_X_VERSION_MIN_REQUIRED < 1070
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++memmem(const void *l, size_t l_len, const void *s, size_t s_len)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ register char *cur, *last;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const char *cl = (const char *)l;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const char *cs = (const char *)s;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* we need something to compare */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (l_len == 0 || s_len == 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* "s" must be smaller or equal to "l" */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (l_len < s_len)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* special case where s_len == 1 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (s_len == 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return memchr(l, (int)*cs, l_len);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* the last position where its possible to find "s" in "l" */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ last = (char *)cl + l_len - s_len;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ for (cur = (char *)cl; cur <= last; cur++)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (cur[0] == cs[0] && memcmp(cur, cs, s_len) == 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return cur;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace fuzzer {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void AlarmHandler(int, siginfo_t *, void *) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.37.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/clang-11-bootstrap/files/0004-Threading-Only-call-pthread_setname_np-on-SnowLeopar.patch b/lang/clang-11-bootstrap/files/0005-Threading-Only-call-pthread_setname_np-on-SnowLeopar.patch
</span>similarity index 86%
rename from lang/clang-11-bootstrap/files/0004-Threading-Only-call-pthread_setname_np-on-SnowLeopar.patch
rename to lang/clang-11-bootstrap/files/0005-Threading-Only-call-pthread_setname_np-on-SnowLeopar.patch
<span style='display:block; white-space:pre;color:#808080;'>index 45343830463..392893104a8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/clang-11-bootstrap/files/0004-Threading-Only-call-pthread_setname_np-on-SnowLeopar.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/clang-11-bootstrap/files/0005-Threading-Only-call-pthread_setname_np-on-SnowLeopar.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 8d5fd98c616955d00f1ea6d93c4baa82da7642f0 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From cf34a554b5fb5d3909d82bcf8d540d7c0cd434f9 Mon Sep 17 00:00:00 2001
</span> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Wed, 27 Dec 2017 23:05:43 -0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 04/30] Threading: Only call pthread_setname_np() on
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 05/34] Threading: Only call pthread_setname_np() on
</span> SnowLeopard+
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/clang-11-bootstrap/files/0005-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch b/lang/clang-11-bootstrap/files/0006-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch
</span>similarity index 90%
rename from lang/clang-11-bootstrap/files/0005-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch
rename to lang/clang-11-bootstrap/files/0006-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch
<span style='display:block; white-space:pre;color:#808080;'>index 4109b90a36c..1a24babdd34 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/clang-11-bootstrap/files/0005-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/clang-11-bootstrap/files/0006-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 39b434df2159cc0f32a6e4ea8b8d5d60224c3355 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From f789d7d5a40bcd20d344a9a805afdaa1a82a7454 Mon Sep 17 00:00:00 2001
</span> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Thu, 4 Jul 2019 13:23:19 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 05/30] Only call setpriority(PRIO_DARWIN_THREAD, 0,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 06/34] Only call setpriority(PRIO_DARWIN_THREAD, 0,
</span> PRIO_DARWIN_BG) if it is available
Tiger and earlier versions of darwin do not support this.
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/clang-11-bootstrap/files/0006-dsymutil-fix-build-on-Leopard.patch b/lang/clang-11-bootstrap/files/0007-dsymutil-fix-build-on-Leopard.patch
</span>similarity index 89%
rename from lang/clang-11-bootstrap/files/0006-dsymutil-fix-build-on-Leopard.patch
rename to lang/clang-11-bootstrap/files/0007-dsymutil-fix-build-on-Leopard.patch
<span style='display:block; white-space:pre;color:#808080;'>index 8d4f597d641..7c8c525bdc7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/clang-11-bootstrap/files/0006-dsymutil-fix-build-on-Leopard.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/clang-11-bootstrap/files/0007-dsymutil-fix-build-on-Leopard.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 5c8e4506fec66f1534026763fe13ad0cba2b8cce Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 44255c29f72697e7b5fb2c0d4df8305f4d9544b4 Mon Sep 17 00:00:00 2001
</span> From: "Kirill A. Korinsky" <kirill@korins.ky>
Date: Wed, 17 Aug 2022 13:45:22 +0200
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 06/30] dsymutil: fix build on Leopard
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 07/34] dsymutil: fix build on Leopard
</span>
- alias `CFPropertyListCreateWithStream` to `CFPropertyListCreateFromStream`
- add a workable definition for `uuid_string_t`
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/clang-11-bootstrap/files/0007-lib-Support-Unix-Path.inc-define-COPYFILE_CLONE-if-n.patch b/lang/clang-11-bootstrap/files/0008-lib-Support-Unix-Path.inc-define-COPYFILE_CLONE-if-n.patch
</span>similarity index 83%
rename from lang/clang-11-bootstrap/files/0007-lib-Support-Unix-Path.inc-define-COPYFILE_CLONE-if-n.patch
rename to lang/clang-11-bootstrap/files/0008-lib-Support-Unix-Path.inc-define-COPYFILE_CLONE-if-n.patch
<span style='display:block; white-space:pre;color:#808080;'>index 5e6d8e79b69..dc914ee7933 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/clang-11-bootstrap/files/0007-lib-Support-Unix-Path.inc-define-COPYFILE_CLONE-if-n.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/clang-11-bootstrap/files/0008-lib-Support-Unix-Path.inc-define-COPYFILE_CLONE-if-n.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 2cfd4958c90fee68b2e0c1d2b19dbcde0589d165 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From b89fadcc31b6524f7b11af24e9feef5b9844c04c Mon Sep 17 00:00:00 2001
</span> From: "Kirill A. Korinsky" <kirill@korins.ky>
Date: Wed, 17 Aug 2022 13:49:38 +0200
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 07/30] lib/Support/Unix/Path.inc: define COPYFILE_CLONE if
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 08/34] lib/Support/Unix/Path.inc: define COPYFILE_CLONE if
</span> needed
---
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/clang-11-bootstrap/files/0008-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch b/lang/clang-11-bootstrap/files/0009-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch
</span>similarity index 90%
rename from lang/clang-11-bootstrap/files/0008-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch
rename to lang/clang-11-bootstrap/files/0009-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch
<span style='display:block; white-space:pre;color:#808080;'>index 5e0940e3a4e..4d61aa31f53 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/clang-11-bootstrap/files/0008-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/clang-11-bootstrap/files/0009-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From f72dcedd7fdd2fb50368770770235387ca661f5e Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 1bb478c260682b6597f7b7f84ce529ef2e7be4e3 Mon Sep 17 00:00:00 2001
</span> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sat, 17 Jan 2015 17:55:27 -0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 08/30] MacPorts Only: Fix name of scan-view executable inside
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 09/34] MacPorts Only: Fix name of scan-view executable inside
</span> scan-build
http://trac.macports.org/ticket/35006
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/clang-11-bootstrap/files/0009-default-to-libcxx-on-all-systems.patch b/lang/clang-11-bootstrap/files/0010-default-to-libcxx-on-all-systems.patch
</span>similarity index 89%
rename from lang/clang-11-bootstrap/files/0009-default-to-libcxx-on-all-systems.patch
rename to lang/clang-11-bootstrap/files/0010-default-to-libcxx-on-all-systems.patch
<span style='display:block; white-space:pre;color:#808080;'>index a1d5b1b131f..bba547219b3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/clang-11-bootstrap/files/0009-default-to-libcxx-on-all-systems.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/clang-11-bootstrap/files/0010-default-to-libcxx-on-all-systems.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From a88f5d4392319dca350ac8e0a064bb638f5372e4 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 7d6818a3bb0c1f61bc8a0acab944ddb4549a9bfd Mon Sep 17 00:00:00 2001
</span> From: "Kirill A. Korinsky" <kirill@korins.ky>
Date: Thu, 18 Aug 2022 02:07:11 +0200
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 09/30] default to libcxx on all systems
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 10/34] default to libcxx on all systems
</span>
---
clang/lib/Driver/ToolChains/Darwin.cpp | 4 ++--
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/clang-11-bootstrap/files/0010-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch b/lang/clang-11-bootstrap/files/0011-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch
</span>similarity index 89%
rename from lang/clang-11-bootstrap/files/0010-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch
rename to lang/clang-11-bootstrap/files/0011-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch
<span style='display:block; white-space:pre;color:#808080;'>index 07e4bc4c06a..993d06d6b5c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/clang-11-bootstrap/files/0010-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/clang-11-bootstrap/files/0011-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 01ab4522b251b04573470de692f5fb423aa4ea03 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From aaf6221d782afa8de9235678f10f95e8552c64ff Mon Sep 17 00:00:00 2001
</span> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Tue, 20 Jan 2015 00:09:16 -0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 10/30] Default to fragile ObjC runtime when targeting
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 11/34] Default to fragile ObjC runtime when targeting
</span> darwin/ppc
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/clang-11-bootstrap/files/0011-Fixup-libstdc-header-search-paths-for-older-versions.patch b/lang/clang-11-bootstrap/files/0012-Fixup-libstdc-header-search-paths-for-older-versions.patch
</span>similarity index 93%
rename from lang/clang-11-bootstrap/files/0011-Fixup-libstdc-header-search-paths-for-older-versions.patch
rename to lang/clang-11-bootstrap/files/0012-Fixup-libstdc-header-search-paths-for-older-versions.patch
<span style='display:block; white-space:pre;color:#808080;'>index 8c2b465a858..04fd0a620b0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/clang-11-bootstrap/files/0011-Fixup-libstdc-header-search-paths-for-older-versions.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/clang-11-bootstrap/files/0012-Fixup-libstdc-header-search-paths-for-older-versions.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 3a124cfa094064ee2b4bb282b904bae646db0514 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From a48d51f49e3186bebb143921580c1277ffe54114 Mon Sep 17 00:00:00 2001
</span> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Mon, 31 Oct 2016 15:06:36 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 11/30] Fixup libstdc++ header search paths for older versions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 12/34] Fixup libstdc++ header search paths for older versions
</span> of Mac OS X
The subpaths were removed in Lion. Leopard and Snow Leopard had darwin8
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/clang-11-bootstrap/files/0012-Fix-float.h-to-work-on-Snow-Leopard-and-earlier.patch b/lang/clang-11-bootstrap/files/0013-Fix-float.h-to-work-on-Snow-Leopard-and-earlier.patch
</span>similarity index 90%
rename from lang/clang-11-bootstrap/files/0012-Fix-float.h-to-work-on-Snow-Leopard-and-earlier.patch
rename to lang/clang-11-bootstrap/files/0013-Fix-float.h-to-work-on-Snow-Leopard-and-earlier.patch
<span style='display:block; white-space:pre;color:#808080;'>index 2679c592c20..f9f54f7b292 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/clang-11-bootstrap/files/0012-Fix-float.h-to-work-on-Snow-Leopard-and-earlier.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/clang-11-bootstrap/files/0013-Fix-float.h-to-work-on-Snow-Leopard-and-earlier.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 78367ce6e33d5e9422cebc3ecd9d3829c0ccaac1 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From c1a2bd1699317f16c833616863ccb2888a36084e Mon Sep 17 00:00:00 2001
</span> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Thu, 20 Jul 2017 17:15:35 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 12/30] Fix float.h to work on Snow Leopard and earlier
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 13/34] Fix float.h to work on Snow Leopard and earlier
</span>
https://bugs.llvm.org/show_bug.cgi?id=31504
https://trac.macports.org/ticket/54135
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/clang-11-bootstrap/files/0013-compiler-rt-add-some-defs-missing-in-older-SDKs.patch b/lang/clang-11-bootstrap/files/0014-compiler-rt-add-some-defs-missing-in-older-SDKs.patch
</span>similarity index 92%
rename from lang/clang-11-bootstrap/files/0013-compiler-rt-add-some-defs-missing-in-older-SDKs.patch
rename to lang/clang-11-bootstrap/files/0014-compiler-rt-add-some-defs-missing-in-older-SDKs.patch
<span style='display:block; white-space:pre;color:#808080;'>index 988b61f9e35..20d0e6391cc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/clang-11-bootstrap/files/0013-compiler-rt-add-some-defs-missing-in-older-SDKs.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/clang-11-bootstrap/files/0014-compiler-rt-add-some-defs-missing-in-older-SDKs.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 725ff9353c26cd0c0867be190af24a2cec7e542b Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 6e5a41acb0ffc95f3a5756e4dfe25bc189a22389 Mon Sep 17 00:00:00 2001
</span> From: "Kirill A. Korinsky" <kirill@korins.ky>
Date: Wed, 17 Aug 2022 13:57:02 +0200
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 13/30] compiler-rt: add some defs missing in older SDKs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 14/34] compiler-rt: add some defs missing in older SDKs
</span>
---
compiler-rt/lib/fuzzer/FuzzerUtilDarwin.cpp | 8 ++++++++
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/clang-11-bootstrap/files/0014-10.5-and-less-compiler-rt-work-around-no-libdispatch.patch b/lang/clang-11-bootstrap/files/0015-10.5-and-less-compiler-rt-work-around-no-libdispatch.patch
</span>similarity index 93%
rename from lang/clang-11-bootstrap/files/0014-10.5-and-less-compiler-rt-work-around-no-libdispatch.patch
rename to lang/clang-11-bootstrap/files/0015-10.5-and-less-compiler-rt-work-around-no-libdispatch.patch
<span style='display:block; white-space:pre;color:#808080;'>index a927ab2dd3c..bed15369efe 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/clang-11-bootstrap/files/0014-10.5-and-less-compiler-rt-work-around-no-libdispatch.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/clang-11-bootstrap/files/0015-10.5-and-less-compiler-rt-work-around-no-libdispatch.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From a5053ae4d346bb9312bc2906d84edcef21ee1c02 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From b4c19d923fa1fcff5c08d5bdd211997a1e4ba9a7 Mon Sep 17 00:00:00 2001
</span> From: "Kirill A. Korinsky" <kirill@korins.ky>
Date: Wed, 17 Aug 2022 14:03:50 +0200
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 14/30] 10.5 and less: compiler-rt work around no libdispatch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 15/34] 10.5 and less: compiler-rt work around no libdispatch
</span> before 10.6
---
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/clang-11-bootstrap/files/0015-Fix-missing-long-long-math-prototypes-when-using-the.patch b/lang/clang-11-bootstrap/files/0016-Fix-missing-long-long-math-prototypes-when-using-the.patch
</span>similarity index 91%
rename from lang/clang-11-bootstrap/files/0015-Fix-missing-long-long-math-prototypes-when-using-the.patch
rename to lang/clang-11-bootstrap/files/0016-Fix-missing-long-long-math-prototypes-when-using-the.patch
<span style='display:block; white-space:pre;color:#808080;'>index 4d89a5c152d..d9df73ddba5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/clang-11-bootstrap/files/0015-Fix-missing-long-long-math-prototypes-when-using-the.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/clang-11-bootstrap/files/0016-Fix-missing-long-long-math-prototypes-when-using-the.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From baab9ce787d30d3481311946d5db4281263b2cd5 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From fd4de49747f1528eb72b2b73319bcab5d4298c9a Mon Sep 17 00:00:00 2001
</span> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sat, 17 Jan 2015 16:26:20 -0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 15/30] Fix missing long long math prototypes when using the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 16/34] Fix missing long long math prototypes when using the
</span> Snow Leopard SDK
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/clang-11-bootstrap/files/0016-implement-atomic-using-mutex-lock_guard-for-64b-ops-.patch b/lang/clang-11-bootstrap/files/0017-implement-atomic-using-mutex-lock_guard-for-64b-ops-.patch
</span>similarity index 99%
rename from lang/clang-11-bootstrap/files/0016-implement-atomic-using-mutex-lock_guard-for-64b-ops-.patch
rename to lang/clang-11-bootstrap/files/0017-implement-atomic-using-mutex-lock_guard-for-64b-ops-.patch
<span style='display:block; white-space:pre;color:#808080;'>index 2c94f125461..4713eb5d10d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/clang-11-bootstrap/files/0016-implement-atomic-using-mutex-lock_guard-for-64b-ops-.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/clang-11-bootstrap/files/0017-implement-atomic-using-mutex-lock_guard-for-64b-ops-.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 521a9ef073b9c3aab49e4811a7aac7cb5684302a Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 884ca9bc09df5859489abba1741fdb7d16cd4c7a Mon Sep 17 00:00:00 2001
</span> From: David Fang <fang@csl.cornell.edu>
Date: Wed, 15 Jan 2014 21:27:34 -0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 16/30] implement atomic<> using mutex/lock_guard for 64b ops
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 17/34] implement atomic<> using mutex/lock_guard for 64b ops
</span> on 32b PPC not pretty, not fast, but passes atomic tests
---
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/clang-11-bootstrap/files/0017-libcxx-src-chrono.cpp-fix-build-by-older-SDKs.patch b/lang/clang-11-bootstrap/files/0018-libcxx-src-chrono.cpp-fix-build-by-older-SDKs.patch
</span>similarity index 95%
rename from lang/clang-11-bootstrap/files/0017-libcxx-src-chrono.cpp-fix-build-by-older-SDKs.patch
rename to lang/clang-11-bootstrap/files/0018-libcxx-src-chrono.cpp-fix-build-by-older-SDKs.patch
<span style='display:block; white-space:pre;color:#808080;'>index ac61e83f20a..ff52be8a652 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/clang-11-bootstrap/files/0017-libcxx-src-chrono.cpp-fix-build-by-older-SDKs.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/clang-11-bootstrap/files/0018-libcxx-src-chrono.cpp-fix-build-by-older-SDKs.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From aafa189ff29952d707a16887bdc239fea44b34fa Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 242d08207030270d0f3a6bf96c0d6835173bd2b1 Mon Sep 17 00:00:00 2001
</span> From: "Kirill A. Korinsky" <kirill@korins.ky>
Date: Wed, 17 Aug 2022 14:09:22 +0200
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 17/30] libcxx/src/chrono.cpp: fix build by older SDKs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 18/34] libcxx/src/chrono.cpp: fix build by older SDKs
</span>
See: https://github.com/llvm/llvm-project/commit/babd3aefc9193b44ad0620a2cfd63ebb6ad7e952
---
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/clang-11-bootstrap/files/0018-compiler-rt-allow-build-before-10.7.patch b/lang/clang-11-bootstrap/files/0019-compiler-rt-allow-build-before-10.7.patch
</span>similarity index 88%
rename from lang/clang-11-bootstrap/files/0018-compiler-rt-allow-build-before-10.7.patch
rename to lang/clang-11-bootstrap/files/0019-compiler-rt-allow-build-before-10.7.patch
<span style='display:block; white-space:pre;color:#808080;'>index a8259bfe8dc..f40f24f7bbf 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/clang-11-bootstrap/files/0018-compiler-rt-allow-build-before-10.7.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/clang-11-bootstrap/files/0019-compiler-rt-allow-build-before-10.7.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 1d555865624ccee4d5169701d9219ebe5f2b9975 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From afe4131b6374bd5ff72a831faa58340945b6aa0a Mon Sep 17 00:00:00 2001
</span> From: "Kirill A. Korinsky" <kirill@korins.ky>
Date: Wed, 17 Aug 2022 14:11:06 +0200
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 18/30] compiler-rt: allow build before 10.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 19/34] compiler-rt: allow build before 10.7
</span>
---
compiler-rt/cmake/config-ix.cmake | 3 ---
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/clang-11-bootstrap/files/0019-compiler-rt-added-CMAKE_OSX_DEPLOYMENT_TARGET-fallba.patch b/lang/clang-11-bootstrap/files/0020-compiler-rt-added-CMAKE_OSX_DEPLOYMENT_TARGET-fallba.patch
</span>similarity index 93%
rename from lang/clang-11-bootstrap/files/0019-compiler-rt-added-CMAKE_OSX_DEPLOYMENT_TARGET-fallba.patch
rename to lang/clang-11-bootstrap/files/0020-compiler-rt-added-CMAKE_OSX_DEPLOYMENT_TARGET-fallba.patch
<span style='display:block; white-space:pre;color:#808080;'>index e6af6ca3d3a..3d586792073 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/clang-11-bootstrap/files/0019-compiler-rt-added-CMAKE_OSX_DEPLOYMENT_TARGET-fallba.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/clang-11-bootstrap/files/0020-compiler-rt-added-CMAKE_OSX_DEPLOYMENT_TARGET-fallba.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 58fa36a5d60af1c8276b2fe658eb8c7d267e089a Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 0691517ced61dc1789b8efbee301f46756f7cecb Mon Sep 17 00:00:00 2001
</span> From: "Kirill A. Korinsky" <kirill@korins.ky>
Date: Wed, 17 Aug 2022 14:13:11 +0200
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 19/30] compiler-rt: added CMAKE_OSX_DEPLOYMENT_TARGET fallback
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 20/34] compiler-rt: added CMAKE_OSX_DEPLOYMENT_TARGET fallback
</span>
---
.../cmake/Modules/CompilerRTDarwinUtils.cmake | 14 +++++---------
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/clang-11-bootstrap/files/0020-add-back-runtime-libraries-used-on-10.4-and-10.5.patch b/lang/clang-11-bootstrap/files/0021-add-back-runtime-libraries-used-on-10.4-and-10.5.patch
</span>similarity index 92%
rename from lang/clang-11-bootstrap/files/0020-add-back-runtime-libraries-used-on-10.4-and-10.5.patch
rename to lang/clang-11-bootstrap/files/0021-add-back-runtime-libraries-used-on-10.4-and-10.5.patch
<span style='display:block; white-space:pre;color:#808080;'>index b0f44bb5dba..6efe7accbf2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/clang-11-bootstrap/files/0020-add-back-runtime-libraries-used-on-10.4-and-10.5.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/clang-11-bootstrap/files/0021-add-back-runtime-libraries-used-on-10.4-and-10.5.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 03726997b4287529e891be4eaebcc5f2e38a98be Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From ba3d665b91d33f808ffd39e9ee4675b72e564526 Mon Sep 17 00:00:00 2001
</span> From: "Kirill A. Korinsky" <kirill@korins.ky>
Date: Wed, 17 Aug 2022 14:14:50 +0200
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 20/30] add back runtime libraries used on 10.4 and 10.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 21/34] add back runtime libraries used on 10.4 and 10.5
</span>
removed in https://github.com/llvm/llvm-project/commit/3434ade2b7ca351b61522f7da4b55070d811b83f
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/clang-11-bootstrap/files/0021-Don-t-look-into-sysroot-for-C-headers-if-they-are-fo.patch b/lang/clang-11-bootstrap/files/0022-Don-t-look-into-sysroot-for-C-headers-if-they-are-fo.patch
</span>similarity index 99%
rename from lang/clang-11-bootstrap/files/0021-Don-t-look-into-sysroot-for-C-headers-if-they-are-fo.patch
rename to lang/clang-11-bootstrap/files/0022-Don-t-look-into-sysroot-for-C-headers-if-they-are-fo.patch
<span style='display:block; white-space:pre;color:#808080;'>index ec3b39295b5..ee5cec0e513 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/clang-11-bootstrap/files/0021-Don-t-look-into-sysroot-for-C-headers-if-they-are-fo.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/clang-11-bootstrap/files/0022-Don-t-look-into-sysroot-for-C-headers-if-they-are-fo.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 269a5610d1b39605b18fae4a2509cea7136b61da Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From b4e43cb5b9fc3ea342a37a27e3af78393575cc72 Mon Sep 17 00:00:00 2001
</span> From: "Kirill A. Korinsky" <kirill@korins.ky>
Date: Wed, 17 Aug 2022 14:17:11 +0200
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 21/30] Don't look into <sysroot> for C++ headers if they are
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 22/34] Don't look into <sysroot> for C++ headers if they are
</span> found alongside the toolchain
Currently, Clang looks for libc++ headers alongside the installation
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/clang-11-bootstrap/files/0022-disable-DirectoryWatcher-when-builds-by-GCC.patch b/lang/clang-11-bootstrap/files/0023-disable-DirectoryWatcher-when-builds-by-GCC.patch
</span>similarity index 86%
rename from lang/clang-11-bootstrap/files/0022-disable-DirectoryWatcher-when-builds-by-GCC.patch
rename to lang/clang-11-bootstrap/files/0023-disable-DirectoryWatcher-when-builds-by-GCC.patch
<span style='display:block; white-space:pre;color:#808080;'>index 551578ca0f7..d2ccdbc8d11 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/clang-11-bootstrap/files/0022-disable-DirectoryWatcher-when-builds-by-GCC.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/clang-11-bootstrap/files/0023-disable-DirectoryWatcher-when-builds-by-GCC.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 80306638b5236037345963ae1cff7bb0508ea672 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 74dda39256362d98a74fefeddfea344b9d34b681 Mon Sep 17 00:00:00 2001
</span> From: "Kirill A. Korinsky" <kirill@korins.ky>
Date: Wed, 17 Aug 2022 15:11:27 +0200
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 22/30] disable DirectoryWatcher when builds by GCC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 23/34] disable DirectoryWatcher when builds by GCC
</span>
---
clang/lib/DirectoryWatcher/CMakeLists.txt | 2 +-
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/clang-11-bootstrap/files/0023-Use-for-long-options-in-help-text.patch b/lang/clang-11-bootstrap/files/0024-Use-for-long-options-in-help-text.patch
</span>similarity index 98%
rename from lang/clang-11-bootstrap/files/0023-Use-for-long-options-in-help-text.patch
rename to lang/clang-11-bootstrap/files/0024-Use-for-long-options-in-help-text.patch
<span style='display:block; white-space:pre;color:#808080;'>index be442e2696e..cf4f9e6339e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/clang-11-bootstrap/files/0023-Use-for-long-options-in-help-text.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/clang-11-bootstrap/files/0024-Use-for-long-options-in-help-text.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From dfda3d4ec4ce2e857f256b008b48de6570f2de29 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 453bcd6038730cf1da7d9b988574513cadb99cf1 Mon Sep 17 00:00:00 2001
</span> From: "Kirill A. Korinsky" <kirill@korins.ky>
Date: Wed, 17 Aug 2022 15:14:31 +0200
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 23/30] Use "--" for long options in --help text
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 24/34] Use "--" for long options in --help text
</span>
See: https://reviews.llvm.org/D92310
---
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/clang-11-bootstrap/files/0024-compatibility-with-xar-on-macOS-10.5.patch b/lang/clang-11-bootstrap/files/0025-compatibility-with-xar-on-macOS-10.5.patch
</span>similarity index 92%
rename from lang/clang-11-bootstrap/files/0024-compatibility-with-xar-on-macOS-10.5.patch
rename to lang/clang-11-bootstrap/files/0025-compatibility-with-xar-on-macOS-10.5.patch
<span style='display:block; white-space:pre;color:#808080;'>index 593b19ee93d..5888dc44f90 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/clang-11-bootstrap/files/0024-compatibility-with-xar-on-macOS-10.5.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/clang-11-bootstrap/files/0025-compatibility-with-xar-on-macOS-10.5.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From e5d8398c97690fd175174a83e4769bdb6df9cd1d Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 5deccc8875fb46daeba4b674f187ed81f93005da Mon Sep 17 00:00:00 2001
</span> From: "Kirill A. Korinsky" <kirill@korins.ky>
Date: Wed, 17 Aug 2022 15:22:09 +0200
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 24/30] compatibility with xar on macOS 10.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 25/34] compatibility with xar on macOS 10.5
</span>
macOS 10.5 uses very old xar which has `xar_open` but misses
`xar_extract_tobuffersz`, update the check for `check_library_exists`.
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/clang-11-bootstrap/files/0025-clang-support-macports-libstdcxx.patch b/lang/clang-11-bootstrap/files/0026-clang-support-macports-libstdcxx.patch
</span>similarity index 97%
rename from lang/clang-11-bootstrap/files/0025-clang-support-macports-libstdcxx.patch
rename to lang/clang-11-bootstrap/files/0026-clang-support-macports-libstdcxx.patch
<span style='display:block; white-space:pre;color:#808080;'>index f3c5570adce..862745d1f88 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/clang-11-bootstrap/files/0025-clang-support-macports-libstdcxx.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/clang-11-bootstrap/files/0026-clang-support-macports-libstdcxx.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From c954e7ba5e554dba2c135a0fd03e212956c997b9 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 250ee3cf3ee96307c494b62e93b93b9b63ec4db2 Mon Sep 17 00:00:00 2001
</span> From: "Kirill A. Korinsky" <kirill@korins.ky>
Date: Thu, 18 Aug 2022 02:31:25 +0200
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 25/30] [clang] support macports-libstdcxx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 26/34] [clang] support macports-libstdcxx
</span>
---
clang/include/clang/Driver/ToolChain.h | 1 +
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/clang-11-bootstrap/files/0027-compiler-rt-fix-building-by-GCC.patch b/lang/clang-11-bootstrap/files/0027-compiler-rt-fix-building-by-GCC.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..0fee504d83f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/clang-11-bootstrap/files/0027-compiler-rt-fix-building-by-GCC.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,38 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 1cd1b67b0ba87471304b046649316d466c5364bc Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: "Kirill A. Korinsky" <kirill@korins.ky>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Wed, 17 Aug 2022 16:08:45 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 27/34] [compiler-rt] fix building by GCC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler-rt/cmake/config-ix.cmake | 15 ++++++++++-----
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 10 insertions(+), 5 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/compiler-rt/cmake/config-ix.cmake b/compiler-rt/cmake/config-ix.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index f0444eec0656..0e035afb9f10 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/compiler-rt/cmake/config-ix.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/compiler-rt/cmake/config-ix.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -403,11 +403,16 @@ if(APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # We're setting the flag manually for each target OS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(CMAKE_OSX_DEPLOYMENT_TARGET "")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(DARWIN_COMMON_CFLAGS -stdlib=libc++)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(DARWIN_COMMON_LINK_FLAGS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- -stdlib=libc++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- -lc++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- -lc++abi)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (NOT CMAKE_CXX_COMPILER_ID MATCHES "GNU")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(DARWIN_COMMON_CFLAGS -stdlib=libc++)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(DARWIN_COMMON_LINK_FLAGS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ -stdlib=libc++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ -lc++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ -lc++abi)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(DARWIN_COMMON_CFLAGS "")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(DARWIN_COMMON_LINK_FLAGS "")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ check_linker_flag("-fapplication-extension" COMPILER_RT_HAS_APP_EXTENSION)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(COMPILER_RT_HAS_APP_EXTENSION)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.37.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/clang-11-bootstrap/files/0028-compiler-rt-allow-to-define-required-archs.patch b/lang/clang-11-bootstrap/files/0028-compiler-rt-allow-to-define-required-archs.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..09444ba3586
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/clang-11-bootstrap/files/0028-compiler-rt-allow-to-define-required-archs.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,61 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 60cd288acdf48e3cd3f19eccf776e8fe23fcc04f Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: "Kirill A. Korinsky" <kirill@korins.ky>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Wed, 17 Aug 2022 16:09:26 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 28/34] [compiler-rt] allow to define required archs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler-rt/cmake/builtin-config-ix.cmake | 18 ++++++++++--------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler-rt/cmake/config-ix.cmake | 8 ++++++--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2 files changed, 16 insertions(+), 10 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/compiler-rt/cmake/builtin-config-ix.cmake b/compiler-rt/cmake/builtin-config-ix.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 8de901513beb..904d8ca93fca 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/compiler-rt/cmake/builtin-config-ix.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/compiler-rt/cmake/builtin-config-ix.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -84,14 +84,16 @@ if(APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(DARWIN_osx_BUILTIN_MIN_VER 10.5)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(DARWIN_osx_BUILTIN_MIN_VER_FLAG
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -mmacosx-version-min=${DARWIN_osx_BUILTIN_MIN_VER})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(DARWIN_osx_BUILTIN_ALL_POSSIBLE_ARCHS ${X86} ${X86_64})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # Add support for arm64 macOS if available in SDK.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- foreach(arch ${ARM64})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- sdk_has_arch_support(${DARWIN_osx_SYSROOT} macosx ${arch} MACOS_ARM_SUPPORT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (MACOS_ARM_SUPPORT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- list(APPEND DARWIN_osx_BUILTIN_ALL_POSSIBLE_ARCHS ${arch})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- endforeach(arch)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(NOT DARWIN_osx_BUILTIN_ALL_POSSIBLE_ARCHS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(DARWIN_osx_BUILTIN_ALL_POSSIBLE_ARCHS ${X86} ${X86_64})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # Add support for arm64 macOS if available in SDK.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ foreach(arch ${ARM64})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sdk_has_arch_support(${DARWIN_osx_SYSROOT} macosx ${arch} MACOS_ARM_SUPPORT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (MACOS_ARM_SUPPORT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ list(APPEND DARWIN_osx_BUILTIN_ALL_POSSIBLE_ARCHS ${arch})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endforeach(arch)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(COMPILER_RT_ENABLE_IOS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ list(APPEND DARWIN_EMBEDDED_PLATFORMS ios)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/compiler-rt/cmake/config-ix.cmake b/compiler-rt/cmake/config-ix.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 0e035afb9f10..67d8d64da790 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/compiler-rt/cmake/config-ix.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/compiler-rt/cmake/config-ix.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -431,8 +431,12 @@ if(APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ list(APPEND DARWIN_osx_LINK_FLAGS -isysroot ${DARWIN_osx_SYSROOT})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # Figure out which arches to use for each OS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- darwin_get_toolchain_supported_archs(toolchain_arches)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(COMPILER_RT_TOOLCHAIN_ARCHES)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(toolchain_arches ${COMPILER_RT_TOOLCHAIN_ARCHES})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # Figure out which arches to use for each OS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ darwin_get_toolchain_supported_archs(toolchain_arches)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ message(STATUS "Toolchain supported arches: ${toolchain_arches}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(NOT MACOSX_VERSION_MIN_FLAG)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.37.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/clang-11-bootstrap/files/0029-compiler-rt-atomic-which-can-be-compiled-by-GCC.patch b/lang/clang-11-bootstrap/files/0029-compiler-rt-atomic-which-can-be-compiled-by-GCC.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..eda37093c47
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/clang-11-bootstrap/files/0029-compiler-rt-atomic-which-can-be-compiled-by-GCC.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,338 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From ac23587c43ba957f530de1c4b2214ea1aaae39d6 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: "Kirill A. Korinsky" <kirill@korins.ky>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Thu, 18 Aug 2022 00:14:22 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 29/34] [compiler-rt] atomic which can be compiled by GCC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler-rt/lib/builtins/atomic.c | 109 ++++++++++++++++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler-rt/lib/builtins/atomic_flag_clear.c | 4 +
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .../lib/builtins/atomic_flag_clear_explicit.c | 4 +
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .../lib/builtins/atomic_flag_test_and_set.c | 4 +
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .../atomic_flag_test_and_set_explicit.c | 4 +
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .../lib/builtins/atomic_signal_fence.c | 4 +
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .../lib/builtins/atomic_thread_fence.c | 4 +
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7 files changed, 133 insertions(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/compiler-rt/lib/builtins/atomic.c b/compiler-rt/lib/builtins/atomic.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 8634a72e77d1..c4f6e6bfad25 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/compiler-rt/lib/builtins/atomic.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/compiler-rt/lib/builtins/atomic.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -123,10 +123,17 @@ static __inline Lock *lock_for_pointer(void *ptr) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /// Macros for determining whether a size is lock free. Clang can not yet
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /// codegen __atomic_is_lock_free(16), so for now we assume 16-byte values are
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /// not lock free.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__GNUC__) && !defined(__clang__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define IS_LOCK_FREE_1 __atomic_is_lock_free(1, NULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define IS_LOCK_FREE_2 __atomic_is_lock_free(2, NULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define IS_LOCK_FREE_4 __atomic_is_lock_free(4, NULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define IS_LOCK_FREE_8 __atomic_is_lock_free(8, NULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define IS_LOCK_FREE_1 __c11_atomic_is_lock_free(1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define IS_LOCK_FREE_2 __c11_atomic_is_lock_free(2)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define IS_LOCK_FREE_4 __c11_atomic_is_lock_free(4)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define IS_LOCK_FREE_8 __c11_atomic_is_lock_free(8)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define IS_LOCK_FREE_16 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /// Macro that calls the compiler-generated lock-free versions of functions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -166,9 +173,15 @@ static __inline Lock *lock_for_pointer(void *ptr) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /// An atomic load operation. This is atomic with respect to the source
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /// pointer only.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void __atomic_load_c(int size, void *src, void *dest, int model) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__GNUC__) && !defined(__clang__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define LOCK_FREE_ACTION(type) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *((type *)dest) = __atomic_load_n((_Atomic(type) *)src, model); \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define LOCK_FREE_ACTION(type) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *((type *)dest) = __c11_atomic_load((_Atomic(type) *)src, model); \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LOCK_FREE_CASES();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #undef LOCK_FREE_ACTION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Lock *l = lock_for_pointer(src);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -180,9 +193,15 @@ void __atomic_load_c(int size, void *src, void *dest, int model) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /// An atomic store operation. This is atomic with respect to the destination
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /// pointer only.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void __atomic_store_c(int size, void *dest, void *src, int model) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__GNUC__) && !defined(__clang__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define LOCK_FREE_ACTION(type) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ __atomic_store_n((_Atomic(type) *)dest, *(type *)src, model); \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define LOCK_FREE_ACTION(type) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ __c11_atomic_store((_Atomic(type) *)dest, *(type *)src, model); \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LOCK_FREE_CASES();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #undef LOCK_FREE_ACTION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Lock *l = lock_for_pointer(dest);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -198,10 +217,17 @@ void __atomic_store_c(int size, void *dest, void *src, int model) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /// This function returns 1 if the exchange takes place or 0 if it fails.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int __atomic_compare_exchange_c(int size, void *ptr, void *expected,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void *desired, int success, int failure) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__GNUC__) && !defined(__clang__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define LOCK_FREE_ACTION(type) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return __atomic_compare_exchange_n( \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (_Atomic(type) *)ptr, (type *)expected, *(type *)desired, true, \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ success, failure)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define LOCK_FREE_ACTION(type) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return __c11_atomic_compare_exchange_strong( \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (_Atomic(type) *)ptr, (type *)expected, *(type *)desired, success, \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ failure)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LOCK_FREE_CASES();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #undef LOCK_FREE_ACTION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Lock *l = lock_for_pointer(ptr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -219,10 +245,17 @@ int __atomic_compare_exchange_c(int size, void *ptr, void *expected,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /// Performs an atomic exchange operation between two pointers. This is atomic
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /// with respect to the target address.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void __atomic_exchange_c(int size, void *ptr, void *val, void *old, int model) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__GNUC__) && !defined(__clang__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define LOCK_FREE_ACTION(type) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *(type *)old = \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ __atomic_exchange_n((_Atomic(type) *)ptr, *(type *)val, model); \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define LOCK_FREE_ACTION(type) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *(type *)old = \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ __c11_atomic_exchange((_Atomic(type) *)ptr, *(type *)val, model); \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LOCK_FREE_CASES();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #undef LOCK_FREE_ACTION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Lock *l = lock_for_pointer(ptr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -251,6 +284,18 @@ void __atomic_exchange_c(int size, void *ptr, void *val, void *old, int model) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OPTIMISED_CASE(8, IS_LOCK_FREE_8, uint64_t)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__GNUC__) && !defined(__clang__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define OPTIMISED_CASE(n, lockfree, type) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ type __atomic_load_##n(type *src, int model) { \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (lockfree) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return __atomic_load_n((_Atomic(type) *)src, model); \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Lock *l = lock_for_pointer(src); \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ lock(l); \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ type val = *src; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ unlock(l); \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return val; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define OPTIMISED_CASE(n, lockfree, type) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ type __atomic_load_##n(type *src, int model) { \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (lockfree) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -261,9 +306,24 @@ void __atomic_exchange_c(int size, void *ptr, void *val, void *old, int model) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unlock(l); \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return val; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OPTIMISED_CASES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #undef OPTIMISED_CASE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__GNUC__) && !defined(__clang__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define OPTIMISED_CASE(n, lockfree, type) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ void __atomic_store_##n(type *dest, type val, int model) { \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (lockfree) { \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ __atomic_store_n((_Atomic(type) *)dest, val, model); \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ } \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Lock *l = lock_for_pointer(dest); \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ lock(l); \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *dest = val; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ unlock(l); \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define OPTIMISED_CASE(n, lockfree, type) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void __atomic_store_##n(type *dest, type val, int model) { \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (lockfree) { \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -276,9 +336,23 @@ OPTIMISED_CASES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unlock(l); \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OPTIMISED_CASES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #undef OPTIMISED_CASE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__GNUC__) && !defined(__clang__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define OPTIMISED_CASE(n, lockfree, type) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ type __atomic_exchange_##n(type *dest, type val, int model) { \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (lockfree) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return __atomic_exchange_n((_Atomic(type) *)dest, val, model); \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Lock *l = lock_for_pointer(dest); \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ lock(l); \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ type tmp = *dest; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *dest = val; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ unlock(l); \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return tmp; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define OPTIMISED_CASE(n, lockfree, type) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ type __atomic_exchange_##n(type *dest, type val, int model) { \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (lockfree) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -290,10 +364,30 @@ OPTIMISED_CASES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unlock(l); \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return tmp; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OPTIMISED_CASES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #undef OPTIMISED_CASE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__GNUC__) && !defined(__clang__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define OPTIMISED_CASE(n, lockfree, type) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ bool __atomic_compare_exchange_##n(type *ptr, type *expected, type desired, \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int success, int failure) { \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (lockfree) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return __atomic_compare_exchange_n( \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (_Atomic(type) *)ptr, expected, desired, true, success, failure); \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Lock *l = lock_for_pointer(ptr); \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ lock(l); \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (*ptr == *expected) { \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *ptr = desired; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ unlock(l); \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return true; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ } \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *expected = *ptr; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ unlock(l); \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return false; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define OPTIMISED_CASE(n, lockfree, type) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool __atomic_compare_exchange_##n(type *ptr, type *expected, type desired, \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int success, int failure) { \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (lockfree) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -310,12 +404,26 @@ OPTIMISED_CASES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unlock(l); \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return false; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OPTIMISED_CASES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #undef OPTIMISED_CASE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ////////////////////////////////////////////////////////////////////////////////
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Atomic read-modify-write operations for integers of various sizes.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ////////////////////////////////////////////////////////////////////////////////
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__GNUC__) && !defined(__clang__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define ATOMIC_RMW(n, lockfree, type, opname, op) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ type __atomic_fetch_##opname##_##n(type *ptr, type val, int model) { \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (lockfree) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return __atomic_fetch_##opname((_Atomic(type) *)ptr, val, model); \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Lock *l = lock_for_pointer(ptr); \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ lock(l); \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ type tmp = *ptr; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *ptr = tmp op val; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ unlock(l); \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return tmp; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define ATOMIC_RMW(n, lockfree, type, opname, op) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ type __atomic_fetch_##opname##_##n(type *ptr, type val, int model) { \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (lockfree) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -327,6 +435,7 @@ OPTIMISED_CASES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unlock(l); \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return tmp; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define OPTIMISED_CASE(n, lockfree, type) ATOMIC_RMW(n, lockfree, type, add, +)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OPTIMISED_CASES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/compiler-rt/lib/builtins/atomic_flag_clear.c b/compiler-rt/lib/builtins/atomic_flag_clear.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 983e5d7f076b..7100536cb8a7 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/compiler-rt/lib/builtins/atomic_flag_clear.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/compiler-rt/lib/builtins/atomic_flag_clear.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -19,7 +19,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdatomic.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #undef atomic_flag_clear
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void atomic_flag_clear(volatile atomic_flag *object) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__GNUC__) && !defined(__clang__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ __atomic_exchange_n(&(object)->__val, 0, __ATOMIC_SEQ_CST);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ __c11_atomic_store(&(object)->_Value, 0, __ATOMIC_SEQ_CST);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/compiler-rt/lib/builtins/atomic_flag_clear_explicit.c b/compiler-rt/lib/builtins/atomic_flag_clear_explicit.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index e61c0647684e..9ef065a71c87 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/compiler-rt/lib/builtins/atomic_flag_clear_explicit.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/compiler-rt/lib/builtins/atomic_flag_clear_explicit.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -20,7 +20,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #undef atomic_flag_clear_explicit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void atomic_flag_clear_explicit(volatile atomic_flag *object,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ memory_order order) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__GNUC__) && !defined(__clang__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ __atomic_exchange_n(&(object)->__val, 0, order);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ __c11_atomic_store(&(object)->_Value, 0, order);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/compiler-rt/lib/builtins/atomic_flag_test_and_set.c b/compiler-rt/lib/builtins/atomic_flag_test_and_set.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index ee22b08b5669..aa1fddeed3e7 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/compiler-rt/lib/builtins/atomic_flag_test_and_set.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/compiler-rt/lib/builtins/atomic_flag_test_and_set.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -19,7 +19,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdatomic.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #undef atomic_flag_test_and_set
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _Bool atomic_flag_test_and_set(volatile atomic_flag *object) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__GNUC__) && !defined(__clang__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return __atomic_exchange_n(&(object)->__val, 1, __ATOMIC_SEQ_CST);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return __c11_atomic_exchange(&(object)->_Value, 1, __ATOMIC_SEQ_CST);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/compiler-rt/lib/builtins/atomic_flag_test_and_set_explicit.c b/compiler-rt/lib/builtins/atomic_flag_test_and_set_explicit.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 8c9d03994267..e6ccbe17edca 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/compiler-rt/lib/builtins/atomic_flag_test_and_set_explicit.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/compiler-rt/lib/builtins/atomic_flag_test_and_set_explicit.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -20,7 +20,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #undef atomic_flag_test_and_set_explicit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _Bool atomic_flag_test_and_set_explicit(volatile atomic_flag *object,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ memory_order order) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__GNUC__) && !defined(__clang__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return __atomic_exchange_n(&(object)->__val, 1, order);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return __c11_atomic_exchange(&(object)->_Value, 1, order);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/compiler-rt/lib/builtins/atomic_signal_fence.c b/compiler-rt/lib/builtins/atomic_signal_fence.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index f4f5169d3008..6ca9dfde646e 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/compiler-rt/lib/builtins/atomic_signal_fence.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/compiler-rt/lib/builtins/atomic_signal_fence.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -19,7 +19,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdatomic.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #undef atomic_signal_fence
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void atomic_signal_fence(memory_order order) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__GNUC__) && !defined(__clang__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ __atomic_signal_fence(order);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ __c11_atomic_signal_fence(order);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/compiler-rt/lib/builtins/atomic_thread_fence.c b/compiler-rt/lib/builtins/atomic_thread_fence.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 5659ecb0b1f9..d980f955b544 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/compiler-rt/lib/builtins/atomic_thread_fence.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/compiler-rt/lib/builtins/atomic_thread_fence.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -19,7 +19,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdatomic.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #undef atomic_thread_fence
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void atomic_thread_fence(memory_order order) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__GNUC__) && !defined(__clang__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ __atomic_thread_fence(order);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ __c11_atomic_thread_fence(order);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.37.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/clang-11-bootstrap/files/0026-fix-building-on-10.10-by-GCC-10.patch b/lang/clang-11-bootstrap/files/0030-fix-building-on-10.10-by-GCC-10.patch
</span>similarity index 93%
rename from lang/clang-11-bootstrap/files/0026-fix-building-on-10.10-by-GCC-10.patch
rename to lang/clang-11-bootstrap/files/0030-fix-building-on-10.10-by-GCC-10.patch
<span style='display:block; white-space:pre;color:#808080;'>index 827b4ba7464..97809ebe059 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/clang-11-bootstrap/files/0026-fix-building-on-10.10-by-GCC-10.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/clang-11-bootstrap/files/0030-fix-building-on-10.10-by-GCC-10.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 95f857a7b7fbd48be684b2e285975b2c9de89e1c Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 7bcddfb1ac8f9786f02b0313304e0c595f369b22 Mon Sep 17 00:00:00 2001
</span> From: "Kirill A. Korinsky" <kirill@korins.ky>
Date: Wed, 17 Aug 2022 15:23:05 +0200
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 26/30] fix building on 10.10 by GCC 10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 30/34] fix building on 10.10 by GCC 10
</span>
macOS 10.10 Yosemite defines `dispatch_block_t` on the way that it can
be compiled by gcc 10; redefine in properly.
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/clang-11-bootstrap/files/0027-fix-build-of-shared-libc-.dylib-on-10.7.patch b/lang/clang-11-bootstrap/files/0031-fix-build-of-shared-libc-.dylib-on-10.7.patch
</span>similarity index 93%
rename from lang/clang-11-bootstrap/files/0027-fix-build-of-shared-libc-.dylib-on-10.7.patch
rename to lang/clang-11-bootstrap/files/0031-fix-build-of-shared-libc-.dylib-on-10.7.patch
<span style='display:block; white-space:pre;color:#808080;'>index 1b583bf4580..86472afbeed 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/clang-11-bootstrap/files/0027-fix-build-of-shared-libc-.dylib-on-10.7.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/clang-11-bootstrap/files/0031-fix-build-of-shared-libc-.dylib-on-10.7.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From f1fcaa8af403bf44a19e42789599c50849f768fc Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 2619c3115f82a504540780ff29d5c932007d7ac3 Mon Sep 17 00:00:00 2001
</span> From: "Kirill A. Korinsky" <kirill@korins.ky>
Date: Wed, 17 Aug 2022 15:27:16 +0200
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 27/30] fix build of shared libc++.dylib on < 10.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 31/34] fix build of shared libc++.dylib on < 10.7
</span>
reexported_symbols_list is not accepted on < 10.7
but reexport_library is, and that is what was used previously
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/clang-11-bootstrap/files/0028-disable-Apple-libc-Availability-tests.patch b/lang/clang-11-bootstrap/files/0032-disable-Apple-libc-Availability-tests.patch
</span>similarity index 86%
rename from lang/clang-11-bootstrap/files/0028-disable-Apple-libc-Availability-tests.patch
rename to lang/clang-11-bootstrap/files/0032-disable-Apple-libc-Availability-tests.patch
<span style='display:block; white-space:pre;color:#808080;'>index ed24deb5353..cdb749d65ef 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/clang-11-bootstrap/files/0028-disable-Apple-libc-Availability-tests.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/clang-11-bootstrap/files/0032-disable-Apple-libc-Availability-tests.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From db826a7a68cd1afbae824a7addb3ee4624635dd9 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 2bcfad170970fa3d0b668c0d904f9767e115cdfe Mon Sep 17 00:00:00 2001
</span> From: "Kirill A. Korinsky" <kirill@korins.ky>
Date: Wed, 17 Aug 2022 15:27:50 +0200
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 28/30] disable Apple libc++ Availability tests
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 32/34] disable Apple libc++ Availability tests
</span>
if we are using MacPort's installed libc++
then Apple's availablilty tests for libcxx by OS version
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/clang-11-bootstrap/files/0029-Leopard-Default-to-fno-blocks.patch b/lang/clang-11-bootstrap/files/0033-Leopard-Default-to-fno-blocks.patch
</span>similarity index 87%
rename from lang/clang-11-bootstrap/files/0029-Leopard-Default-to-fno-blocks.patch
rename to lang/clang-11-bootstrap/files/0033-Leopard-Default-to-fno-blocks.patch
<span style='display:block; white-space:pre;color:#808080;'>index c4852287db0..75f9a17b593 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/clang-11-bootstrap/files/0029-Leopard-Default-to-fno-blocks.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/clang-11-bootstrap/files/0033-Leopard-Default-to-fno-blocks.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 6735953be051f2177a267a2ce365a9ce843a2976 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From ce1e4345f85cffe8a7a3359c6fa2ba711e88e0dc Mon Sep 17 00:00:00 2001
</span> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Wed, 7 Jan 2015 03:42:15 -0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 29/30] Leopard: Default to -fno-blocks
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 33/34] Leopard: Default to -fno-blocks
</span>
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
---
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/clang-11-bootstrap/files/0030-Support-emulated-TLS-before-10.7.patch b/lang/clang-11-bootstrap/files/0034-Support-emulated-TLS-before-10.7.patch
</span>similarity index 94%
rename from lang/clang-11-bootstrap/files/0030-Support-emulated-TLS-before-10.7.patch
rename to lang/clang-11-bootstrap/files/0034-Support-emulated-TLS-before-10.7.patch
<span style='display:block; white-space:pre;color:#808080;'>index 9d619fddebc..ce5b9171398 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/clang-11-bootstrap/files/0030-Support-emulated-TLS-before-10.7.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/clang-11-bootstrap/files/0034-Support-emulated-TLS-before-10.7.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From a661169935ff72be001c1fa6228e62543d715df2 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 1c2e45c471d804f4bd53d833239bdeb7d9992668 Mon Sep 17 00:00:00 2001
</span> From: "Kirill A. Korinsky" <kirill@korins.ky>
Date: Wed, 17 Aug 2022 15:30:28 +0200
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 30/30] Support emulated TLS before 10.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 34/34] Support emulated TLS before 10.7
</span>
---
clang/lib/Basic/Targets/OSTargets.h | 2 +-
</pre><pre style='margin:0'>
</pre>