<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/d28ef23bb4cc2d6053155b5c0151e25be2409db1">https://github.com/macports/macports-ports/commit/d28ef23bb4cc2d6053155b5c0151e25be2409db1</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit d28ef23bb4cc2d6053155b5c0151e25be2409db1
</span>Author: Kirill A. Korinsky <kirill@korins.ky>
AuthorDate: Thu Aug 18 02:22:49 2022 +0200
<span style='display:block; white-space:pre;color:#404040;'> clang-11-bootstrap: migrated all patches to git tree
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Merges differnet patches related to missed strnlen to
</span><span style='display:block; white-space:pre;color:#404040;'> 0003-Fix-build-issues-pre-Lion-due-to-missing-a-strnlen-d.patch
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Added missed 0009-default-to-libcxx-on-all-systems.patch, and
</span><span style='display:block; white-space:pre;color:#404040;'> 0025-clang-support-macports-libstdcxx.patch. The last one was
</span><span style='display:block; white-space:pre;color:#404040;'> syncronized with clang-11 port implementation.
</span>---
lang/clang-11-bootstrap/Portfile | 108 ++++++---
...ASK_CRASH-and-MACH_EXCEPTION_CODES-if-th.patch} | 20 +-
...y-Don-t-embed-the-deployment-target-in-t.patch} | 20 +-
...sues-pre-Lion-due-to-missing-a-strnlen-d.patch} | 270 ++++++++++++---------
...ssues-pre-Lion-due-to-missing-a-strnlen-d.patch | 70 ------
...nly-call-pthread_setname_np-on-SnowLeopar.patch | 29 +++
...tpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch} | 18 +-
...nly-call-pthread_setname_np-on-SnowLeopar.patch | 28 ---
.../files/0006-dsymutil-fix-build-on-Leopard.patch | 37 +++
...-Unix-Path.inc-define-COPYFILE_CLONE-if-n.patch | 27 +++
...p-use-older-cfname-and-fix-uuid-on-leopard.diff | 23 --
...y-Fix-name-of-scan-view-executable-insid.patch} | 22 +-
...t-unix-path-copyfileclone-on-older-systems.diff | 15 --
.../0009-default-to-libcxx-on-all-systems.patch | 27 +++
...ragile-ObjC-runtime-when-targeting-darwi.patch} | 18 +-
...c-header-search-paths-for-older-versions.patch} | 22 +-
...at.h-to-work-on-Snow-Leopard-and-earlier.patch} | 16 +-
...er-rt-add-some-defs-missing-in-older-SDKs.patch | 48 ++++
...s-compiler-rt-work-around-no-libdispatch.patch} | 24 +-
...long-long-math-prototypes-when-using-the.patch} | 20 +-
...omic-using-mutex-lock_guard-for-64b-ops-.patch} | 30 +--
...x-src-chrono.cpp-fix-build-by-older-SDKs.patch} | 21 +-
...0018-compiler-rt-allow-build-before-10.7.patch} | 20 +-
...added-CMAKE_OSX_DEPLOYMENT_TARGET-fallba.patch} | 22 +-
...-runtime-libraries-used-on-10.4-and-10.5.patch} | 22 +-
...nto-sysroot-for-C-headers-if-they-are-fo.patch} | 28 ++-
...sable-DirectoryWatcher-when-builds-by-GCC.patch | 25 ++
...> 0023-Use-for-long-options-in-help-text.patch} | 29 ++-
...0024-compatibility-with-xar-on-macOS-10.5.patch | 41 ++++
.../0025-clang-support-macports-libstdcxx.patch | 107 ++++++++
... => 0026-fix-building-on-10.10-by-GCC-10.patch} | 29 ++-
...-fix-build-of-shared-libc-.dylib-on-10.7.patch} | 24 +-
...028-disable-Apple-libc-Availability-tests.patch | 30 +++
...ch => 0029-Leopard-Default-to-fno-blocks.patch} | 18 +-
.../0030-Support-emulated-TLS-before-10.7.patch | 53 ++++
...ssues-pre-Lion-due-to-missing-a-strnlen-d.patch | 42 ----
.../files/1008-compilerrt-fuzzer-missingdefs.diff | 17 --
.../1009-compilerrt-sanitizer-missingdefs.diff | 14 --
...libcxx-includes-disable-availability-tests.diff | 13 -
.../9000-patch-clang-7.0-support-emulated-tls.diff | 26 --
.../9000-patch-llvm-7.0-support-emulated-tls.diff | 13 -
.../files/9001-macports-libstdcxx.diff | 157 ------------
...clang-7.0-default-to-libcxx-on-all-systems.diff | 15 --
.../files/fix-build-clang-by-gcc10.diff | 11 -
.../files/fix-build-with-old-xar.diff | 24 --
45 files changed, 926 insertions(+), 767 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 ed0f54567a9..ee1dfecef77 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;'>@@ -54,7 +54,7 @@ configure.cmd ${prefix}/libexec/cmake-bootstrap/bin/cmake
</span>
worksrcdir llvm-project/llvm
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patch.dir ${workpath}/llvm-project/llvm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patch.dir ${workpath}/llvm-project
</span>
post-extract {
ln -s ${workpath}/${distname} ${workpath}/llvm-project
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,30 +67,32 @@ post-extract {
</span> }
patch.pre_args -p1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles 0002-Define-EXC_MASK_CRASH-and-MACH_EXCEPTION_CODES-if-th.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0003-MacPorts-Only-Don-t-embed-the-deployment-target-in-t.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0005-Threading-Only-call-pthread_setname_np-on-SnowLeopar.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0006-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0007-patch-llvm8-tools-dsymutil-symbolmap-use-older-cfname-and-fix-uuid-on-leopard.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0008-patch-lib-support-unix-path-copyfileclone-on-older-systems.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1002-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1004-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1005-Fixup-libstdc-header-search-paths-for-older-versions.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1007-Fix-float.h-to-work-on-Snow-Leopard-and-earlier.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1008-compilerrt-fuzzer-missingdefs.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1009-compilerrt-sanitizer-missingdefs.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2002-Work-around-no-libdispatch-on-10.6.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 3001-Fix-missing-long-long-math-prototypes-when-using-the.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 3002-implement-atomic-using-mutex-lock_guard-for-64b-ops-.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 3003-patch-libcxx-chrono-restore-steadyclock-fallback.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- leopard-no-asan.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5000-patch-compilerrtdarwinutils-find-macosxsdkversion.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5002-patch-toolchains-darwin-add-back-pre-10.6-link-libs.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-clang-fix-include-next-sysroot-cpp-headers.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Fix-build-issues-pre-Lion-due-to-missing-a-strnlen.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fix-build-clang-by-gcc10.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- llvm-objdump-help-macho.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fix-build-with-old-xar.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# all patches are available as git tree: https://github.com/catap/llvm-project/tree/clang-11-bootstrap
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles 0001-Define-EXC_MASK_CRASH-and-MACH_EXCEPTION_CODES-if-th.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0002-MacPorts-Only-Don-t-embed-the-deployment-target-in-t.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0003-Fix-build-issues-pre-Lion-due-to-missing-a-strnlen-d.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0004-Threading-Only-call-pthread_setname_np-on-SnowLeopar.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0005-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0006-dsymutil-fix-build-on-Leopard.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0007-lib-Support-Unix-Path.inc-define-COPYFILE_CLONE-if-n.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0008-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0009-default-to-libcxx-on-all-systems.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0010-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0011-Fixup-libstdc-header-search-paths-for-older-versions.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0012-Fix-float.h-to-work-on-Snow-Leopard-and-earlier.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0013-compiler-rt-add-some-defs-missing-in-older-SDKs.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0014-10.5-and-less-compiler-rt-work-around-no-libdispatch.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0015-Fix-missing-long-long-math-prototypes-when-using-the.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0016-implement-atomic-using-mutex-lock_guard-for-64b-ops-.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0017-libcxx-src-chrono.cpp-fix-build-by-older-SDKs.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0018-compiler-rt-allow-build-before-10.7.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0019-compiler-rt-added-CMAKE_OSX_DEPLOYMENT_TARGET-fallba.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0020-add-back-runtime-libraries-used-on-10.4-and-10.5.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0021-Don-t-look-into-sysroot-for-C-headers-if-they-are-fo.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0022-disable-DirectoryWatcher-when-builds-by-GCC.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0023-Use-for-long-options-in-help-text.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0024-compatibility-with-xar-on-macOS-10.5.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0025-clang-support-macports-libstdcxx.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;'>@@ -152,7 +154,7 @@ platform darwin {
</span> -DCOMPILER_RT_BUILD_XRAY=OFF
patchfiles-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- fix-build-clang-by-gcc10-on-yosemite.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0026-fix-building-on-10.10-by-GCC-10.patch
</span> }
if {${os.major} <= 14} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -178,18 +180,18 @@ 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;'>- 5004-patch-libcxx-reexport-symbols-lionorgreater-only.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0027-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;'>- 5005-MacPorts-only-patch-libcxx-includes-disable-availability-tests.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0028-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;'>- leopard-no-blocks.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0029-Leopard-Default-to-fno-blocks.patch
</span> }
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -238,8 +240,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;'>- 9000-patch-llvm-7.0-support-emulated-tls.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 9000-patch-clang-7.0-support-emulated-tls.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0030-Support-emulated-TLS-before-10.7.patch
</span> }
default_variants-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -285,6 +286,51 @@ if {${os.platform} eq "darwin" && ${os.major} < 16} {
</span> -static-libstdc++ -static-libgcc
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${configure.build_arch} eq "arm64" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://github.com/macports/macports-ports/commit/be1e11a368f672d927a7bdb381f2fa71a79ba483
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set gcc_arch aarch64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set gcc_arch ${configure.build_arch}
</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;'>+ reinplace "s|@@MACPORTS_GCC_INCLUDE_DIR@@|${prefix}/include/gcc/c++|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/tools/clang/lib/Frontend/InitHeaderSearch.cpp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/tools/clang/lib/Driver/ToolChains/Darwin.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@@MACPORTS_HOST_NAME@@|${gcc_arch}-apple-darwin${os.major}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/tools/clang/lib/Driver/ToolChains/Darwin.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@@MACPORTS_libstdc++@@|${prefix}/lib/libgcc/libstdc++.6.dylib|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/tools/clang/lib/Driver/ToolChains/Darwin.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # GCC was built for ${configure.build_arch}-apple-darwin${os.major}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # if GCC was also built universal, it has an extra include directory
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # if ${configure.build_arch} is 32-bit, there is an extra 64-bit subdirectory
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # if ${configure.build_arch} is 64-bit, there is an extra 32-bit subdirectory
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # MacPorts GCC cannot compile across platforms
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ switch ${configure.build_arch} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ x86_64 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace {s|@@MACPORTS_TEST_32_64@@|getTriple().getArch() == llvm::Triple::x86_64 ? "" : "i386"|g} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/tools/clang/lib/Driver/ToolChains/Darwin.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ i386 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace {s|@@MACPORTS_TEST_32_64@@|getTriple().getArch() == llvm::Triple::x86_64 ? "x86_64" : ""|g} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/tools/clang/lib/Driver/ToolChains/Darwin.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ppc64 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace {s|@@MACPORTS_TEST_32_64@@|getTriple().getArch() == llvm::Triple::ppc64 ? "" : "ppc"|g} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/tools/clang/lib/Driver/ToolChains/Darwin.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ppc {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace {s|@@MACPORTS_TEST_32_64@@|getTriple().getArch() == llvm::Triple::ppc64 ? "ppc64" : ""|g} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/tools/clang/lib/Driver/ToolChains/Darwin.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ arm64 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace {s|@@MACPORTS_TEST_32_64@@|""|g} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/tools/clang/lib/Driver/ToolChains/Darwin.cpp
</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;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {${universal_possible} && [variant_isset universal]} {
foreach arch ${universal_archs_supported} {
lappend merger_configure_env(${arch}) BUILD_ARCH=${arch}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/clang-11-bootstrap/files/0002-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>similarity index 59%
rename from lang/clang-11-bootstrap/files/0002-Define-EXC_MASK_CRASH-and-MACH_EXCEPTION_CODES-if-th.patch
rename to lang/clang-11-bootstrap/files/0001-Define-EXC_MASK_CRASH-and-MACH_EXCEPTION_CODES-if-th.patch
<span style='display:block; white-space:pre;color:#808080;'>index 5c22622a722..04851224473 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/clang-11-bootstrap/files/0002-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,21 +1,21 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 55278bd7f154686d9b9b8e31e4e526f8584468f6 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 3998ef54ce5a2d63be2a5763170a98d464d59762 Mon Sep 17 00:00:00 2001
</span> 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 2/6] Define EXC_MASK_CRASH and MACH_EXCEPTION_CODES if they're
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- not defined in the SDK
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 01/30] Define EXC_MASK_CRASH and MACH_EXCEPTION_CODES if
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ they're not defined in the SDK
</span>
The 10.4 SDK does not define these macros
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
---
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lib/Support/Unix/Signals.inc | 9 +++++++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ llvm/lib/Support/Unix/Signals.inc | 9 +++++++++
</span> 1 file changed, 9 insertions(+)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git llvm_master/lib/Support/Unix/Signals.inc macports_master/lib/Support/Unix/Signals.inc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index ec3935928d2..529bbfb34c2 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- llvm_master/lib/Support/Unix/Signals.inc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ macports_master/lib/Support/Unix/Signals.inc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -565,6 +565,15 @@ void llvm::sys::PrintStackTraceOnErrorSignal(StringRef Argv0,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/llvm/lib/Support/Unix/Signals.inc b/llvm/lib/Support/Unix/Signals.inc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index f68374d29f02..977058c089ab 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/llvm/lib/Support/Unix/Signals.inc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/llvm/lib/Support/Unix/Signals.inc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -635,6 +635,15 @@ void llvm::sys::PrintStackTraceOnErrorSignal(StringRef Argv0,
</span> AddSignalHandler(PrintStackTraceSignalHandler, nullptr);
#if defined(__APPLE__) && ENABLE_CRASH_OVERRIDES
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,5 +32,5 @@ index ec3935928d2..529bbfb34c2 100644
</span> if (DisableCrashReporting || getenv("LLVM_DISABLE_CRASH_REPORT")) {
mach_port_t self = mach_task_self();
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.21.0 (Apple Git-120)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.37.2
</span>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/clang-11-bootstrap/files/0003-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>similarity index 59%
rename from lang/clang-11-bootstrap/files/0003-MacPorts-Only-Don-t-embed-the-deployment-target-in-t.patch
rename to lang/clang-11-bootstrap/files/0002-MacPorts-Only-Don-t-embed-the-deployment-target-in-t.patch
<span style='display:block; white-space:pre;color:#808080;'>index a698bfb8741..4cf004c090b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/clang-11-bootstrap/files/0003-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,21 +1,21 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 9b6ac68dbf1643543a3f1c4287255406069f061a Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 9cf659947ce441ab497be344ede8025f0f347bd2 Mon Sep 17 00:00:00 2001
</span> 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 3/6] MacPorts Only: Don't embed the deployment target in the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 02/30] 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
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
---
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lib/CodeGen/AsmPrinter/AsmPrinter.cpp | 6 ++++--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp | 6 ++++--
</span> 1 file changed, 4 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git llvm_master/lib/CodeGen/AsmPrinter/AsmPrinter.cpp macports_master/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 7adc59d096f..336d1384b8d 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- llvm_master/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ macports_master/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -272,8 +272,10 @@ bool AsmPrinter::doInitialization(Module &M) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp b/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index c7eb0257d71b..75c4a19bf9f1 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -269,8 +269,10 @@ bool AsmPrinter::doInitialization(Module &M) {
</span> // alternative is duplicated code in each of the target asm printers that
// use the directive, where it would need the same conditionalization
// anyway.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,7 +27,7 @@ index 7adc59d096f..336d1384b8d 100644
</span> + }
// Allow the target to emit any magic that it wants at the start of the file.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- EmitStartOfAsmFile(M);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ emitStartOfAsmFile(M);
</span> --
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.21.0 (Apple Git-120)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.37.2
</span>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/clang-11-bootstrap/files/Fix-build-issues-pre-Lion-due-to-missing-a-strnlen.patch b/lang/clang-11-bootstrap/files/0003-Fix-build-issues-pre-Lion-due-to-missing-a-strnlen-d.patch
</span>similarity index 54%
rename from lang/clang-11-bootstrap/files/Fix-build-issues-pre-Lion-due-to-missing-a-strnlen.patch
rename to lang/clang-11-bootstrap/files/0003-Fix-build-issues-pre-Lion-due-to-missing-a-strnlen-d.patch
<span style='display:block; white-space:pre;color:#808080;'>index 0d1d57d700b..87bd910b7d4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/clang-11-bootstrap/files/Fix-build-issues-pre-Lion-due-to-missing-a-strnlen.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,11 +1,37 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/lib/ObjectYAML/MachOEmitter.cpp b/lib/ObjectYAML/MachOEmitter.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index dec9c9f696..92d788c4b6 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/lib/ObjectYAML/MachOEmitter.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/lib/ObjectYAML/MachOEmitter.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -25,6 +25,20 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- using namespace llvm;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From d55a5be574088cf71a7707797e70dbf8b7ec6180 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Tue, 20 Dec 2016 12:41:21 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 03/30] Fix build issues pre-Lion due to missing a strnlen
</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;'>+https://trac.macports.org/ticket/51520
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://llvm.org/bugs/show_bug.cgi?id=27714
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ clang/lib/Lex/HeaderMap.cpp | 15 +++++++++++++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lld/MachO/ExportTrie.cpp | 14 ++++++++++++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lld/MachO/InputFiles.cpp | 14 ++++++++++++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .../MachO/MachONormalizedFileBinaryUtils.h | 14 ++++++++++++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ llvm/lib/ObjectYAML/MachOEmitter.cpp | 14 ++++++++++++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ llvm/lib/ObjectYAML/MachOYAML.cpp | 14 ++++++++++++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .../llvm-objcopy/MachO/MachOLayoutBuilder.cpp | 14 ++++++++++++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ llvm/tools/llvm-objcopy/MachO/MachOReader.cpp | 14 ++++++++++++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ llvm/tools/llvm-objcopy/MachO/Object.cpp | 14 ++++++++++++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ llvm/tools/llvm-readobj/ELFDumper.cpp | 14 ++++++++++++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ llvm/tools/llvm-readobj/ObjDumper.cpp | 14 ++++++++++++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ llvm/tools/obj2yaml/macho2yaml.cpp | 16 +++++++++++++++-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 12 files changed, 170 insertions(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/clang/lib/Lex/HeaderMap.cpp b/clang/lib/Lex/HeaderMap.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index d44ef29c05d1..541cbdef9702 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/clang/lib/Lex/HeaderMap.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/clang/lib/Lex/HeaderMap.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23,6 +23,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "llvm/Support/Debug.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <cstring>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <memory>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span> +#ifdef __APPLE__
+#include <Availability.h>
+#if __MAC_OS_X_VERSION_MIN_REQUIRED < 1070
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,16 +46,16 @@ index dec9c9f696..92d788c4b6 100644
</span> +#endif
+#endif
+
<span style='display:block; white-space:pre;background:#ffe0e0;'>- namespace {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ using namespace clang;
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- class MachOWriter {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/lib/ObjectYAML/MachOYAML.cpp b/lib/ObjectYAML/MachOYAML.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 5a27d37cb7..755d446381 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/lib/ObjectYAML/MachOYAML.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/lib/ObjectYAML/MachOYAML.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -21,6 +21,20 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <cstdint>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <cstring>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /// HashHMapKey - This is the 'well known' hash function required by the file
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/lld/MachO/ExportTrie.cpp b/lld/MachO/ExportTrie.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 7cc81bcfd5f1..cafac8aae97d 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/lld/MachO/ExportTrie.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/lld/MachO/ExportTrie.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -43,6 +43,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "llvm/BinaryFormat/MachO.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "llvm/Support/LEB128.h"
</span>
+#ifdef __APPLE__
+#include <Availability.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,16 +71,16 @@ index 5a27d37cb7..755d446381 100644
</span> +#endif
+#endif
+
<span style='display:block; white-space:pre;background:#ffe0e0;'>- namespace llvm {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MachOYAML::LoadCommand::~LoadCommand() = default;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/tools/llvm-objcopy/MachO/MachOLayoutBuilder.cpp b/tools/llvm-objcopy/MachO/MachOLayoutBuilder.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 8e2bf36238..1e721e4307 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/tools/llvm-objcopy/MachO/MachOLayoutBuilder.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/tools/llvm-objcopy/MachO/MachOLayoutBuilder.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -11,6 +11,20 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "llvm/Support/Errc.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "llvm/Support/ErrorHandling.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ using namespace llvm;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ using namespace llvm::MachO;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ using namespace lld;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/lld/MachO/InputFiles.cpp b/lld/MachO/InputFiles.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 46fe82f98822..5912e90d6a40 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/lld/MachO/InputFiles.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/lld/MachO/InputFiles.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -58,6 +58,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "llvm/Support/MemoryBuffer.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "llvm/Support/Path.h"
</span>
+#ifdef __APPLE__
+#include <Availability.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,16 +96,16 @@ index 8e2bf36238..1e721e4307 100644
</span> +#endif
+#endif
+
<span style='display:block; white-space:pre;background:#ffe0e0;'>- namespace llvm {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- namespace objcopy {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- namespace macho {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/tools/llvm-objcopy/MachO/MachOReader.cpp b/tools/llvm-objcopy/MachO/MachOReader.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 548a85bd49..69594b9e5e 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/tools/llvm-objcopy/MachO/MachOReader.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/tools/llvm-objcopy/MachO/MachOReader.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -13,6 +13,20 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "llvm/Support/Errc.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <memory>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ using namespace llvm;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ using namespace llvm::MachO;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ using namespace llvm::support::endian;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryUtils.h b/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryUtils.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index aeb04ef4508a..844f6d71102f 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryUtils.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryUtils.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -21,6 +21,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "llvm/Support/LEB128.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <system_error>
</span>
+#ifdef __APPLE__
+#include <Availability.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -95,16 +121,16 @@ index 548a85bd49..69594b9e5e 100644
</span> +#endif
+#endif
+
<span style='display:block; white-space:pre;background:#ffe0e0;'>- namespace llvm {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- namespace objcopy {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- namespace macho {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/tools/llvm-objcopy/MachO/Object.cpp b/tools/llvm-objcopy/MachO/Object.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index cdb97531fb..6dd6298e2a 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/tools/llvm-objcopy/MachO/Object.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/tools/llvm-objcopy/MachO/Object.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -10,6 +10,20 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "llvm/ADT/SmallPtrSet.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <unordered_set>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace lld {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace mach_o {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace normalized {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/llvm/lib/ObjectYAML/MachOEmitter.cpp b/llvm/lib/ObjectYAML/MachOEmitter.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 680264484704..0bce29d11401 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/llvm/lib/ObjectYAML/MachOEmitter.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/llvm/lib/ObjectYAML/MachOEmitter.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23,6 +23,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "llvm/Support/Format.h"
</span>
+#ifdef __APPLE__
+#include <Availability.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -120,16 +146,16 @@ index cdb97531fb..6dd6298e2a 100644
</span> +#endif
+#endif
+
<span style='display:block; white-space:pre;background:#ffe0e0;'>- namespace llvm {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- namespace objcopy {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- namespace macho {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/tools/llvm-readobj/ELFDumper.cpp b/tools/llvm-readobj/ELFDumper.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 0f508f8dc0..712d9d5e64 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/tools/llvm-readobj/ELFDumper.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/tools/llvm-readobj/ELFDumper.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -80,6 +80,20 @@ using namespace ELF;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define ENUM_ENT_1(enum) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { #enum, #enum, ELF::enum }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ using namespace llvm;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/llvm/lib/ObjectYAML/MachOYAML.cpp b/llvm/lib/ObjectYAML/MachOYAML.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 86aad0233767..1d3134313faf 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/llvm/lib/ObjectYAML/MachOYAML.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/llvm/lib/ObjectYAML/MachOYAML.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -21,6 +21,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <cstdint>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <cstring>
</span>
+#ifdef __APPLE__
+#include <Availability.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -145,16 +171,16 @@ index 0f508f8dc0..712d9d5e64 100644
</span> +#endif
+#endif
+
<span style='display:block; white-space:pre;background:#ffe0e0;'>- namespace {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace llvm {
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- template <class ELFT> struct RelSymbol {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/tools/llvm-readobj/ObjDumper.cpp b/tools/llvm-readobj/ObjDumper.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index fc91d81f07..3b08720c69 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/tools/llvm-readobj/ObjDumper.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/tools/llvm-readobj/ObjDumper.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -20,6 +20,20 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "llvm/Support/raw_ostream.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <map>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MachOYAML::LoadCommand::~LoadCommand() = default;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/llvm/tools/llvm-objcopy/MachO/MachOLayoutBuilder.cpp b/llvm/tools/llvm-objcopy/MachO/MachOLayoutBuilder.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 256c830a44a4..4aeba9ba4b0e 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/llvm/tools/llvm-objcopy/MachO/MachOLayoutBuilder.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/llvm/tools/llvm-objcopy/MachO/MachOLayoutBuilder.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -11,6 +11,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "llvm/Support/Errc.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "llvm/Support/ErrorHandling.h"
</span>
+#ifdef __APPLE__
+#include <Availability.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -171,19 +197,16 @@ index fc91d81f07..3b08720c69 100644
</span> +#endif
+
namespace llvm {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace objcopy {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace macho {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/llvm/tools/llvm-objcopy/MachO/MachOReader.cpp b/llvm/tools/llvm-objcopy/MachO/MachOReader.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 99bcec7f6b51..849a609c84af 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/llvm/tools/llvm-objcopy/MachO/MachOReader.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/llvm/tools/llvm-objcopy/MachO/MachOReader.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -13,6 +13,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "llvm/Object/MachO.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <memory>
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- static inline Error createError(const Twine &Msg) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/tools/obj2yaml/macho2yaml.cpp b/tools/obj2yaml/macho2yaml.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 49347431b9..bfd6e56be2 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/tools/obj2yaml/macho2yaml.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/tools/obj2yaml/macho2yaml.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -15,7 +15,21 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "llvm/Support/ErrorHandling.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "llvm/Support/LEB128.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <string.h> // for memcpy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <string.h> // for memcpy and strnlen
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span> +#ifdef __APPLE__
+#include <Availability.h>
+#if __MAC_OS_X_VERSION_MIN_REQUIRED < 1070
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -197,14 +220,17 @@ index 49347431b9..bfd6e56be2 100644
</span> +}
+#endif
+#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- using namespace llvm;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/tools/clang/lib/Lex/HeaderMap.cpp 2022-02-15 18:50:25.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/tools/clang/lib/Lex/HeaderMap.cpp 2022-02-15 18:51:08.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -25,6 +25,21 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <memory>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- using namespace clang;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace llvm {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace objcopy {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace macho {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/llvm/tools/llvm-objcopy/MachO/Object.cpp b/llvm/tools/llvm-objcopy/MachO/Object.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index de8cb0af108d..e20a18d4d9ca 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/llvm/tools/llvm-objcopy/MachO/Object.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/llvm/tools/llvm-objcopy/MachO/Object.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -11,6 +11,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "llvm/ADT/SmallPtrSet.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <unordered_set>
</span>
+#ifdef __APPLE__
+#include <Availability.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -220,17 +246,16 @@ index 49347431b9..bfd6e56be2 100644
</span> +#endif
+#endif
+
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /// HashHMapKey - This is the 'well known' hash function required by the file
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /// format, used to look up keys in the hash table. The hash table uses simple
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /// linear probing based on this function.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryUtils.h b/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryUtils.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index aeb04ef4508a..844f6d71102f 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/projects/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryUtils.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/projects/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryUtils.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -21,6 +21,20 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "llvm/Support/LEB128.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <system_error>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace llvm {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace objcopy {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace macho {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/llvm/tools/llvm-readobj/ELFDumper.cpp b/llvm/tools/llvm-readobj/ELFDumper.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 15076f1f8933..ab0760cfb1c2 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/llvm/tools/llvm-readobj/ELFDumper.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/llvm/tools/llvm-readobj/ELFDumper.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -68,6 +68,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <unordered_set>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <vector>
</span>
+#ifdef __APPLE__
+#include <Availability.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -246,16 +271,16 @@ index aeb04ef4508a..844f6d71102f 100644
</span> +#endif
+#endif
+
<span style='display:block; white-space:pre;background:#ffe0e0;'>- namespace lld {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- namespace mach_o {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- namespace normalized {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/lld/MachO/ExportTrie.cpp b/lld/MachO/ExportTrie.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 7cc81bcfd5f1..cafac8aae97d 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/projects/lld/MachO/ExportTrie.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/projects/lld/MachO/ExportTrie.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -43,6 +43,20 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "llvm/BinaryFormat/MachO.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "llvm/Support/LEB128.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ using namespace llvm;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ using namespace llvm::object;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ using namespace ELF;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/llvm/tools/llvm-readobj/ObjDumper.cpp b/llvm/tools/llvm-readobj/ObjDumper.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index ce61f1c53a4d..63a10f2095bd 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/llvm/tools/llvm-readobj/ObjDumper.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/llvm/tools/llvm-readobj/ObjDumper.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -21,6 +21,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "llvm/Support/raw_ostream.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <map>
</span>
+#ifdef __APPLE__
+#include <Availability.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -271,17 +296,20 @@ index 7cc81bcfd5f1..cafac8aae97d 100644
</span> +#endif
+#endif
+
<span style='display:block; white-space:pre;background:#ffe0e0;'>- using namespace llvm;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- using namespace llvm::MachO;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- using namespace lld;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/lld/MachO/InputFiles.cpp b/lld/MachO/InputFiles.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 46fe82f98822..5912e90d6a40 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/projects/lld/MachO/InputFiles.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/projects/lld/MachO/InputFiles.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -58,6 +58,20 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "llvm/Support/MemoryBuffer.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "llvm/Support/Path.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace llvm {
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ static inline Error createError(const Twine &Msg) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/llvm/tools/obj2yaml/macho2yaml.cpp b/llvm/tools/obj2yaml/macho2yaml.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 6b0db2aa15fa..930568380cbf 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/llvm/tools/obj2yaml/macho2yaml.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/llvm/tools/obj2yaml/macho2yaml.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -14,7 +14,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "llvm/Support/ErrorHandling.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "llvm/Support/LEB128.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <string.h> // for memcpy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <string.h> // for memcpy abd strnlen
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span> +#ifdef __APPLE__
+#include <Availability.h>
+#if __MAC_OS_X_VERSION_MIN_REQUIRED < 1070
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -295,7 +323,9 @@ index 46fe82f98822..5912e90d6a40 100644
</span> +}
+#endif
+#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> using namespace llvm;
<span style='display:block; white-space:pre;background:#ffe0e0;'>- using namespace llvm::MachO;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- using namespace llvm::support::endian;
</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;'>+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-Fix-build-issues-pre-Lion-due-to-missing-a-strnlen-d.patch b/lang/clang-11-bootstrap/files/0004-Fix-build-issues-pre-Lion-due-to-missing-a-strnlen-d.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index bb221aad0f4..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/clang-11-bootstrap/files/0004-Fix-build-issues-pre-Lion-due-to-missing-a-strnlen-d.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,70 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From e37fcfbad830c9bfe7375847f230f69899360444 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Tue, 20 Dec 2016 12:41:21 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 4/6] Fix build issues pre-Lion due to missing a strnlen
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- definition
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://trac.macports.org/ticket/51520
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://llvm.org/bugs/show_bug.cgi?id=27714
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lib/ObjectYAML/MachOYAML.cpp | 14 ++++++++++++++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tools/obj2yaml/macho2yaml.cpp | 16 +++++++++++++++-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2 files changed, 29 insertions(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git llvm_master/lib/ObjectYAML/MachOYAML.cpp macports_master/lib/ObjectYAML/MachOYAML.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index d12f12cf443..57464def3da 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- llvm_master/lib/ObjectYAML/MachOYAML.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ macports_master/lib/ObjectYAML/MachOYAML.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -21,6 +21,20 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <cstdint>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <cstring>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <Availability.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if __MAC_OS_X_VERSION_MIN_REQUIRED < 1070
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static size_t strnlen(const char *s, size_t maxlen) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ size_t l = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ while (l < maxlen && *s) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ l++;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ s++;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return l;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- namespace llvm {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MachOYAML::LoadCommand::~LoadCommand() = default;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git llvm_master/tools/obj2yaml/macho2yaml.cpp macports_master/tools/obj2yaml/macho2yaml.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 63e81686632..3c9b0cf8748 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- llvm_master/tools/obj2yaml/macho2yaml.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ macports_master/tools/obj2yaml/macho2yaml.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -14,7 +14,21 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "llvm/Support/ErrorHandling.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "llvm/Support/LEB128.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <string.h> // for memcpy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <string.h> // for memcpy abd strnlen
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <Availability.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if __MAC_OS_X_VERSION_MIN_REQUIRED < 1070
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static size_t strnlen(const char *s, size_t maxlen) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ size_t l = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ while (l < maxlen && *s) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ l++;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ s++;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return l;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- using namespace llvm;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.21.0 (Apple Git-120)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</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/0004-Threading-Only-call-pthread_setname_np-on-SnowLeopar.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..45343830463
</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-Threading-Only-call-pthread_setname_np-on-SnowLeopar.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,29 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 8d5fd98c616955d00f1ea6d93c4baa82da7642f0 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Wed, 27 Dec 2017 23:05:43 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 04/30] Threading: Only call pthread_setname_np() on
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SnowLeopard+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ llvm/lib/Support/Unix/Threading.inc | 2 ++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 2 insertions(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/llvm/lib/Support/Unix/Threading.inc b/llvm/lib/Support/Unix/Threading.inc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 2d0aacabf092..78ef46cd1a4c 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/llvm/lib/Support/Unix/Threading.inc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/llvm/lib/Support/Unix/Threading.inc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -175,8 +175,10 @@ void llvm::set_thread_name(const Twine &Name) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ::pthread_setname_np(::pthread_self(), "%s",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const_cast<char *>(NameStr.data()));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if HAVE_PTHREAD_SETNAME_NP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ::pthread_setname_np(NameStr.data());
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void llvm::get_thread_name(SmallVectorImpl<char> &Name) {
</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/0006-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch b/lang/clang-11-bootstrap/files/0005-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch
</span>similarity index 63%
rename from lang/clang-11-bootstrap/files/0006-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch
rename to lang/clang-11-bootstrap/files/0005-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch
<span style='display:block; white-space:pre;color:#808080;'>index de0a8100a80..4109b90a36c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/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:#e0e0ff;'>+++ b/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:#e0e0e0;'>@@ -1,21 +1,21 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From e6f64b0058a576c78f7ad4dee747c269b0444006 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 39b434df2159cc0f32a6e4ea8b8d5d60224c3355 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 6/6] Only call setpriority(PRIO_DARWIN_THREAD, 0,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 05/30] 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.
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
---
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lib/Support/Unix/Threading.inc | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ llvm/lib/Support/Unix/Threading.inc | 2 +-
</span> 1 file changed, 1 insertion(+), 1 deletion(-)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git llvm_master/lib/Support/Unix/Threading.inc macports_master/lib/Support/Unix/Threading.inc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index e8f9a13860f..e731f750c1d 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- llvm_master/lib/Support/Unix/Threading.inc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ macports_master/lib/Support/Unix/Threading.inc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -237,7 +237,7 @@ SetThreadPriorityResult llvm::set_thread_priority(ThreadPriority Priority) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/llvm/lib/Support/Unix/Threading.inc b/llvm/lib/Support/Unix/Threading.inc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 78ef46cd1a4c..51a39ec755ef 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/llvm/lib/Support/Unix/Threading.inc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/llvm/lib/Support/Unix/Threading.inc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -258,7 +258,7 @@ SetThreadPriorityResult llvm::set_thread_priority(ThreadPriority Priority) {
</span> &priority)
? SetThreadPriorityResult::SUCCESS
: SetThreadPriorityResult::FAILURE;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,5 +25,5 @@ index e8f9a13860f..e731f750c1d 100644
</span> // When setting a thread into background state the scheduling priority is set
// to lowest value, disk and network IO are throttled. Network IO will be
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.21.0 (Apple Git-120)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.37.2
</span>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/clang-11-bootstrap/files/0005-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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index e27ac85a716..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/clang-11-bootstrap/files/0005-Threading-Only-call-pthread_setname_np-on-SnowLeopar.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,28 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From fc3f9d69c4a99764af0885335c10e5286be351e9 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Wed, 27 Dec 2017 23:05:43 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 5/6] Threading: Only call pthread_setname_np() on SnowLeopard+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lib/Support/Unix/Threading.inc | 3 +++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 3 insertions(+)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git llvm_master/lib/Support/Unix/Threading.inc macports_master/lib/Support/Unix/Threading.inc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index ed9a9656305..e8f9a13860f 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- llvm_master/lib/Support/Unix/Threading.inc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ macports_master/lib/Support/Unix/Threading.inc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -153,8 +154,10 @@ void llvm::set_thread_name(const Twine &Name) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ::pthread_setname_np(::pthread_self(), "%s",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const_cast<char *>(NameStr.data()));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if HAVE_PTHREAD_SETNAME_NP
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ::pthread_setname_np(NameStr.data());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void llvm::get_thread_name(SmallVectorImpl<char> &Name) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.21.0 (Apple Git-120)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><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/0006-dsymutil-fix-build-on-Leopard.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..8d4f597d641
</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/0006-dsymutil-fix-build-on-Leopard.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,37 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 5c8e4506fec66f1534026763fe13ad0cba2b8cce 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 13:45:22 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 06/30] dsymutil: fix build on Leopard
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- alias `CFPropertyListCreateWithStream` to `CFPropertyListCreateFromStream`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- add a workable definition for `uuid_string_t`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ llvm/tools/dsymutil/SymbolMap.cpp | 10 ++++++++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 10 insertions(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/llvm/tools/dsymutil/SymbolMap.cpp b/llvm/tools/dsymutil/SymbolMap.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index abf7557ca61e..0a17451e5809 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/llvm/tools/dsymutil/SymbolMap.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/llvm/tools/dsymutil/SymbolMap.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -17,8 +17,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <CoreFoundation/CoreFoundation.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <uuid/uuid.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if (__APPLE__ && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1060)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* declare a missing reference not found in SDK < 10.6 for function called below */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++typedef char * uuid_string_t;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++typedef struct __CFError * CFErrorRef;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define CFPropertyListCreateWithStream(A,B,C,D,E,F) CFPropertyListCreateFromStream(A,B,C,D,E,F)
</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;'>+ #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;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace llvm {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace dsymutil {
</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;'>+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/0007-lib-Support-Unix-Path.inc-define-COPYFILE_CLONE-if-n.patch b/lang/clang-11-bootstrap/files/0007-lib-Support-Unix-Path.inc-define-COPYFILE_CLONE-if-n.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..5e6d8e79b69
</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/0007-lib-Support-Unix-Path.inc-define-COPYFILE_CLONE-if-n.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,27 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 2cfd4958c90fee68b2e0c1d2b19dbcde0589d165 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 13:49:38 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 07/30] lib/Support/Unix/Path.inc: define COPYFILE_CLONE if
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ needed
</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;'>+ llvm/lib/Support/Unix/Path.inc | 3 +++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 3 insertions(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/llvm/lib/Support/Unix/Path.inc b/llvm/lib/Support/Unix/Path.inc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index d91b269cc6d3..9be4eac0a1b5 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/llvm/lib/Support/Unix/Path.inc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/llvm/lib/Support/Unix/Path.inc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -38,6 +38,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <mach-o/dyld.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/attr.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <copyfile.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef COPYFILE_CLONE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define COPYFILE_CLONE (1<<24)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif defined(__FreeBSD__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <osreldate.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if __FreeBSD_version >= 1300057
</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/0007-patch-llvm8-tools-dsymutil-symbolmap-use-older-cfname-and-fix-uuid-on-leopard.diff b/lang/clang-11-bootstrap/files/0007-patch-llvm8-tools-dsymutil-symbolmap-use-older-cfname-and-fix-uuid-on-leopard.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 122d21e7d05..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/clang-11-bootstrap/files/0007-patch-llvm8-tools-dsymutil-symbolmap-use-older-cfname-and-fix-uuid-on-leopard.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,23 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/tools/dsymutil/SymbolMap.cpp b/tools/dsymutil/SymbolMap.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index cab9374a..5c2377e4 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/tools/dsymutil/SymbolMap.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/tools/dsymutil/SymbolMap.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -18,8 +18,18 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <CoreFoundation/CoreFoundation.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <uuid/uuid.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* declare a missing reference not found in SDK < 10.6 for function called below */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+typedef char * uuid_string_t;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+typedef struct __CFError * CFErrorRef;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define CFPropertyListCreateWithStream(A,B,C,D,E,F) CFPropertyListCreateFromStream(A,B,C,D,E,F)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- namespace llvm {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- namespace dsymutil {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/clang-11-bootstrap/files/1002-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch b/lang/clang-11-bootstrap/files/0008-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch
</span>similarity index 54%
rename from lang/clang-11-bootstrap/files/1002-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch
rename to lang/clang-11-bootstrap/files/0008-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch
<span style='display:block; white-space:pre;color:#808080;'>index b96c3c393e8..5e0940e3a4e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/clang-11-bootstrap/files/1002-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/0008-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +1,19 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From c391f668b5a767a3d003cf3fc7b8b4e7a321a06e Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From f72dcedd7fdd2fb50368770770235387ca661f5e 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 1002/1007] MacPorts Only: Fix name of scan-view executable
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- inside scan-build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 08/30] MacPorts Only: Fix name of scan-view executable inside
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ scan-build
</span>
http://trac.macports.org/ticket/35006
<span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ clang/tools/scan-build/bin/scan-build | 2 ++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 2 insertions(+)
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- llvm/tools/clang/tools/scan-build/bin/scan-build.orig 2020-05-06 08:57:03.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ llvm/tools/clang/tools/scan-build/bin/scan-build 2020-05-07 12:22:47.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -969,6 +969,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/clang/tools/scan-build/bin/scan-build b/clang/tools/scan-build/bin/scan-build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 11334a0b9626..e4194b6a762c 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/clang/tools/scan-build/bin/scan-build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/clang/tools/scan-build/bin/scan-build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -969,6 +969,8 @@ sub Finalize {
</span> if ($Options{ViewResults} and -r "$Options{OutputDir}/index.html") {
Diag "Viewing analysis results in '$Options{OutputDir}' using scan-view.\n";
my $ScanView = Cwd::realpath("$RealBin/scan-view");
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,4 +21,7 @@ http://trac.macports.org/ticket/35006
</span> + if (! -x $ScanView) { $ScanView = Cwd::realpath("$RealBin/../scan-view/scan-view"); }
if (! -x $ScanView) { $ScanView = "scan-view"; }
if (! -x $ScanView) { $ScanView = Cwd::realpath("$RealBin/../../scan-view/bin/scan-view"); }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- exec $ScanView, "$Options{OutputDir}";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (! -x $ScanView) { $ScanView = `which scan-view`; chomp $ScanView; }
</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/0008-patch-lib-support-unix-path-copyfileclone-on-older-systems.diff b/lang/clang-11-bootstrap/files/0008-patch-lib-support-unix-path-copyfileclone-on-older-systems.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index d3523285757..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/clang-11-bootstrap/files/0008-patch-lib-support-unix-path-copyfileclone-on-older-systems.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git trunk/lib/Support/Unix/Path.inc.orig trunk/lib/Support/Unix/Path.inc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index c64c0df..aaa2226 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- trunk/lib/Support/Unix/Path.inc.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ trunk/lib/Support/Unix/Path.inc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -38,6 +38,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @@ -38,6 +38,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <mach-o/dyld.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <sys/attr.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <copyfile.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef COPYFILE_CLONE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define COPYFILE_CLONE (1<<24)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif defined(__FreeBSD__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <osreldate.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if __FreeBSD_version >= 1300057
</span><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/0009-default-to-libcxx-on-all-systems.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..a1d5b1b131f
</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/0009-default-to-libcxx-on-all-systems.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,27 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From a88f5d4392319dca350ac8e0a064bb638f5372e4 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 02:07:11 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 09/30] default to libcxx on all systems
</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;'>+ clang/lib/Driver/ToolChains/Darwin.cpp | 4 ++--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 2 insertions(+), 2 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/clang/lib/Driver/ToolChains/Darwin.cpp b/clang/lib/Driver/ToolChains/Darwin.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 7b879f8cb652..445fd4ec0096 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/clang/lib/Driver/ToolChains/Darwin.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/clang/lib/Driver/ToolChains/Darwin.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -794,8 +794,8 @@ types::ID MachO::LookupTypeForExtension(StringRef Ext) const {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool MachO::HasNativeLLVMSupport() const { return true; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ToolChain::CXXStdlibType Darwin::GetDefaultCXXStdlibType() const {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- // Default to use libc++ on OS X 10.9+ and iOS 7+.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if ((isTargetMacOS() && !isMacosxVersionLT(10, 9)) ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // Default to use libc++ on OS X 10.4+ and iOS 7+.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if ((isTargetMacOS() && !isMacosxVersionLT(10, 4)) ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (isTargetIOSBased() && !isIPhoneOSVersionLT(7, 0)) ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ isTargetWatchOSBased())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return ToolChain::CST_Libcxx;
</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/1004-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch b/lang/clang-11-bootstrap/files/0010-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch
</span>similarity index 60%
rename from lang/clang-11-bootstrap/files/1004-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch
rename to lang/clang-11-bootstrap/files/0010-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch
<span style='display:block; white-space:pre;color:#808080;'>index 83fedd24c0b..07e4bc4c06a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/clang-11-bootstrap/files/1004-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/0010-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,19 +1,19 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From a4f95a5ec1e6d615dbb246d3577735a3575d1179 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 01ab4522b251b04573470de692f5fb423aa4ea03 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 1004/1007] Default to fragile ObjC runtime when targeting
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 10/30] 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;background:#ffe0e0;'>- lib/Driver/ToolChains/Darwin.h | 6 ++++--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ clang/lib/Driver/ToolChains/Darwin.h | 6 ++++--
</span> 1 file changed, 4 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git llvm_master/tools/clang/lib/Driver/ToolChains/Darwin.h macports_master/tools/clang/lib/Driver/ToolChains/Darwin.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 2dc7c85880..639853df05 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- llvm_master/tools/clang/lib/Driver/ToolChains/Darwin.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ macports_master/tools/clang/lib/Driver/ToolChains/Darwin.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -229,8 +229,10 @@ public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/clang/lib/Driver/ToolChains/Darwin.h b/clang/lib/Driver/ToolChains/Darwin.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 64c252efea7d..74433dc05cce 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/clang/lib/Driver/ToolChains/Darwin.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/clang/lib/Driver/ToolChains/Darwin.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -227,8 +227,10 @@ public:
</span> bool IsEncodeExtendedBlockSignatureDefault() const override { return true; }
bool IsObjCNonFragileABIDefault() const override {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,5 +27,5 @@ index 2dc7c85880..639853df05 100644
</span>
bool UseObjCMixedDispatch() const override { return true; }
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.21.0 (Apple Git-120)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.37.2
</span>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/clang-11-bootstrap/files/1005-Fixup-libstdc-header-search-paths-for-older-versions.patch b/lang/clang-11-bootstrap/files/0011-Fixup-libstdc-header-search-paths-for-older-versions.patch
</span>similarity index 68%
rename from lang/clang-11-bootstrap/files/1005-Fixup-libstdc-header-search-paths-for-older-versions.patch
rename to lang/clang-11-bootstrap/files/0011-Fixup-libstdc-header-search-paths-for-older-versions.patch
<span style='display:block; white-space:pre;color:#808080;'>index f26118e36fc..8c2b465a858 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/clang-11-bootstrap/files/1005-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/0011-Fixup-libstdc-header-search-paths-for-older-versions.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From c5863b6661267780e20f529edf4831e1e65aa6a3 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 3a124cfa094064ee2b4bb282b904bae646db0514 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 1005/1007] Fixup libstdc++ header search paths for older
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- versions of Mac OS X
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 11/30] Fixup libstdc++ header search paths for older versions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ of Mac OS X
</span>
The subpaths were removed in Lion. Leopard and Snow Leopard had darwin8
symlinks for compatibility.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,14 +11,14 @@ https://llvm.org/bugs/show_bug.cgi?id=30858
</span>
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
---
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lib/Driver/ToolChains/Darwin.cpp | 4 ++--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ clang/lib/Driver/ToolChains/Darwin.cpp | 4 ++--
</span> 1 file changed, 2 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git llvm_master/tools/clang/lib/Driver/ToolChains/Darwin.cpp macports_master/tools/clang/lib/Driver/ToolChains/Darwin.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 5de7d7132d..165a331fe5 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- llvm_master/tools/clang/lib/Driver/ToolChains/Darwin.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ macports_master/tools/clang/lib/Driver/ToolChains/Darwin.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1958,7 +1958,7 @@ void DarwinClang::AddClangCXXStdlibIncludeArgs(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/clang/lib/Driver/ToolChains/Darwin.cpp b/clang/lib/Driver/ToolChains/Darwin.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 445fd4ec0096..d9dde5adc24c 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/clang/lib/Driver/ToolChains/Darwin.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/clang/lib/Driver/ToolChains/Darwin.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2055,7 +2055,7 @@ void DarwinClang::AddClangCXXStdlibIncludeArgs(
</span> "powerpc-apple-darwin10",
arch == llvm::Triple::ppc64 ? "ppc64" : "");
IsBaseFound |= AddGnuCPlusPlusIncludePaths(DriverArgs, CC1Args, UsrIncludeCxx,
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,7 +27,7 @@ index 5de7d7132d..165a331fe5 100644
</span> arch == llvm::Triple::ppc64 ? "ppc64" : "");
break;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1970,7 +1970,7 @@ void DarwinClang::AddClangCXXStdlibIncludeArgs(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2067,7 +2067,7 @@ void DarwinClang::AddClangCXXStdlibIncludeArgs(
</span> arch == llvm::Triple::x86_64 ? "x86_64" : "");
IsBaseFound |= AddGnuCPlusPlusIncludePaths(DriverArgs, CC1Args, UsrIncludeCxx,
"4.0.0", "i686-apple-darwin8",
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,5 +37,5 @@ index 5de7d7132d..165a331fe5 100644
</span>
case llvm::Triple::arm:
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.21.0 (Apple Git-120)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.37.2
</span>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/clang-11-bootstrap/files/1007-Fix-float.h-to-work-on-Snow-Leopard-and-earlier.patch b/lang/clang-11-bootstrap/files/0012-Fix-float.h-to-work-on-Snow-Leopard-and-earlier.patch
</span>similarity index 68%
rename from lang/clang-11-bootstrap/files/1007-Fix-float.h-to-work-on-Snow-Leopard-and-earlier.patch
rename to lang/clang-11-bootstrap/files/0012-Fix-float.h-to-work-on-Snow-Leopard-and-earlier.patch
<span style='display:block; white-space:pre;color:#808080;'>index c9bc6a47b15..2679c592c20 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/clang-11-bootstrap/files/1007-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/0012-Fix-float.h-to-work-on-Snow-Leopard-and-earlier.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,20 +1,20 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From eae229c3da65a256c168f3e36e00448812acbf9c Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 78367ce6e33d5e9422cebc3ecd9d3829c0ccaac1 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 1007/1007] Fix float.h to work on Snow Leopard and earlier
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 12/30] 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
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
---
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lib/Headers/float.h | 7 ++++++-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ clang/lib/Headers/float.h | 7 ++++++-
</span> 1 file changed, 6 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git llvm_master/tools/clang/lib/Headers/float.h macports_master/tools/clang/lib/Headers/float.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index ed610b24aa..9dc3c0a12a 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- llvm_master/tools/clang/lib/Headers/float.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ macports_master/tools/clang/lib/Headers/float.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/clang/lib/Headers/float.h b/clang/lib/Headers/float.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index ed610b24aa10..9dc3c0a12a03 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/clang/lib/Headers/float.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/clang/lib/Headers/float.h
</span> @@ -17,7 +17,12 @@
* Also fall back on Darwin to allow additional definitions and
* implementation-defined values.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,5 +30,5 @@ index ed610b24aa..9dc3c0a12a 100644
</span>
/* Prior to Apple's 10.7 SDK, float.h SDK header used to apply an extra level
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.21.0 (Apple Git-120)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.37.2
</span>
<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/0013-compiler-rt-add-some-defs-missing-in-older-SDKs.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..988b61f9e35
</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/0013-compiler-rt-add-some-defs-missing-in-older-SDKs.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,48 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 725ff9353c26cd0c0867be190af24a2cec7e542b 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 13:57:02 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 13/30] compiler-rt: add some defs missing in older SDKs
</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/FuzzerUtilDarwin.cpp | 8 ++++++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler-rt/lib/sanitizer_common/sanitizer_mac.cpp | 5 +++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2 files changed, 13 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/FuzzerUtilDarwin.cpp b/compiler-rt/lib/fuzzer/FuzzerUtilDarwin.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index a5bed658a446..b853462df3d2 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/compiler-rt/lib/fuzzer/FuzzerUtilDarwin.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/compiler-rt/lib/fuzzer/FuzzerUtilDarwin.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -19,6 +19,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/wait.h>
</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;'>++// add definition missing on older systems
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef POSIX_SPAWN_SETSIGMASK
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define POSIX_SPAWN_SETSIGMASK 0x0008
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef POSIX_SPAWN_SETSIGDEF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define POSIX_SPAWN_SETSIGDEF 0x0004
</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;'>+ // There is no header for this on macOS so declare here
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern "C" char **environ;
</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/sanitizer_common/sanitizer_mac.cpp b/compiler-rt/lib/sanitizer_common/sanitizer_mac.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 7a3dfbcc2760..651fe0c35625 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/compiler-rt/lib/sanitizer_common/sanitizer_mac.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/compiler-rt/lib/sanitizer_common/sanitizer_mac.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -110,6 +110,11 @@ extern "C" int __munmap(void *, size_t) SANITIZER_WEAK_ATTRIBUTE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define VM_MEMORY_SANITIZER 99
</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;'>++// From <sys/spawn.h> but not in some SDKs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef POSIX_SPAWN_CLOEXEC_DEFAULT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define POSIX_SPAWN_CLOEXEC_DEFAULT 0x4000
</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;'>+ // XNU on Darwin provides a mmap flag that optimizes allocation/deallocation of
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // giant memory regions (i.e. shadow memory regions).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define kXnuFastMmapFd 0x4
</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/2002-Work-around-no-libdispatch-on-10.6.patch b/lang/clang-11-bootstrap/files/0014-10.5-and-less-compiler-rt-work-around-no-libdispatch.patch
</span>similarity index 58%
rename from lang/clang-11-bootstrap/files/2002-Work-around-no-libdispatch-on-10.6.patch
rename to lang/clang-11-bootstrap/files/0014-10.5-and-less-compiler-rt-work-around-no-libdispatch.patch
<span style='display:block; white-space:pre;color:#808080;'>index 961e37dcf7c..a927ab2dd3c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/clang-11-bootstrap/files/2002-Work-around-no-libdispatch-on-10.6.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/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:#e0e0e0;'>@@ -1,20 +1,24 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 2002/2002] Work around no libdispatch on < 10.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From a5053ae4d346bb9312bc2906d84edcef21ee1c02 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 14:03:50 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 14/30] 10.5 and less: compiler-rt work around no libdispatch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ before 10.6
</span>
---
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lib/builtins/os_version_check.c | 13 ++++++++++++-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler-rt/lib/builtins/os_version_check.c | 13 ++++++++++++-
</span> 1 file changed, 12 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git llvm_master/projects/compiler-rt/lib/builtins/os_version_check.c macports_master/projects/compiler-rt/lib/builtins/os_version_check.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 3794b9794..e3877449a 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- llvm_master/projects/compiler-rt/lib/builtins/os_version_check.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ macports_master/projects/compiler-rt/lib/builtins/os_version_check.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/compiler-rt/lib/builtins/os_version_check.c b/compiler-rt/lib/builtins/os_version_check.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 3794b979434c..553e809a492c 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/compiler-rt/lib/builtins/os_version_check.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/compiler-rt/lib/builtins/os_version_check.c
</span> @@ -13,8 +13,11 @@
#ifdef __APPLE__
+#include <AvailabilityMacros.h>
#include <TargetConditionals.h>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if (__APPLE__ && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 1060)
</span> #include <dispatch/dispatch.h>
+#endif
#include <dlfcn.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,7 +29,7 @@ index 3794b9794..e3877449a 100644
</span> // These three variables hold the host's OS version.
static int32_t GlobalMajor, GlobalMinor, GlobalSubminor;
-static dispatch_once_t DispatchOnceCounter;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if (__APPLE__ && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 1060)
</span> + static dispatch_once_t DispatchOnceCounter;
+#endif
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,7 +39,7 @@ index 3794b9794..e3877449a 100644
</span>
int32_t __isOSVersionAtLeast(int32_t Major, int32_t Minor, int32_t Subminor) {
// Populate the global version variables, if they haven't already.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if (__APPLE__ && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 1060)
</span> dispatch_once_f(&DispatchOnceCounter, NULL, parseSystemVersionPList);
+#else
+ /* expensive procedure, only do once. GlobalMajor will not be 0 once run. */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,5 +50,5 @@ index 3794b9794..e3877449a 100644
</span> if (Major < GlobalMajor)
return 1;
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.21.0 (Apple Git-120)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.37.2
</span>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/clang-11-bootstrap/files/3001-Fix-missing-long-long-math-prototypes-when-using-the.patch b/lang/clang-11-bootstrap/files/0015-Fix-missing-long-long-math-prototypes-when-using-the.patch
</span>similarity index 66%
rename from lang/clang-11-bootstrap/files/3001-Fix-missing-long-long-math-prototypes-when-using-the.patch
rename to lang/clang-11-bootstrap/files/0015-Fix-missing-long-long-math-prototypes-when-using-the.patch
<span style='display:block; white-space:pre;color:#808080;'>index 4d2e8f07d71..4d89a5c152d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/clang-11-bootstrap/files/3001-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/0015-Fix-missing-long-long-math-prototypes-when-using-the.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,19 +1,19 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From f632702961bff5e226cc09aa9f992e53b95697b2 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From baab9ce787d30d3481311946d5db4281263b2cd5 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 3001/3002] Fix missing long long math prototypes when using
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- the Snow Leopard SDK
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 15/30] Fix missing long long math prototypes when using the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Snow Leopard SDK
</span>
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
---
<span style='display:block; white-space:pre;background:#ffe0e0;'>- include/math.h | 26 ++++++++++++++++++++++++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libcxx/include/math.h | 26 ++++++++++++++++++++++++++
</span> 1 file changed, 26 insertions(+)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git llvm_master/projects/libcxx/include/math.h macports_master/projects/libcxx/include/math.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 194df2077..14d14fe08 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- llvm_master/projects/libcxx/include/math.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ macports_master/projects/libcxx/include/math.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -302,6 +302,32 @@ long double truncl(long double x);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/libcxx/include/math.h b/libcxx/include/math.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 1603d5748e2d..d64e6a52ccd3 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/libcxx/include/math.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/libcxx/include/math.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -299,6 +299,32 @@ long double truncl(long double x);
</span>
#include_next <math.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,5 +47,5 @@ index 194df2077..14d14fe08 100644
</span>
// We support including .h headers inside 'extern "C"' contexts, so switch
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.21.0 (Apple Git-120)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.37.2
</span>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/clang-11-bootstrap/files/3002-implement-atomic-using-mutex-lock_guard-for-64b-ops-.patch b/lang/clang-11-bootstrap/files/0016-implement-atomic-using-mutex-lock_guard-for-64b-ops-.patch
</span>similarity index 93%
rename from lang/clang-11-bootstrap/files/3002-implement-atomic-using-mutex-lock_guard-for-64b-ops-.patch
rename to lang/clang-11-bootstrap/files/0016-implement-atomic-using-mutex-lock_guard-for-64b-ops-.patch
<span style='display:block; white-space:pre;color:#808080;'>index 2a8ae64c330..2c94f125461 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/clang-11-bootstrap/files/3002-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/0016-implement-atomic-using-mutex-lock_guard-for-64b-ops-.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,20 +1,20 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 6c90424e035a24f3653b1b44f7239925b9e932ac Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 521a9ef073b9c3aab49e4811a7aac7cb5684302a 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 3002/3002] implement atomic<> using mutex/lock_guard for 64b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ops on 32b PPC not pretty, not fast, but passes atomic tests
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 16/30] implement atomic<> using mutex/lock_guard for 64b ops
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ on 32b PPC not pretty, not fast, but passes atomic tests
</span>
---
<span style='display:block; white-space:pre;background:#ffe0e0;'>- include/__atomic_locked | 240 ++++++++++++++++++++++++++++++++++++++++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include/atomic | 46 ++++++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libcxx/include/__atomic_locked | 240 +++++++++++++++++++++++++++++++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libcxx/include/atomic | 46 +++++++
</span> 2 files changed, 286 insertions(+)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- create mode 100644 include/__atomic_locked
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ create mode 100644 libcxx/include/__atomic_locked
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git llvm_master/projects/libcxx/include/__atomic_locked macports_master/projects/libcxx/include/__atomic_locked
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/libcxx/include/__atomic_locked b/libcxx/include/__atomic_locked
</span> new file mode 100644
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 000000000..f10dd747e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 000000000000..f10dd747e878
</span> --- /dev/null
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ macports_master/projects/libcxx/include/__atomic_locked
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/libcxx/include/__atomic_locked
</span> @@ -0,0 +1,240 @@
+// -*- C++ -*-
+//===--------------------------- __atomic_locked --------------------------===//
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -256,11 +256,11 @@ index 000000000..f10dd747e
</span> +_LIBCPP_END_NAMESPACE_STD
+
+#endif // _LIBCPP_ATOMIC_LOCKED
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git llvm_master/projects/libcxx/include/atomic macports_master/projects/libcxx/include/atomic
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index afb431eda..b87307977 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- llvm_master/projects/libcxx/include/atomic
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ macports_master/projects/libcxx/include/atomic
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2439,4 +2439,50 @@ typedef atomic<uintmax_t> atomic_uintmax_t;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/libcxx/include/atomic b/libcxx/include/atomic
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 9c2898653788..c053b2e6ec11 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/libcxx/include/atomic
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/libcxx/include/atomic
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2785,4 +2785,50 @@ typedef atomic<__libcpp_unsigned_lock_free> atomic_unsigned_lock_free;
</span>
_LIBCPP_END_NAMESPACE_STD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -312,5 +312,5 @@ index afb431eda..b87307977 100644
</span> +
#endif // _LIBCPP_ATOMIC
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.21.0 (Apple Git-120)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.37.2
</span>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/clang-11-bootstrap/files/3003-patch-libcxx-chrono-restore-steadyclock-fallback.diff b/lang/clang-11-bootstrap/files/0017-libcxx-src-chrono.cpp-fix-build-by-older-SDKs.patch
</span>similarity index 79%
rename from lang/clang-11-bootstrap/files/3003-patch-libcxx-chrono-restore-steadyclock-fallback.diff
rename to lang/clang-11-bootstrap/files/0017-libcxx-src-chrono.cpp-fix-build-by-older-SDKs.patch
<span style='display:block; white-space:pre;color:#808080;'>index bf1363122a9..ac61e83f20a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/clang-11-bootstrap/files/3003-patch-libcxx-chrono-restore-steadyclock-fallback.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/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:#e0e0e0;'>@@ -1,7 +1,17 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/projects/libcxx/src/chrono.cpp b/projects/libcxx/src/chrono.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index f0a5d50..c7fbd90 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/projects/libcxx/src/chrono.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/projects/libcxx/src/chrono.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From aafa189ff29952d707a16887bdc239fea44b34fa 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 14:09:22 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 17/30] libcxx/src/chrono.cpp: fix build by older SDKs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+See: https://github.com/llvm/llvm-project/commit/babd3aefc9193b44ad0620a2cfd63ebb6ad7e952
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libcxx/src/chrono.cpp | 62 +++++++++++++++++++++++++++++++++++++++++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 62 insertions(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/libcxx/src/chrono.cpp b/libcxx/src/chrono.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index f0a5d50ddf77..c7fbd90f59e5 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/libcxx/src/chrono.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/libcxx/src/chrono.cpp
</span> @@ -33,6 +33,11 @@
# endif // !defined(CLOCK_REALTIME)
#endif // defined(_LIBCPP_WIN32API)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -85,3 +95,6 @@ index f0a5d50..c7fbd90 100644
</span>
#elif defined(_LIBCPP_WIN32API)
<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/leopard-no-asan.patch b/lang/clang-11-bootstrap/files/0018-compiler-rt-allow-build-before-10.7.patch
</span>similarity index 51%
rename from lang/clang-11-bootstrap/files/leopard-no-asan.patch
rename to lang/clang-11-bootstrap/files/0018-compiler-rt-allow-build-before-10.7.patch
<span style='display:block; white-space:pre;color:#808080;'>index 1f6fecb438e..a8259bfe8dc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/clang-11-bootstrap/files/leopard-no-asan.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/clang-11-bootstrap/files/0018-compiler-rt-allow-build-before-10.7.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,17 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/projects/compiler-rt/cmake/config-ix.cmake 2015-11-29 22:17:04.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/projects/compiler-rt/cmake/config-ix.cmake 2015-11-29 22:19:16.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -361,9 +361,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 1d555865624ccee4d5169701d9219ebe5f2b9975 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 14:11:06 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 18/30] compiler-rt: allow build before 10.7
</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 | 3 ---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 3 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 2edc1dabd90d..f0444eec0656 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;'>+@@ -394,9 +394,6 @@ if(APPLE)
</span> else()
set(SANITIZER_MIN_OSX_VERSION ${DEFAULT_SANITIZER_MIN_OSX_VERSION})
endif()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,3 +21,6 @@
</span> if(SANITIZER_MIN_OSX_VERSION VERSION_GREATER ${DEFAULT_SANITIZER_MIN_OSX_VERSION})
message(WARNING "macOS deployment target '${SANITIZER_MIN_OSX_VERSION}' is too new, setting to '${DEFAULT_SANITIZER_MIN_OSX_VERSION}' instead.")
set(SANITIZER_MIN_OSX_VERSION ${DEFAULT_SANITIZER_MIN_OSX_VERSION})
<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/5000-patch-compilerrtdarwinutils-find-macosxsdkversion.diff b/lang/clang-11-bootstrap/files/0019-compiler-rt-added-CMAKE_OSX_DEPLOYMENT_TARGET-fallba.patch
</span>similarity index 58%
rename from lang/clang-11-bootstrap/files/5000-patch-compilerrtdarwinutils-find-macosxsdkversion.diff
rename to lang/clang-11-bootstrap/files/0019-compiler-rt-added-CMAKE_OSX_DEPLOYMENT_TARGET-fallba.patch
<span style='display:block; white-space:pre;color:#808080;'>index 95737ab7dde..e6af6ca3d3a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/clang-11-bootstrap/files/5000-patch-compilerrtdarwinutils-find-macosxsdkversion.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/clang-11-bootstrap/files/0019-compiler-rt-added-CMAKE_OSX_DEPLOYMENT_TARGET-fallba.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,17 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/projects/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake.orig 2020-04-20 17:14:08.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/projects/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake 2020-04-20 17:31:44.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -66,15 +66,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 58fa36a5d60af1c8276b2fe658eb8c7d267e089a 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 14:13:11 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 19/30] compiler-rt: added CMAKE_OSX_DEPLOYMENT_TARGET fallback
</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;'>+ .../cmake/Modules/CompilerRTDarwinUtils.cmake | 14 +++++---------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 5 insertions(+), 9 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/Modules/CompilerRTDarwinUtils.cmake b/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index be8d7e733c7a..ab0b0a43f2b6 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -69,15 +69,6 @@ function(find_darwin_sdk_version var sdk_name)
</span> ERROR_FILE /dev/null
)
endif()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,7 +27,7 @@
</span> set(${var} ${var_internal} PARENT_SCOPE)
endfunction()
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -125,6 +116,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -128,6 +119,11 @@ function(darwin_test_archs os valid_archs)
</span> # binaries.
if ("${os}" STREQUAL "osx")
find_darwin_sdk_version(macosx_sdk_version "macosx")
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,3 +39,6 @@
</span> if ("${macosx_sdk_version}" VERSION_GREATER 10.15 OR "${macosx_sdk_version}" VERSION_EQUAL 10.15)
message(STATUS "Disabling i386 slice for ${valid_archs}")
list(REMOVE_ITEM archs "i386")
<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/5002-patch-toolchains-darwin-add-back-pre-10.6-link-libs.diff b/lang/clang-11-bootstrap/files/0020-add-back-runtime-libraries-used-on-10.4-and-10.5.patch
</span>similarity index 62%
rename from lang/clang-11-bootstrap/files/5002-patch-toolchains-darwin-add-back-pre-10.6-link-libs.diff
rename to lang/clang-11-bootstrap/files/0020-add-back-runtime-libraries-used-on-10.4-and-10.5.patch
<span style='display:block; white-space:pre;color:#808080;'>index a91b4cd4f6a..b0f44bb5dba 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/clang-11-bootstrap/files/5002-patch-toolchains-darwin-add-back-pre-10.6-link-libs.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/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:#e0e0e0;'>@@ -1,4 +1,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-add back runtime libraries used on 10.4 and 10.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 03726997b4287529e891be4eaebcc5f2e38a98be 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 14:14:50 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+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;'>+
</span> removed in https://github.com/llvm/llvm-project/commit/3434ade2b7ca351b61522f7da4b55070d811b83f
related, the following code used to add libclang_rt_10.4.a to Tiger, but this library
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,12 +14,15 @@ it may be easiest to just add Tiger functions to libclang_rt.osx.a directly
</span> // AddLinkRuntimeLib(Args, CmdArgs, "libclang_rt.10.4.a");
// else
// AddLinkRuntimeLib(Args, CmdArgs, "libclang_rt.osx.a");
<span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ clang/lib/Driver/ToolChains/Darwin.cpp | 6 ++++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 6 insertions(+)
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/tools/clang/lib/Driver/ToolChains/Darwin.cpp b/tools/clang/lib/Driver/ToolChains/Darwin.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index bea877ae9..26f1ad714 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/tools/clang/lib/Driver/ToolChains/Darwin.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/tools/clang/lib/Driver/ToolChains/Darwin.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1140,6 +1140,12 @@ void DarwinClang::AddLinkRuntimeLibArgs(const ArgList &Args,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/clang/lib/Driver/ToolChains/Darwin.cpp b/clang/lib/Driver/ToolChains/Darwin.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index d9dde5adc24c..2219c7a7374c 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/clang/lib/Driver/ToolChains/Darwin.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/clang/lib/Driver/ToolChains/Darwin.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1313,6 +1313,12 @@ void DarwinClang::AddLinkRuntimeLibArgs(const ArgList &Args,
</span> getTriple().getArch() != llvm::Triple::aarch64)
CmdArgs.push_back("-lgcc_s.1");
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,3 +35,6 @@ index bea877ae9..26f1ad714 100644
</span> AddLinkRuntimeLib(Args, CmdArgs, "builtins");
}
<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/patch-clang-fix-include-next-sysroot-cpp-headers.diff b/lang/clang-11-bootstrap/files/0021-Don-t-look-into-sysroot-for-C-headers-if-they-are-fo.patch
</span>similarity index 92%
rename from lang/clang-11-bootstrap/files/patch-clang-fix-include-next-sysroot-cpp-headers.diff
rename to lang/clang-11-bootstrap/files/0021-Don-t-look-into-sysroot-for-C-headers-if-they-are-fo.patch
<span style='display:block; white-space:pre;color:#808080;'>index 8f5d699f597..ec3b39295b5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/clang-11-bootstrap/files/patch-clang-fix-include-next-sysroot-cpp-headers.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/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:#e0e0e0;'>@@ -1,4 +1,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://reviews.llvm.org/D89001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 269a5610d1b39605b18fae4a2509cea7136b61da 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 14:17:11 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+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;'>+ found alongside the toolchain
</span>
Currently, Clang looks for libc++ headers alongside the installation
directory of Clang, and it also adds a search path for headers in the
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,10 +20,17 @@ relied on some libc++ headers being found in the sysroot suffered from
</span> the #include_next issue described above, which renders any libc++ header
basically useless.
<span style='display:block; white-space:pre;background:#e0ffe0;'>+See: https://reviews.llvm.org/D89001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ clang/lib/Driver/ToolChains/Darwin.cpp | 47 +++++---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .../Driver/darwin-header-search-libcxx.cpp | 101 ++++++++++++++----
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2 files changed, 112 insertions(+), 36 deletions(-)
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/tools/clang/lib/Driver/ToolChains/Darwin.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/tools/clang/lib/Driver/ToolChains/Darwin.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2021,21 +2021,42 @@ void DarwinClang::AddClangCXXStdlibIncludeArgs(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/clang/lib/Driver/ToolChains/Darwin.cpp b/clang/lib/Driver/ToolChains/Darwin.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 2219c7a7374c..cfce415edc86 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/clang/lib/Driver/ToolChains/Darwin.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/clang/lib/Driver/ToolChains/Darwin.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2027,21 +2027,42 @@ void DarwinClang::AddClangCXXStdlibIncludeArgs(
</span>
switch (GetCXXStdlibType(DriverArgs)) {
case ToolChain::CST_Libcxx: {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -75,8 +86,10 @@ basically useless.
</span> break;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/tools/clang/test/Driver/darwin-header-search-libcxx.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/tools/clang/test/Driver/darwin-header-search-libcxx.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/clang/test/Driver/darwin-header-search-libcxx.cpp b/clang/test/Driver/darwin-header-search-libcxx.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 6bdbbd11908a..4824525f1cf4 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/clang/test/Driver/darwin-header-search-libcxx.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/clang/test/Driver/darwin-header-search-libcxx.cpp
</span> @@ -13,39 +13,57 @@
// RUN: | FileCheck --check-prefix=CHECK-LIBCXX-NONE %s
// CHECK-LIBCXX-NONE: "{{[^"]*}}clang{{[^"]*}}" "-cc1"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -249,3 +262,6 @@ basically useless.
</span> +// RUN: --check-prefix=CHECK-LIBCXX-MISSING-BOTH %s
+// CHECK-LIBCXX-MISSING-BOTH: ignoring nonexistent directory "[[TOOLCHAIN]]/usr/bin/../include/c++/v1"
+// CHECK-LIBCXX-MISSING-BOTH: ignoring nonexistent directory "[[SYSROOT]]/usr/include/c++/v1"
<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/0022-disable-DirectoryWatcher-when-builds-by-GCC.patch b/lang/clang-11-bootstrap/files/0022-disable-DirectoryWatcher-when-builds-by-GCC.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..551578ca0f7
</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/0022-disable-DirectoryWatcher-when-builds-by-GCC.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,25 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 80306638b5236037345963ae1cff7bb0508ea672 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 15:11:27 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 22/30] disable DirectoryWatcher when builds 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;'>+ clang/lib/DirectoryWatcher/CMakeLists.txt | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 1 insertion(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/clang/lib/DirectoryWatcher/CMakeLists.txt b/clang/lib/DirectoryWatcher/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 5a8796982113..0a0111c3829d 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/clang/lib/DirectoryWatcher/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/clang/lib/DirectoryWatcher/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5,7 +5,7 @@ set(LLVM_LINK_COMPONENTS support)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(DIRECTORY_WATCHER_SOURCES DirectoryScanner.cpp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(DIRECTORY_WATCHER_LINK_LIBS "")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if(APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if(APPLE AND NOT CMAKE_CXX_COMPILER_ID MATCHES "GNU")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ check_include_files("CoreServices/CoreServices.h" HAVE_CORESERVICES)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(HAVE_CORESERVICES)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ list(APPEND DIRECTORY_WATCHER_SOURCES mac/DirectoryWatcher-mac.cpp)
</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/llvm-objdump-help-macho.diff b/lang/clang-11-bootstrap/files/0023-Use-for-long-options-in-help-text.patch
</span>similarity index 88%
rename from lang/clang-11-bootstrap/files/llvm-objdump-help-macho.diff
rename to lang/clang-11-bootstrap/files/0023-Use-for-long-options-in-help-text.patch
<span style='display:block; white-space:pre;color:#808080;'>index 9f8c8e173a5..be442e2696e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/clang-11-bootstrap/files/llvm-objdump-help-macho.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/clang-11-bootstrap/files/0023-Use-for-long-options-in-help-text.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,18 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Based on https://reviews.llvm.org/D92310
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From dfda3d4ec4ce2e857f256b008b48de6570f2de29 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 15:14:31 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 23/30] Use "--" for long options in --help text
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+See: https://reviews.llvm.org/D92310
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ llvm/tools/llvm-objdump/MachODump.cpp | 24 ++++++++++++------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ llvm/tools/llvm-objdump/llvm-objdump.cpp | 16 ++++++++--------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2 files changed, 20 insertions(+), 20 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> diff --git a/llvm/tools/llvm-objdump/MachODump.cpp b/llvm/tools/llvm-objdump/MachODump.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index c1d330bae133d..b3ec20f97c97b 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/tools/llvm-objdump/MachODump.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/tools/llvm-objdump/MachODump.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 6d46496ecd4e..a50de47b97f5 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/llvm/tools/llvm-objdump/MachODump.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/llvm/tools/llvm-objdump/MachODump.cpp
</span> @@ -107,70 +107,70 @@ static cl::opt<bool> NoLeadingHeaders("no-leading-headers",
cl::opt<bool> objdump::UniversalHeaders(
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -87,9 +97,9 @@ index c1d330bae133d..b3ec20f97c97b 100644
</span>
static cl::list<std::string>
diff --git a/llvm/tools/llvm-objdump/llvm-objdump.cpp b/llvm/tools/llvm-objdump/llvm-objdump.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index bb33d254370e6..96e936ec4e8f7 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/tools/llvm-objdump/llvm-objdump.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/tools/llvm-objdump/llvm-objdump.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 320bbb5d358b..c5378872fef5 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/llvm/tools/llvm-objdump/llvm-objdump.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/llvm/tools/llvm-objdump/llvm-objdump.cpp
</span> @@ -101,7 +101,7 @@ static cl::alias AllHeadersShort("x", cl::desc("Alias for --all-headers"),
static cl::opt<std::string>
ArchName("arch-name",
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -117,7 +127,7 @@ index bb33d254370e6..96e936ec4e8f7 100644
</span> cl::NotHidden, cl::Grouping,
cl::aliasopt(PrintSource));
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -335,11 +335,11 @@ static cl::alias DynamicSymbolTableShort("T",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -330,11 +330,11 @@ static cl::alias DynamicSymbolTableShort("T",
</span> cl::NotHidden, cl::Grouping,
cl::aliasopt(DynamicSymbolTable));
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -134,3 +144,6 @@ index bb33d254370e6..96e936ec4e8f7 100644
</span>
cl::opt<bool> objdump::UnwindInfo("unwind-info",
cl::desc("Display unwind information"),
<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/0024-compatibility-with-xar-on-macOS-10.5.patch b/lang/clang-11-bootstrap/files/0024-compatibility-with-xar-on-macOS-10.5.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..593b19ee93d
</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/0024-compatibility-with-xar-on-macOS-10.5.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,41 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From e5d8398c97690fd175174a83e4769bdb6df9cd1d 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 15:22:09 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 24/30] compatibility with xar on macOS 10.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+macOS 10.5 uses very old xar which has `xar_open` but misses
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+`xar_extract_tobuffersz`, update the check for `check_library_exists`.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ llvm/cmake/config-ix.cmake | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ llvm/include/llvm/Config/config.h.cmake | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2 files changed, 2 insertions(+), 2 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/llvm/cmake/config-ix.cmake b/llvm/cmake/config-ix.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 90e5d327c757..e329520de154 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/llvm/cmake/config-ix.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/llvm/cmake/config-ix.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -179,7 +179,7 @@ if (LLVM_ENABLE_ZLIB STREQUAL "FORCE_ON" AND NOT HAVE_LIBZ)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ message(FATAL_ERROR "Failed to configure zlib")
</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_library_exists(xar xar_open "" HAVE_LIBXAR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++check_library_exists(xar xar_extract_tobuffersz "" HAVE_LIBXAR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(HAVE_LIBXAR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(XAR_LIB xar)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/llvm/include/llvm/Config/config.h.cmake b/llvm/include/llvm/Config/config.h.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 9a682481ccaf..c37bcafb6a0f 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/llvm/include/llvm/Config/config.h.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/llvm/include/llvm/Config/config.h.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -211,7 +211,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Define if the setupterm() function is supported this platform. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #cmakedefine HAVE_TERMINFO ${HAVE_TERMINFO}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-/* Define if the xar_open() function is supported this platform. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* Define if the xar_extract_tobuffersz() function is supported this platform. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #cmakedefine HAVE_LIBXAR ${HAVE_LIBXAR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Define to 1 if you have the <termios.h> header file. */
</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/0025-clang-support-macports-libstdcxx.patch b/lang/clang-11-bootstrap/files/0025-clang-support-macports-libstdcxx.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..f3c5570adce
</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/0025-clang-support-macports-libstdcxx.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,107 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From c954e7ba5e554dba2c135a0fd03e212956c997b9 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 02:31:25 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 25/30] [clang] support macports-libstdcxx
</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;'>+ clang/include/clang/Driver/ToolChain.h | 1 +
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ clang/lib/Driver/ToolChain.cpp | 3 +++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ clang/lib/Driver/ToolChains/Darwin.cpp | 14 ++++++++++++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ clang/lib/Driver/ToolChains/Hexagon.cpp | 2 ++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ clang/lib/Frontend/InitHeaderSearch.cpp | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5 files changed, 21 insertions(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/clang/include/clang/Driver/ToolChain.h b/clang/include/clang/Driver/ToolChain.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 7495e08fe6e6..d3ce4ac51edb 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/clang/include/clang/Driver/ToolChain.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/clang/include/clang/Driver/ToolChain.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -93,6 +93,7 @@ public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ enum CXXStdlibType {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CST_Libcxx,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CST_MacPortsLibstdcxx,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CST_Libstdcxx
</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;'>+diff --git a/clang/lib/Driver/ToolChain.cpp b/clang/lib/Driver/ToolChain.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index b8c12fc9241a..e5eab65b6d6d 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/clang/lib/Driver/ToolChain.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/clang/lib/Driver/ToolChain.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -846,6 +846,8 @@ ToolChain::CXXStdlibType ToolChain::GetCXXStdlibType(const ArgList &Args) const{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return ToolChain::CST_Libcxx;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else if (LibName == "libstdc++")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return ToolChain::CST_Libstdcxx;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else if (LibName == "macports-libstdc++" || LibName == "libstdc++_macports")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return ToolChain::CST_MacPortsLibstdcxx;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else if (LibName == "platform")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return GetDefaultCXXStdlibType();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -937,6 +939,7 @@ void ToolChain::AddCXXStdlibLibArgs(const ArgList &Args,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case ToolChain::CST_Libstdcxx:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ case ToolChain::CST_MacPortsLibstdcxx:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CmdArgs.push_back("-lstdc++");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/clang/lib/Driver/ToolChains/Darwin.cpp b/clang/lib/Driver/ToolChains/Darwin.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index cfce415edc86..0a6c135a1086 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/clang/lib/Driver/ToolChains/Darwin.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/clang/lib/Driver/ToolChains/Darwin.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2066,6 +2066,16 @@ void DarwinClang::AddClangCXXStdlibIncludeArgs(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</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;'>++ case ToolChain::CST_MacPortsLibstdcxx: {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ bool IsBaseFoundMacPorts = AddGnuCPlusPlusIncludePaths(DriverArgs, CC1Args, llvm::StringRef("@@MACPORTS_GCC_INCLUDE_DIR@@"),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "@@MACPORTS_HOST_NAME@@",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @@MACPORTS_TEST_32_64@@);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (!IsBaseFoundMacPorts) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ getDriver().Diag(diag::warn_drv_libstdcxx_not_found);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case ToolChain::CST_Libstdcxx:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ llvm::SmallString<128> UsrIncludeCxx = Sysroot;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ llvm::sys::path::append(UsrIncludeCxx, "usr", "include", "c++");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2133,6 +2143,10 @@ void DarwinClang::AddCXXStdlibLibArgs(const ArgList &Args,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CmdArgs.push_back("-lc++");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ case ToolChain::CST_MacPortsLibstdcxx:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CmdArgs.push_back("@@MACPORTS_libstdc++@@");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case ToolChain::CST_Libstdcxx:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Unfortunately, -lstdc++ doesn't always exist in the standard search path;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // it was previously found in the gcc lib dir. However, for all the Darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/clang/lib/Driver/ToolChains/Hexagon.cpp b/clang/lib/Driver/ToolChains/Hexagon.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 775f6e1094fa..6710659ab224 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/clang/lib/Driver/ToolChains/Hexagon.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/clang/lib/Driver/ToolChains/Hexagon.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -641,6 +641,8 @@ HexagonToolChain::GetCXXStdlibType(const ArgList &Args) const {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return ToolChain::CST_Libstdcxx;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ StringRef Value = A->getValue();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (Value == "macports-libstdc++" || Value == "libstdc++_macports")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return ToolChain::CST_MacPortsLibstdcxx;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (Value != "libstdc++" && Value != "libc++")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ getDriver().Diag(diag::err_drv_invalid_stdlib_name) << A->getAsString(Args);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/clang/lib/Frontend/InitHeaderSearch.cpp b/clang/lib/Frontend/InitHeaderSearch.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index bc31445d6d08..abc3750edec0 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/clang/lib/Frontend/InitHeaderSearch.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/clang/lib/Frontend/InitHeaderSearch.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -108,7 +108,7 @@ static bool CanPrefixSysroot(StringRef Path) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if defined(_WIN32)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return !Path.empty() && llvm::sys::path::is_separator(Path[0]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return llvm::sys::path::is_absolute(Path);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return llvm::sys::path::is_absolute(Path) && Path.find("@@MACPORTS_GCC_INCLUDE_DIR@@")!=0;
</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;'>+--
</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/fix-build-clang-by-gcc10-on-yosemite.diff b/lang/clang-11-bootstrap/files/0026-fix-building-on-10.10-by-GCC-10.patch
</span>similarity index 51%
rename from lang/clang-11-bootstrap/files/fix-build-clang-by-gcc10-on-yosemite.diff
rename to lang/clang-11-bootstrap/files/0026-fix-building-on-10.10-by-GCC-10.patch
<span style='display:block; white-space:pre;color:#808080;'>index 579c8affa75..827b4ba7464 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/clang-11-bootstrap/files/fix-build-clang-by-gcc10-on-yosemite.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/clang-11-bootstrap/files/0026-fix-building-on-10.10-by-GCC-10.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,19 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/tools/dsymutil/CFBundle.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/tools/dsymutil/CFBundle.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 95f857a7b7fbd48be684b2e285975b2c9de89e1c 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 15:23:05 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 26/30] fix building on 10.10 by GCC 10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+macOS 10.10 Yosemite defines `dispatch_block_t` on the way that it can
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+be compiled by gcc 10; redefine in properly.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ llvm/tools/dsymutil/CFBundle.cpp | 10 ++++++++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ llvm/tools/dsymutil/SymbolMap.cpp | 10 ++++++++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2 files changed, 20 insertions(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/llvm/tools/dsymutil/CFBundle.cpp b/llvm/tools/dsymutil/CFBundle.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 0625afb18ab6..856bd36a727a 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/llvm/tools/dsymutil/CFBundle.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/llvm/tools/dsymutil/CFBundle.cpp
</span> @@ -9,6 +9,16 @@
#include "CFBundle.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,8 +31,10 @@
</span> #include "llvm/Support/FileSystem.h"
#include "llvm/Support/Path.h"
#include "llvm/Support/raw_ostream.h"
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/tools/dsymutil/SymbolMap.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/tools/dsymutil/SymbolMap.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/llvm/tools/dsymutil/SymbolMap.cpp b/llvm/tools/dsymutil/SymbolMap.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 0a17451e5809..50977d18865f 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/llvm/tools/dsymutil/SymbolMap.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/llvm/tools/dsymutil/SymbolMap.cpp
</span> @@ -15,6 +15,16 @@
#include "llvm/Support/WithColor.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,4 +51,7 @@
</span> +
#include <CoreFoundation/CoreFoundation.h>
#include <uuid/uuid.h>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #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;'>+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/5004-patch-libcxx-reexport-symbols-lionorgreater-only.diff b/lang/clang-11-bootstrap/files/0027-fix-build-of-shared-libc-.dylib-on-10.7.patch
</span>similarity index 65%
rename from lang/clang-11-bootstrap/files/5004-patch-libcxx-reexport-symbols-lionorgreater-only.diff
rename to lang/clang-11-bootstrap/files/0027-fix-build-of-shared-libc-.dylib-on-10.7.patch
<span style='display:block; white-space:pre;color:#808080;'>index 956c6f1fb51..1b583bf4580 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/clang-11-bootstrap/files/5004-patch-libcxx-reexport-symbols-lionorgreater-only.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/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:#e0e0e0;'>@@ -1,6 +1,19 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/projects/libcxx/src/CMakeLists.txt.orig 2021-02-21 12:43:30.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/projects/libcxx/src/CMakeLists.txt 2021-02-21 12:48:27.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -209,11 +209,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From f1fcaa8af403bf44a19e42789599c50849f768fc 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 15:27:16 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 27/30] fix build of shared libc++.dylib on < 10.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+reexported_symbols_list is not accepted on < 10.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+but reexport_library is, and that is what was used previously
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libcxx/src/CMakeLists.txt | 8 +++++---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 5 insertions(+), 3 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/libcxx/src/CMakeLists.txt b/libcxx/src/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 2001c09761d9..ee3f9a4ad0d7 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/libcxx/src/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/libcxx/src/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -209,11 +209,11 @@ if (LIBCXX_ENABLE_SHARED)
</span> if (LIBCXX_OSX_REEXPORT_LIBCXXABI_SYMBOLS)
target_link_libraries(cxx_shared PRIVATE
"-Wl,-unexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/../lib/libc++unexp.exp"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,7 +27,7 @@
</span> if ("${CMAKE_OSX_ARCHITECTURES}" MATCHES "^(armv6|armv7|armv7s)$")
target_link_libraries(cxx_shared PRIVATE "-Wl,-reexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/../lib/libc++abi-exceptions.sjlj.exp")
else()
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -222,7 +222,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -222,7 +222,9 @@ if (LIBCXX_ENABLE_SHARED)
</span> endif()
if (NOT LIBCXX_ENABLE_NEW_DELETE_DEFINITIONS)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,3 +38,6 @@
</span> endif()
endif()
<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-disable-Apple-libc-Availability-tests.patch b/lang/clang-11-bootstrap/files/0028-disable-Apple-libc-Availability-tests.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..ed24deb5353
</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-disable-Apple-libc-Availability-tests.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,30 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From db826a7a68cd1afbae824a7addb3ee4624635dd9 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 15:27:50 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 28/30] disable Apple libc++ Availability tests
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if we are using MacPort's installed libc++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+then Apple's availablilty tests for libcxx by OS version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+are no longer applicable
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libcxx/include/__config | 4 ++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 4 insertions(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/libcxx/include/__config b/libcxx/include/__config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 575147cead42..24cda6ddc31b 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/libcxx/include/__config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/libcxx/include/__config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -10,6 +10,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef _LIBCPP_CONFIG
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define _LIBCPP_CONFIG
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// for MacPorts, our installed libcxx does not require Apple system
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// Availability tests
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define _LIBCPP_DISABLE_AVAILABILITY
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if defined(_MSC_VER) && !defined(__clang__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define _LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
</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/leopard-no-blocks.patch b/lang/clang-11-bootstrap/files/0029-Leopard-Default-to-fno-blocks.patch
</span>similarity index 56%
rename from lang/clang-11-bootstrap/files/leopard-no-blocks.patch
rename to lang/clang-11-bootstrap/files/0029-Leopard-Default-to-fno-blocks.patch
<span style='display:block; white-space:pre;color:#808080;'>index 06d40c42e32..c4852287db0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/clang-11-bootstrap/files/leopard-no-blocks.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/clang-11-bootstrap/files/0029-Leopard-Default-to-fno-blocks.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,18 +1,18 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 2500edffc9f1f44983927351eb60d4fe1cee4bcd Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 6735953be051f2177a267a2ce365a9ce843a2976 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] Leopard: Default to -fno-blocks
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 29/30] Leopard: Default to -fno-blocks
</span>
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
---
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lib/Driver/ToolChains.h | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ clang/lib/Driver/ToolChains/Darwin.h | 2 +-
</span> 1 file changed, 1 insertion(+), 1 deletion(-)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/lib/Driver/ToolChains.h b/lib/Driver/ToolChains.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 876bb01..27aa2ee 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/tools/clang/lib/Driver/ToolChains/Darwin.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/tools/clang/lib/Driver/ToolChains/Darwin.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -257,7 +257,7 @@ public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/clang/lib/Driver/ToolChains/Darwin.h b/clang/lib/Driver/ToolChains/Darwin.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 74433dc05cce..d53b18fbc662 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/clang/lib/Driver/ToolChains/Darwin.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/clang/lib/Driver/ToolChains/Darwin.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -215,7 +215,7 @@ public:
</span> bool IsBlocksDefault() const override {
// Always allow blocks on Apple; users interested in versioning are
// expected to use /usr/include/Block.h.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,5 +22,5 @@ index 876bb01..27aa2ee 100644
</span> bool IsIntegratedAssemblerDefault() const override {
// Default integrated assembler to on for Apple's MachO targets.
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.2.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.37.2
</span>
<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/0030-Support-emulated-TLS-before-10.7.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..9d619fddebc
</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/0030-Support-emulated-TLS-before-10.7.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,53 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From a661169935ff72be001c1fa6228e62543d715df2 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 15:30:28 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 30/30] Support emulated TLS before 10.7
</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;'>+ clang/lib/Basic/Targets/OSTargets.h | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ clang/lib/CodeGen/ItaniumCXXABI.cpp | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ llvm/include/llvm/ADT/Triple.h | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3 files changed, 3 insertions(+), 3 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/clang/lib/Basic/Targets/OSTargets.h b/clang/lib/Basic/Targets/OSTargets.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 2a9e4f91d478..8e7cbd1198ef 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/clang/lib/Basic/Targets/OSTargets.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/clang/lib/Basic/Targets/OSTargets.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -92,7 +92,7 @@ public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ this->TLSSupported = false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (Triple.isMacOSX())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- this->TLSSupported = !Triple.isMacOSXVersionLT(10, 7);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ this->TLSSupported = !Triple.isMacOSXVersionLT(10, 4);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else if (Triple.isiOS()) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // 64-bit iOS supported it from 8 onwards, 32-bit device from 9 onwards,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // 32-bit simulator from 10 onwards.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/clang/lib/CodeGen/ItaniumCXXABI.cpp b/clang/lib/CodeGen/ItaniumCXXABI.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 80de2a6e3950..bead2ef211ad 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/clang/lib/CodeGen/ItaniumCXXABI.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/clang/lib/CodeGen/ItaniumCXXABI.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2485,7 +2485,7 @@ static void emitGlobalDtorWithCXAAtExit(CodeGenFunction &CGF,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const char *Name = "__cxa_atexit";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (TLS) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const llvm::Triple &T = CGF.getTarget().getTriple();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Name = T.isOSDarwin() ? "_tlv_atexit" : "__cxa_thread_atexit";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Name = (T.isOSDarwin() && !T.isMacOSXVersionLT(10, 7)) ? "_tlv_atexit" : "__cxa_thread_atexit";
</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;'>+ // We're assuming that the destructor function is something we can
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/llvm/include/llvm/ADT/Triple.h b/llvm/include/llvm/ADT/Triple.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 6bad18f19244..40ce1fac18c5 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/llvm/include/llvm/ADT/Triple.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/llvm/include/llvm/ADT/Triple.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -758,7 +758,7 @@ public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /// Tests whether the target uses emulated TLS as default.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool hasDefaultEmulatedTLS() const {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return isAndroid() || isOSOpenBSD() || isWindowsCygwinEnvironment();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return isAndroid() || isOSOpenBSD() || isWindowsCygwinEnvironment() || isMacOSXVersionLT(10, 7);
</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;'>+ /// @}
</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/1006-Fix-build-issues-pre-Lion-due-to-missing-a-strnlen-d.patch b/lang/clang-11-bootstrap/files/1006-Fix-build-issues-pre-Lion-due-to-missing-a-strnlen-d.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index fce3d3e1ab7..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/clang-11-bootstrap/files/1006-Fix-build-issues-pre-Lion-due-to-missing-a-strnlen-d.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,42 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 175e835fb2403a9fe6a620c9a663b3045547dfe6 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Tue, 20 Dec 2016 15:53:39 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1006/1007] Fix build issues pre-Lion due to missing a strnlen
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- definition
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://trac.macports.org/ticket/51520
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://llvm.org/bugs/show_bug.cgi?id=27714
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lib/Lex/HeaderMap.cpp | 14 ++++++++++++++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 14 insertions(+)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git llvm_master/tools/clang/lib/Lex/HeaderMap.cpp macports_master/tools/clang/lib/Lex/HeaderMap.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index e0bf58b675..1db3380602 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- llvm_master/tools/clang/lib/Lex/HeaderMap.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ macports_master/tools/clang/lib/Lex/HeaderMap.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -25,6 +25,20 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <memory>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- using namespace clang;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <Availability.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if __MAC_OS_X_VERSION_MIN_REQUIRED < 1070
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static size_t strnlen(const char *s, size_t maxlen) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ size_t l = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ while (l < maxlen && *s) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ l++;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ s++;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return l;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /// HashHMapKey - This is the 'well known' hash function required by the file
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /// format, used to look up keys in the hash table. The hash table uses simple
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /// linear probing based on this function.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.21.0 (Apple Git-120)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/clang-11-bootstrap/files/1008-compilerrt-fuzzer-missingdefs.diff b/lang/clang-11-bootstrap/files/1008-compilerrt-fuzzer-missingdefs.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 808b7a19a2e..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/clang-11-bootstrap/files/1008-compilerrt-fuzzer-missingdefs.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,17 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- llvm/projects/compiler-rt/lib/fuzzer/FuzzerUtilDarwin.cpp.orig 2020-05-14 15:23:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ llvm/projects/compiler-rt/lib/fuzzer/FuzzerUtilDarwin.cpp 2020-05-14 15:31:23.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -19,6 +19,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <sys/wait.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <unistd.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// add definition missing on older systems
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef POSIX_SPAWN_SETSIGMASK
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define POSIX_SPAWN_SETSIGMASK 0x0008
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef POSIX_SPAWN_SETSIGDEF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define POSIX_SPAWN_SETSIGDEF 0x0004
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // There is no header for this on macOS so declare here
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern "C" char **environ;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/clang-11-bootstrap/files/1009-compilerrt-sanitizer-missingdefs.diff b/lang/clang-11-bootstrap/files/1009-compilerrt-sanitizer-missingdefs.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index b7420d6c420..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/clang-11-bootstrap/files/1009-compilerrt-sanitizer-missingdefs.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- llvm/projects/compiler-rt/lib/sanitizer_common/sanitizer_mac.cpp.orig 2020-05-14 15:13:45.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ llvm/projects/compiler-rt/lib/sanitizer_common/sanitizer_mac.cpp 2020-05-14 15:17:03.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -111,6 +111,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define VM_MEMORY_SANITIZER 99
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// From <sys/spawn.h> but not in some SDKs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef POSIX_SPAWN_CLOEXEC_DEFAULT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define POSIX_SPAWN_CLOEXEC_DEFAULT 0x4000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // XNU on Darwin provides a mmap flag that optimizes allocation/deallocation of
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // giant memory regions (i.e. shadow memory regions).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define kXnuFastMmapFd 0x4
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/clang-11-bootstrap/files/5005-MacPorts-only-patch-libcxx-includes-disable-availability-tests.diff b/lang/clang-11-bootstrap/files/5005-MacPorts-only-patch-libcxx-includes-disable-availability-tests.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 6ada840f3e1..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/clang-11-bootstrap/files/5005-MacPorts-only-patch-libcxx-includes-disable-availability-tests.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- llvm-10.0.0.src/projects/libcxx/include/__config.orig 2020-04-28 09:59:15.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ llvm-10.0.0.src/projects/libcxx/include/__config 2020-04-28 10:00:33.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -10,6 +10,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifndef _LIBCPP_CONFIG
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define _LIBCPP_CONFIG
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// for MacPorts, our installed libcxx does not require Apple system
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// Availability tests
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define _LIBCPP_DISABLE_AVAILABILITY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if defined(_MSC_VER) && !defined(__clang__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # define _LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/clang-11-bootstrap/files/9000-patch-clang-7.0-support-emulated-tls.diff b/lang/clang-11-bootstrap/files/9000-patch-clang-7.0-support-emulated-tls.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0459630fd68..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/clang-11-bootstrap/files/9000-patch-clang-7.0-support-emulated-tls.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,26 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/tools/clang/lib/Basic/Targets/OSTargets.h b/tools/clang/lib/Basic/Targets/OSTargets.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index d0354784..102605fe 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/tools/clang/lib/Basic/Targets/OSTargets.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/tools/clang/lib/Basic/Targets/OSTargets.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -93,7 +93,7 @@ public:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- this->TLSSupported = false;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (Triple.isMacOSX())
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- this->TLSSupported = !Triple.isMacOSXVersionLT(10, 7);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ this->TLSSupported = !Triple.isMacOSXVersionLT(10, 4);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else if (Triple.isiOS()) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // 64-bit iOS supported it from 8 onwards, 32-bit device from 9 onwards,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // 32-bit simulator from 10 onwards.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/tools/clang/lib/CodeGen/ItaniumCXXABI.cpp b/tools/clang/lib/CodeGen/ItaniumCXXABI.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 00fff144..052924ab 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/tools/clang/lib/CodeGen/ItaniumCXXABI.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/tools/clang/lib/CodeGen/ItaniumCXXABI.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2255,7 +2255,7 @@ static void emitGlobalDtorWithCXAAtExit(CodeGenFunction &CGF,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const char *Name = "__cxa_atexit";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (TLS) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const llvm::Triple &T = CGF.getTarget().getTriple();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- Name = T.isOSDarwin() ? "_tlv_atexit" : "__cxa_thread_atexit";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Name = (T.isOSDarwin() && !T.isMacOSXVersionLT(10, 7)) ? "_tlv_atexit" : "__cxa_thread_atexit";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // We're assuming that the destructor function is something we can
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/clang-11-bootstrap/files/9000-patch-llvm-7.0-support-emulated-tls.diff b/lang/clang-11-bootstrap/files/9000-patch-llvm-7.0-support-emulated-tls.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index b96a36ee21a..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/clang-11-bootstrap/files/9000-patch-llvm-7.0-support-emulated-tls.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/include/llvm/ADT/Triple.h b/include/llvm/ADT/Triple.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index c95b16dd..ecc0f148 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/include/llvm/ADT/Triple.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/include/llvm/ADT/Triple.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -682,7 +682,7 @@ public:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /// Tests whether the target uses emulated TLS as default.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool hasDefaultEmulatedTLS() const {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return isAndroid() || isOSOpenBSD() || isWindowsCygwinEnvironment();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return isAndroid() || isOSOpenBSD() || isWindowsCygwinEnvironment() || isMacOSXVersionLT(10, 7);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /// @}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/clang-11-bootstrap/files/9001-macports-libstdcxx.diff b/lang/clang-11-bootstrap/files/9001-macports-libstdcxx.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index dbff9c9da3b..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/clang-11-bootstrap/files/9001-macports-libstdcxx.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,157 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- orig/tools/clang/include/clang/Lex/HeaderSearchOptions.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ new/tools/clang/include/clang/Lex/HeaderSearchOptions.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -184,6 +184,9 @@ public:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /// Use libc++ instead of the default libstdc++.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- unsigned UseLibcxx : 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /// Use MacPorts libstdc++ instead of default system libstdc++.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ unsigned UseMacPortsLibstdcxx : 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /// Whether header search information should be output as for -v.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- unsigned Verbose : 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- llvm/tools/clang/lib/Frontend/CompilerInvocation.cpp.orig 2020-05-06 08:57:03.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ llvm/tools/clang/lib/Frontend/CompilerInvocation.cpp 2020-05-07 12:51:38.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2078,8 +2078,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Opts.UseBuiltinIncludes = !Args.hasArg(OPT_nobuiltininc);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Opts.UseStandardSystemIncludes = !Args.hasArg(OPT_nostdsysteminc);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Opts.UseStandardCXXIncludes = !Args.hasArg(OPT_nostdincxx);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (const Arg *A = Args.getLastArg(OPT_stdlib_EQ))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (const Arg *A = Args.getLastArg(OPT_stdlib_EQ)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Opts.UseLibcxx = (strcmp(A->getValue(), "libc++") == 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Opts.UseMacPortsLibstdcxx = (strcmp(A->getValue(), "macports-libstdc++") == 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Opts.ResourceDir = std::string(Args.getLastArgValue(OPT_resource_dir));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Canonicalize -fmodules-cache-path before storing it.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- orig/tools/clang/lib/Frontend/InitHeaderSearch.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ new/tools/clang/lib/Frontend/InitHeaderSearch.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -110,7 +110,7 @@ static bool CanPrefixSysroot(StringRef Path) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if defined(_WIN32)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return !Path.empty() && llvm::sys::path::is_separator(Path[0]);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return llvm::sys::path::is_absolute(Path);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return llvm::sys::path::is_absolute(Path) && Path.find("@@MACPORTS_GCC_INCLUDE_DIR@@")!=0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- orig/tools/clang/include/clang/Driver/ToolChain.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ new/tools/clang/include/clang/Driver/ToolChain.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -91,7 +91,8 @@ public:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- enum CXXStdlibType {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CST_Libcxx,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CST_Libstdcxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CST_Libstdcxx,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CST_MacPortsLibstdcxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- enum RuntimeLibType {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- orig/tools/clang/lib/Driver/ToolChains/Darwin.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ new/tools/clang/lib/Driver/ToolChains/Darwin.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1921,8 +1921,9 @@ void DarwinClang::AddClangCXXStdlibInclu
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- llvm::StringRef Sysroot = GetHeaderSysroot(DriverArgs);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CXXStdlibType Type = GetCXXStdlibType(DriverArgs);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- switch (GetCXXStdlibType(DriverArgs)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ switch (Type) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case ToolChain::CST_Libcxx: {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // On Darwin, libc++ is installed alongside the compiler in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // include/c++/v1, so get from '<install>/bin' to '<install>/include/c++/v1'.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1943,6 +1944,7 @@ void DarwinClang::AddClangCXXStdlibInclu
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case ToolChain::CST_Libstdcxx:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ case ToolChain::CST_MacPortsLibstdcxx:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- llvm::SmallString<128> UsrIncludeCxx = Sysroot;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- llvm::sys::path::append(UsrIncludeCxx, "usr", "include", "c++");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1953,10 +1955,17 @@ void DarwinClang::AddClangCXXStdlibInclu
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case llvm::Triple::ppc:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case llvm::Triple::ppc64:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- IsBaseFound = AddGnuCPlusPlusIncludePaths(DriverArgs, CC1Args, UsrIncludeCxx,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "4.2.1",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "powerpc-apple-darwin10",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- arch == llvm::Triple::ppc64 ? "ppc64" : "");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ IsBaseFound = false;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (Type==ToolChain::CST_MacPortsLibstdcxx) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ IsBaseFound |= AddGnuCPlusPlusIncludePaths(DriverArgs, CC1Args, llvm::StringRef("@@MACPORTS_GCC_INCLUDE_DIR@@"),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "@@MACPORTS_HOST_NAME@@",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ arch == llvm::Triple::ppc64 ? "@@MACPORTS_GCC_SUBDIRECTORY_ppc64@@" : "@@MACPORTS_GCC_SUBDIRECTORY_ppc@@");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ IsBaseFound |= AddGnuCPlusPlusIncludePaths(DriverArgs, CC1Args, UsrIncludeCxx,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "4.2.1",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "powerpc-apple-darwin10",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ arch == llvm::Triple::ppc64 ? "ppc64" : "");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- IsBaseFound |= AddGnuCPlusPlusIncludePaths(DriverArgs, CC1Args, UsrIncludeCxx,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "4.0.0", "powerpc-apple-darwin8",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- arch == llvm::Triple::ppc64 ? "ppc64" : "");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1964,10 +1973,17 @@ void DarwinClang::AddClangCXXStdlibInclu
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case llvm::Triple::x86:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case llvm::Triple::x86_64:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- IsBaseFound = AddGnuCPlusPlusIncludePaths(DriverArgs, CC1Args, UsrIncludeCxx,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "4.2.1",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "i686-apple-darwin10",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- arch == llvm::Triple::x86_64 ? "x86_64" : "");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ IsBaseFound = false;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (Type==ToolChain::CST_MacPortsLibstdcxx) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ IsBaseFound = AddGnuCPlusPlusIncludePaths(DriverArgs, CC1Args, llvm::StringRef("@@MACPORTS_GCC_INCLUDE_DIR@@"),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "@@MACPORTS_HOST_NAME@@",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ arch == llvm::Triple::x86_64 ? "@@MACPORTS_GCC_SUBDIRECTORY_x86_64@@" : "@@MACPORTS_GCC_SUBDIRECTORY_i386@@");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ IsBaseFound |= AddGnuCPlusPlusIncludePaths(DriverArgs, CC1Args, UsrIncludeCxx,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "4.2.1",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "i686-apple-darwin10",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ arch == llvm::Triple::x86_64 ? "x86_64" : "");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- IsBaseFound |= AddGnuCPlusPlusIncludePaths(DriverArgs, CC1Args, UsrIncludeCxx,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "4.0.0", "i686-apple-darwin8",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- arch == llvm::Triple::x86_64 ? "x86_64" : "");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2010,6 +2026,12 @@ void DarwinClang::AddCXXStdlibLibArgs(co
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case ToolChain::CST_Libstdcxx:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ case ToolChain::CST_MacPortsLibstdcxx:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (Type==ToolChain::CST_MacPortsLibstdcxx && getVFS().exists("@@MACPORTS_libstdc++@@")) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CmdArgs.push_back("@@MACPORTS_libstdc++@@");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Unfortunately, -lstdc++ doesn't always exist in the standard search path;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // it was previously found in the gcc lib dir. However, for all the Darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // platforms we care about it was -lstdc++.6, so we search for that
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- orig/tools/clang/lib/Driver/ToolChains/Hexagon.cpp.orig 2020-05-06 08:57:03.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ new/tools/clang/lib/Driver/ToolChains/Hexagon.cpp 2020-05-07 12:43:10.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -639,6 +639,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return ToolChain::CST_Libstdcxx;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- StringRef Value = A->getValue();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (Value == "macports-libstdc++")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return ToolChain::CST_MacPortsLibstdcxx;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (Value != "libstdc++" && Value != "libc++")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- getDriver().Diag(diag::err_drv_invalid_stdlib_name) << A->getAsString(Args);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- orig/tools/clang/lib/Driver/ToolChain.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ new/tools/clang/lib/Driver/ToolChain.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -766,6 +766,8 @@ ToolChain::CXXStdlibType ToolChain::GetCXXStdlibType(const ArgList &Args) const{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return ToolChain::CST_Libcxx;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else if (LibName == "libstdc++")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return ToolChain::CST_Libstdcxx;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else if (LibName == "macports-libstdc++")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return ToolChain::CST_MacPortsLibstdcxx;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else if (LibName == "platform")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return GetDefaultCXXStdlibType();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -847,6 +849,7 @@ void ToolChain::AddCXXStdlibLibArgs(const ArgList &Args,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case ToolChain::CST_Libstdcxx:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ case ToolChain::CST_MacPortsLibstdcxx:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CmdArgs.push_back("-lstdc++");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/clang-11-bootstrap/files/9003-patch-clang-7.0-default-to-libcxx-on-all-systems.diff b/lang/clang-11-bootstrap/files/9003-patch-clang-7.0-default-to-libcxx-on-all-systems.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0b089626117..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/clang-11-bootstrap/files/9003-patch-clang-7.0-default-to-libcxx-on-all-systems.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git llvm-7.0.1.src/tools/clang/lib/Driver/ToolChains/Darwin.cpp llvm-7.0.1.src/tools/clang/lib/Driver/ToolChains/Darwin.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index dc540688..64adab5c 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- llvm-7.0.1.src/tools/clang/lib/Driver/ToolChains/Darwin.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ llvm-7.0.1.src/tools/clang/lib/Driver/ToolChains/Darwin.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -700,8 +700,8 @@ types::ID MachO::LookupTypeForExtension(StringRef Ext) const {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool MachO::HasNativeLLVMSupport() const { return true; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ToolChain::CXXStdlibType Darwin::GetDefaultCXXStdlibType() const {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- // Default to use libc++ on OS X 10.9+ and iOS 7+.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if ((isTargetMacOS() && !isMacosxVersionLT(10, 9)) ||
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // Default to use libc++ on OS X 10.4+ and iOS 7+.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ((isTargetMacOS() && !isMacosxVersionLT(10, 4)) ||
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (isTargetIOSBased() && !isIPhoneOSVersionLT(7, 0)) ||
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- isTargetWatchOSBased())
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return ToolChain::CST_Libcxx;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/clang-11-bootstrap/files/fix-build-clang-by-gcc10.diff b/lang/clang-11-bootstrap/files/fix-build-clang-by-gcc10.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0a3596e60d2..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/clang-11-bootstrap/files/fix-build-clang-by-gcc10.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/tools/clang/lib/DirectoryWatcher/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/tools/clang/lib/DirectoryWatcher/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5,7 +5,7 @@ set(LLVM_LINK_COMPONENTS support)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(DIRECTORY_WATCHER_SOURCES DirectoryScanner.cpp)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(DIRECTORY_WATCHER_LINK_LIBS "")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if(APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if(APPLE AND NOT CMAKE_CXX_COMPILER_ID MATCHES "GNU")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- check_include_files("CoreServices/CoreServices.h" HAVE_CORESERVICES)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(HAVE_CORESERVICES)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- list(APPEND DIRECTORY_WATCHER_SOURCES mac/DirectoryWatcher-mac.cpp)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/clang-11-bootstrap/files/fix-build-with-old-xar.diff b/lang/clang-11-bootstrap/files/fix-build-with-old-xar.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 4bcab0a6a61..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/clang-11-bootstrap/files/fix-build-with-old-xar.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,24 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/cmake/config-ix.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/cmake/config-ix.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -179,7 +179,7 @@ if (LLVM_ENABLE_ZLIB STREQUAL "FORCE_ON" AND NOT HAVE_LIBZ)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- message(FATAL_ERROR "Failed to configure zlib")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--check_library_exists(xar xar_open "" HAVE_LIBXAR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+check_library_exists(xar xar_extract_tobuffersz "" HAVE_LIBXAR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(HAVE_LIBXAR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(XAR_LIB xar)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/llvm/include/llvm/Config/config.h.cmake b/llvm/include/llvm/Config/config.h.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 9a682481ccaf..eefd95a8f3e1 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/include/llvm/Config/config.h.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/include/llvm/Config/config.h.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -211,7 +211,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Define if the setupterm() function is supported this platform. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #cmakedefine HAVE_TERMINFO ${HAVE_TERMINFO}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--/* Define if the xar_open() function is supported this platform. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* Define if the xar_extract_tobuffersz() function is supported this platform. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #cmakedefine HAVE_LIBXAR ${HAVE_LIBXAR}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Define to 1 if you have the <termios.h> header file. */
</span></pre><pre style='margin:0'>
</pre>