<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/087b88d2510a90c81eb9ca545879f5dd56e7218c">https://github.com/macports/macports-ports/commit/087b88d2510a90c81eb9ca545879f5dd56e7218c</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 087b88d2510 llvm-devel: update to more recent upstream commit
</span>087b88d2510 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 087b88d2510a90c81eb9ca545879f5dd56e7218c
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Mon Mar 29 13:21:34 2021 -0700
<span style='display:block; white-space:pre;color:#404040;'> llvm-devel: update to more recent upstream commit
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This update increases the LLVM version from 12->13 even though
</span><span style='display:block; white-space:pre;color:#404040;'> version 12 has not been released yet.
</span><span style='display:block; white-space:pre;color:#404040;'> Version 12 is at release candidate 3, and a WIP port emscripten
</span><span style='display:block; white-space:pre;color:#404040;'> (https://emscripten.org) requires LLVM version 13.
</span>---
lang/llvm-devel/Portfile | 45 ++++++++++++---------
...MASK_CRASH-and-MACH_EXCEPTION_CODES-if-th.patch | 2 +-
...ly-Don-t-embed-the-deployment-target-in-t.patch | 4 +-
...nly-call-pthread_setname_np-on-SnowLeopar.patch | 4 +-
...etpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch | 2 +-
...p-use-older-cfname-and-fix-uuid-on-leopard.diff | 2 +-
...t-unix-path-copyfileclone-on-older-systems.diff | 3 +-
...ly-Prepare-clang-format-for-replacement-w.patch | 4 +-
...ly-Fix-name-of-scan-view-executable-insid.patch | 2 +-
...dc-header-search-paths-for-older-versions.patch | 4 +-
.../1009-compilerrt-sanitizer-missingdefs.diff | 2 +-
...-long-long-math-prototypes-when-using-the.patch | 2 +-
...tomic-using-mutex-lock_guard-for-64b-ops-.patch | 2 +-
...ompilerrtdarwinutils-find-macosxsdkversion.diff | 4 +-
...lchains-darwin-add-back-pre-10.6-link-libs.diff | 2 +-
.../9000-patch-clang-7.0-support-emulated-tls.diff | 4 +-
.../9000-patch-llvm-7.0-support-emulated-tls.diff | 4 +-
lang/llvm-devel/files/9001-macports-libstdcxx.diff | 46 +++++++++++-----------
...clang-7.0-default-to-libcxx-on-all-systems.diff | 2 +-
lang/llvm-devel/files/leopard-no-asan.patch | 2 +-
lang/llvm-devel/files/leopard-no-blocks.patch | 2 +-
lang/llvm-devel/files/openmp-locations.patch | 4 +-
22 files changed, 77 insertions(+), 71 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-devel/Portfile b/lang/llvm-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e4f88e2ced1..51fa4f88c76 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,22 +16,22 @@ legacysupport.newest_darwin_requires_legacy 13
</span>
# for devel
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set llvm-commit 4bc88a0e9a2ee29959a9053e867ae6f051348554
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set date 20201123
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set llvm-commit 1c5f08312874717caf5d94729d825c32845773ec
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set date 20210305
</span> set llvm_version devel
# for release
# set llvm_version 12
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set llvm_version_no_dot 12
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set clang_executable_version 12
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set lldb_executable_version 12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set llvm_version_no_dot 13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set clang_executable_version 13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set lldb_executable_version 13
</span>
github.setup llvm llvm-project ${llvm-commit}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 312342e6a4237cd697179dbf3618673df1cd3df8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 d5242c02ce65ef36491daf5030613b3e61b82f302cffbb063069236c3bd88ac8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 129093448
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 0e49b6e6f6a4d92c0711c96cb63f410d8f6499be \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 e54ae4728298a38c35283cec49b157b957e92ba96d4e374f3a6891a529a93135 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 134911797
</span>
# for release, use ${llvm_version}
# version ${llvm_version}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,7 +40,7 @@ version ${date}-[string range ${llvm-commit} 0 7]
</span>
name llvm-${llvm_version}
revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-subport clang-${llvm_version} { revision 1 }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport clang-${llvm_version} { revision 0 }
</span> subport lldb-${llvm_version} { revision 0 }
set suffix mp-${llvm_version}
set sub_prefix ${prefix}/libexec/llvm-${llvm_version}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -85,6 +85,10 @@ if {${subport} eq "llvm-${llvm_version}"} {
</span>
default_variants-append +analyzer
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # avoid:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # CMake Error: failed to create symbolic link '___': file already exists
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ use_parallel_build no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> } elseif {${subport} eq "lldb-${llvm_version}"} {
homepage https://lldb.llvm.org/
description the LLVM debugger
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -104,21 +108,22 @@ worksrcdir llvm-project/llvm
</span> patch.dir ${workpath}/llvm-project/llvm
post-extract {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- move ${workpath}/llvm-project-${llvm-commit} ${workpath}/llvm-project
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${workpath}/llvm-project-${llvm-commit} ${workpath}/llvm-project
</span>
if {${subport} eq "llvm-${llvm_version}"} {
if {[variant_isset polly]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- file rename ${workpath}/llvm-project/polly ${worksrcpath}/tools/polly
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${workpath}/llvm-project/polly ${worksrcpath}/tools/polly
</span> }
} elseif {${subport} eq "clang-${llvm_version}"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- file rename ${workpath}/llvm-project/clang ${worksrcpath}/tools/clang
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file rename ${workpath}/llvm-project/compiler-rt ${worksrcpath}/projects/compiler-rt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file rename ${workpath}/llvm-project/libcxx ${worksrcpath}/projects/libcxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file rename ${workpath}/llvm-project/libcxxabi ${worksrcpath}/projects/libcxxabi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file copy ${workpath}/llvm-project/clang-tools-extra ${worksrcpath}/tools/clang/tools/extra
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${workpath}/llvm-project/clang ${worksrcpath}/tools/clang
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${workpath}/llvm-project/compiler-rt ${worksrcpath}/projects/compiler-rt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${workpath}/llvm-project/libcxx ${worksrcpath}/projects/libcxx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${workpath}/llvm-project/libcxxabi ${worksrcpath}/projects/libcxxabi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${workpath}/llvm-project/lld ${worksrcpath}/projects/lld
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${workpath}/llvm-project/clang-tools-extra ${worksrcpath}/tools/clang/tools/extra
</span> } elseif {${subport} eq "lldb-${llvm_version}"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- file rename ${workpath}/llvm-project/clang ${worksrcpath}/tools/clang
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file rename ${workpath}/llvm-project/lldb ${worksrcpath}/tools/lldb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${workpath}/llvm-project/clang ${worksrcpath}/tools/clang
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${workpath}/llvm-project/lldb ${worksrcpath}/tools/lldb
</span> }
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -193,8 +198,8 @@ configure.args-append \
</span> -DLLVM_ENABLE_RTTI=ON \
-DLLVM_INCLUDE_TESTS=OFF \
-DLLVM_INCLUDE_EXAMPLES=OFF \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DLLVM_ENABLE_FFI=ON \
</span> -DLLVM_BINDINGS_LIST=none \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DLLVM_ENABLE_FFI=ON \
</span> -DFFI_INCLUDE_DIR=`pkg-config --cflags-only-I libffi | sed 's/-I//'` \
-DFFI_LIBRARY_DIR=${prefix}/lib
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -353,6 +358,8 @@ if {${subport} eq "clang-${llvm_version}"} {
</span> system "cd ${destroot.dir}/tools/clang && ${destroot.cmd} ${destroot.pre_args} ${destroot.target} ${destroot.post_args}"
system "cd ${destroot.dir}/projects/compiler-rt && ${destroot.cmd} ${destroot.pre_args} ${destroot.target} ${destroot.post_args}"
system "cd ${destroot.dir}/projects/libcxx && ${destroot.cmd} ${destroot.pre_args} ${destroot.target} ${destroot.post_args}"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "cd ${destroot.dir}/projects/libcxxabi && ${destroot.cmd} ${destroot.pre_args} ${destroot.target} ${destroot.post_args}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "cd ${destroot.dir}/projects/lld && ${destroot.cmd} ${destroot.pre_args} ${destroot.target} ${destroot.post_args}"
</span>
delete ${destroot}${sub_prefix}/bin/clang
file rename ${destroot}${sub_prefix}/bin/clang-${clang_executable_version} ${destroot}${sub_prefix}/bin/clang
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-devel/files/0002-Define-EXC_MASK_CRASH-and-MACH_EXCEPTION_CODES-if-th.patch b/lang/llvm-devel/files/0002-Define-EXC_MASK_CRASH-and-MACH_EXCEPTION_CODES-if-th.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 5c22622a722..12429c9e407 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-devel/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/llvm-devel/files/0002-Define-EXC_MASK_CRASH-and-MACH_EXCEPTION_CODES-if-th.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,7 +15,7 @@ diff --git llvm_master/lib/Support/Unix/Signals.inc macports_master/lib/Support/
</span> index ec3935928d2..529bbfb34c2 100644
--- llvm_master/lib/Support/Unix/Signals.inc
+++ macports_master/lib/Support/Unix/Signals.inc
<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;'>+@@ -642,6 +642,15 @@ void llvm::sys::PrintStackTraceOnErrorSignal(StringRef Argv0,
</span> AddSignalHandler(PrintStackTraceSignalHandler, nullptr);
#if defined(__APPLE__) && ENABLE_CRASH_OVERRIDES
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-devel/files/0003-MacPorts-Only-Don-t-embed-the-deployment-target-in-t.patch b/lang/llvm-devel/files/0003-MacPorts-Only-Don-t-embed-the-deployment-target-in-t.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index a698bfb8741..6fb9f66f817 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-devel/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/llvm-devel/files/0003-MacPorts-Only-Don-t-embed-the-deployment-target-in-t.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,7 +15,7 @@ diff --git llvm_master/lib/CodeGen/AsmPrinter/AsmPrinter.cpp macports_master/lib
</span> index 7adc59d096f..336d1384b8d 100644
--- llvm_master/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
+++ macports_master/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
<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;'>+@@ -286,8 +286,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> --
2.21.0 (Apple Git-120)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-devel/files/0005-Threading-Only-call-pthread_setname_np-on-SnowLeopar.patch b/lang/llvm-devel/files/0005-Threading-Only-call-pthread_setname_np-on-SnowLeopar.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 292b4f778cb..fa6c6c0f2d1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-devel/files/0005-Threading-Only-call-pthread_setname_np-on-SnowLeopar.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-devel/files/0005-Threading-Only-call-pthread_setname_np-on-SnowLeopar.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,7 +12,7 @@ diff --git llvm_master/lib/Support/Unix/Threading.inc macports_master/lib/Suppor
</span> index ed9a9656305..e8f9a13860f 100644
--- llvm_master/lib/Support/Unix/Threading.inc
+++ macports_master/lib/Support/Unix/Threading.inc
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -14,6 +14,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -16,6 +16,7 @@
</span> #include "llvm/ADT/Twine.h"
#if defined(__APPLE__)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,7 +20,7 @@ index ed9a9656305..e8f9a13860f 100644
</span> #include <mach/mach_init.h>
#include <mach/mach_port.h>
#endif
<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:#e0ffe0;'>+@@ -176,8 +176,10 @@ void llvm::set_thread_name(const Twine &Name) {
</span> ::pthread_setname_np(::pthread_self(), "%s",
const_cast<char *>(NameStr.data()));
#elif defined(__APPLE__)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-devel/files/0006-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch b/lang/llvm-devel/files/0006-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index de0a8100a80..9443576b474 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-devel/files/0006-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-devel/files/0006-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,7 +15,7 @@ diff --git llvm_master/lib/Support/Unix/Threading.inc macports_master/lib/Suppor
</span> index e8f9a13860f..e731f750c1d 100644
--- llvm_master/lib/Support/Unix/Threading.inc
+++ macports_master/lib/Support/Unix/Threading.inc
<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;'>+@@ -260,7 +260,7 @@ SetThreadPriorityResult llvm::set_thread_priority(ThreadPriority Priority) {
</span> &priority)
? SetThreadPriorityResult::SUCCESS
: SetThreadPriorityResult::FAILURE;
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-devel/files/0007-patch-llvm8-tools-dsymutil-symbolmap-use-older-cfname-and-fix-uuid-on-leopard.diff b/lang/llvm-devel/files/0007-patch-llvm8-tools-dsymutil-symbolmap-use-older-cfname-and-fix-uuid-on-leopard.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 122d21e7d05..540fe8fb407 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-devel/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;'>+++ b/lang/llvm-devel/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:#e0e0e0;'>@@ -2,7 +2,7 @@ diff --git a/tools/dsymutil/SymbolMap.cpp b/tools/dsymutil/SymbolMap.cpp
</span> index cab9374a..5c2377e4 100644
--- a/tools/dsymutil/SymbolMap.cpp
+++ b/tools/dsymutil/SymbolMap.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -18,8 +18,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -17,8 +17,18 @@
</span> #ifdef __APPLE__
#include <CoreFoundation/CoreFoundation.h>
#include <uuid/uuid.h>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-devel/files/0008-patch-lib-support-unix-path-copyfileclone-on-older-systems.diff b/lang/llvm-devel/files/0008-patch-lib-support-unix-path-copyfileclone-on-older-systems.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index d3523285757..2239aae272b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-devel/files/0008-patch-lib-support-unix-path-copyfileclone-on-older-systems.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-devel/files/0008-patch-lib-support-unix-path-copyfileclone-on-older-systems.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,8 +2,7 @@ diff --git trunk/lib/Support/Unix/Path.inc.orig trunk/lib/Support/Unix/Path.inc
</span> index c64c0df..aaa2226 100644
--- trunk/lib/Support/Unix/Path.inc.orig
+++ trunk/lib/Support/Unix/Path.inc
<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:#e0ffe0;'>+@@ -39,6 +39,9 @@
</span> #include <mach-o/dyld.h>
#include <sys/attr.h>
#include <copyfile.h>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-devel/files/1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch b/lang/llvm-devel/files/1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index b0dfd851372..08e6274719e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-devel/files/1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-devel/files/1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -56,7 +56,7 @@ diff --git llvm_master/tools/clang/tools/clang-format/clang-format.el macports_m
</span> index 0b9dc8d6fa..eebc4d115e 100644
--- llvm_master/tools/clang/tools/clang-format/clang-format.el
+++ macports_master/tools/clang/tools/clang-format/clang-format.el
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -36,8 +36,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -37,8 +37,7 @@
</span> :group 'tools)
(defcustom clang-format-executable
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,7 +70,7 @@ diff --git llvm_master/tools/clang/tools/clang-format/clang-format.py macports_m
</span> index 0c772f91f6..33c96180a4 100644
--- llvm_master/tools/clang/tools/clang-format/clang-format.py
+++ macports_master/tools/clang/tools/clang-format/clang-format.py
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -36,7 +36,7 @@ import vim
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -48,7 +48,7 @@ import vim
</span>
# set g:clang_format_path to the path to clang-format if it is not on the path
# Change this to the full path if clang-format is not on the path.
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-devel/files/1002-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch b/lang/llvm-devel/files/1002-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index b96c3c393e8..7507e877150 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-devel/files/1002-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-devel/files/1002-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,4 +16,4 @@ 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;color:#808080;'>diff --git a/lang/llvm-devel/files/1005-Fixup-libstdc-header-search-paths-for-older-versions.patch b/lang/llvm-devel/files/1005-Fixup-libstdc-header-search-paths-for-older-versions.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index f26118e36fc..aabb8fa36e8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-devel/files/1005-Fixup-libstdc-header-search-paths-for-older-versions.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-devel/files/1005-Fixup-libstdc-header-search-paths-for-older-versions.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,7 +18,7 @@ diff --git llvm_master/tools/clang/lib/Driver/ToolChains/Darwin.cpp macports_mas
</span> index 5de7d7132d..165a331fe5 100644
--- llvm_master/tools/clang/lib/Driver/ToolChains/Darwin.cpp
+++ macports_master/tools/clang/lib/Driver/ToolChains/Darwin.cpp
<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;'>+@@ -2097,7 +2097,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;'>+@@ -2109,7 +2109,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;color:#808080;'>diff --git a/lang/llvm-devel/files/1009-compilerrt-sanitizer-missingdefs.diff b/lang/llvm-devel/files/1009-compilerrt-sanitizer-missingdefs.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index b7420d6c420..805bc03443b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-devel/files/1009-compilerrt-sanitizer-missingdefs.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-devel/files/1009-compilerrt-sanitizer-missingdefs.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- llvm/projects/compiler-rt/lib/sanitizer_common/sanitizer_mac.cpp.orig 2020-05-14 15:13:45.000000000 -0700
+++ llvm/projects/compiler-rt/lib/sanitizer_common/sanitizer_mac.cpp 2020-05-14 15:17:03.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -111,6 +111,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -119,6 +119,11 @@
</span> #define VM_MEMORY_SANITIZER 99
#endif
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-devel/files/3001-Fix-missing-long-long-math-prototypes-when-using-the.patch b/lang/llvm-devel/files/3001-Fix-missing-long-long-math-prototypes-when-using-the.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 4d2e8f07d71..8a1858135b5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-devel/files/3001-Fix-missing-long-long-math-prototypes-when-using-the.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-devel/files/3001-Fix-missing-long-long-math-prototypes-when-using-the.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,7 +13,7 @@ diff --git llvm_master/projects/libcxx/include/math.h macports_master/projects/l
</span> index 194df2077..14d14fe08 100644
--- llvm_master/projects/libcxx/include/math.h
+++ macports_master/projects/libcxx/include/math.h
<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;'>+@@ -299,6 +299,32 @@ long double truncl(long double x);
</span>
#include_next <math.h>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-devel/files/3002-implement-atomic-using-mutex-lock_guard-for-64b-ops-.patch b/lang/llvm-devel/files/3002-implement-atomic-using-mutex-lock_guard-for-64b-ops-.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 2a8ae64c330..fee098b55eb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-devel/files/3002-implement-atomic-using-mutex-lock_guard-for-64b-ops-.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-devel/files/3002-implement-atomic-using-mutex-lock_guard-for-64b-ops-.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -260,7 +260,7 @@ diff --git llvm_master/projects/libcxx/include/atomic macports_master/projects/l
</span> index afb431eda..b87307977 100644
--- llvm_master/projects/libcxx/include/atomic
+++ macports_master/projects/libcxx/include/atomic
<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;'>+@@ -2801,4 +2801,50 @@ typedef atomic<uintmax_t> atomic_uintmax_t;
</span>
_LIBCPP_END_NAMESPACE_STD
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-devel/files/5000-patch-compilerrtdarwinutils-find-macosxsdkversion.diff b/lang/llvm-devel/files/5000-patch-compilerrtdarwinutils-find-macosxsdkversion.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 95737ab7dde..1286088c460 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-devel/files/5000-patch-compilerrtdarwinutils-find-macosxsdkversion.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-devel/files/5000-patch-compilerrtdarwinutils-find-macosxsdkversion.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- a/projects/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake.orig 2020-04-20 17:14:08.000000000 -0700
+++ b/projects/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake 2020-04-20 17:31:44.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -66,15 +66,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -69,15 +69,6 @@
</span> ERROR_FILE /dev/null
)
endif()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,7 +16,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 @@
</span> # binaries.
if ("${os}" STREQUAL "osx")
find_darwin_sdk_version(macosx_sdk_version "macosx")
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-devel/files/5002-patch-toolchains-darwin-add-back-pre-10.6-link-libs.diff b/lang/llvm-devel/files/5002-patch-toolchains-darwin-add-back-pre-10.6-link-libs.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 6ea0b0040fc..13b8af69512 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-devel/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/llvm-devel/files/5002-patch-toolchains-darwin-add-back-pre-10.6-link-libs.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,7 +15,7 @@ diff --git a/tools/clang/lib/Driver/ToolChains/Darwin.cpp b/tools/clang/lib/Driv
</span> index bea877ae9..26f1ad714 100644
--- a/tools/clang/lib/Driver/ToolChains/Darwin.cpp
+++ b/tools/clang/lib/Driver/ToolChains/Darwin.cpp
<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;'>+@@ -1334,6 +1334,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;color:#808080;'>diff --git a/lang/llvm-devel/files/9000-patch-clang-7.0-support-emulated-tls.diff b/lang/llvm-devel/files/9000-patch-clang-7.0-support-emulated-tls.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 0459630fd68..eb13bcdb881 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-devel/files/9000-patch-clang-7.0-support-emulated-tls.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-devel/files/9000-patch-clang-7.0-support-emulated-tls.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,7 +2,7 @@ diff --git a/tools/clang/lib/Basic/Targets/OSTargets.h b/tools/clang/lib/Basic/T
</span> index d0354784..102605fe 100644
--- a/tools/clang/lib/Basic/Targets/OSTargets.h
+++ b/tools/clang/lib/Basic/Targets/OSTargets.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -93,7 +93,7 @@ public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -92,7 +92,7 @@ public:
</span> this->TLSSupported = false;
if (Triple.isMacOSX())
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,7 +15,7 @@ diff --git a/tools/clang/lib/CodeGen/ItaniumCXXABI.cpp b/tools/clang/lib/CodeGen
</span> index 00fff144..052924ab 100644
--- a/tools/clang/lib/CodeGen/ItaniumCXXABI.cpp
+++ b/tools/clang/lib/CodeGen/ItaniumCXXABI.cpp
<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:#e0ffe0;'>+@@ -2507,7 +2507,7 @@ static void emitGlobalDtorWithCXAAtExit(CodeGenFunction &CGF,
</span> const char *Name = "__cxa_atexit";
if (TLS) {
const llvm::Triple &T = CGF.getTarget().getTriple();
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-devel/files/9000-patch-llvm-7.0-support-emulated-tls.diff b/lang/llvm-devel/files/9000-patch-llvm-7.0-support-emulated-tls.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index b96a36ee21a..8a90dd32a77 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-devel/files/9000-patch-llvm-7.0-support-emulated-tls.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-devel/files/9000-patch-llvm-7.0-support-emulated-tls.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,7 +2,7 @@ diff --git a/include/llvm/ADT/Triple.h b/include/llvm/ADT/Triple.h
</span> index c95b16dd..ecc0f148 100644
--- a/include/llvm/ADT/Triple.h
+++ b/include/llvm/ADT/Triple.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -682,7 +682,7 @@ public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -809,7 +809,7 @@ public:
</span>
/// Tests whether the target uses emulated TLS as default.
bool hasDefaultEmulatedTLS() const {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,4 +10,4 @@ index c95b16dd..ecc0f148 100644
</span> + return isAndroid() || isOSOpenBSD() || isWindowsCygwinEnvironment() || isMacOSXVersionLT(10, 7);
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- /// @}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /// Tests whether the target uses -data-sections as default.
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-devel/files/9001-macports-libstdcxx.diff b/lang/llvm-devel/files/9001-macports-libstdcxx.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index dbff9c9da3b..8ebac37f86e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-devel/files/9001-macports-libstdcxx.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-devel/files/9001-macports-libstdcxx.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- orig/tools/clang/include/clang/Lex/HeaderSearchOptions.h
+++ new/tools/clang/include/clang/Lex/HeaderSearchOptions.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -184,6 +184,9 @@ public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -189,6 +189,9 @@ public:
</span> /// Use libc++ instead of the default libstdc++.
unsigned UseLibcxx : 1;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,21 +12,21 @@
</span>
--- llvm/tools/clang/lib/Frontend/CompilerInvocation.cpp.orig 2020-05-06 08:57:03.000000000 -0700
+++ llvm/tools/clang/lib/Frontend/CompilerInvocation.cpp 2020-05-07 12:51:38.000000000 -0700
<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:#e0ffe0;'>+@@ -2939,8 +2939,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "clang/Driver/Options.inc"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #undef HEADER_SEARCH_OPTION_WITH_MARSHALLING
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> - if (const Arg *A = Args.getLastArg(OPT_stdlib_EQ))
+ if (const Arg *A = Args.getLastArg(OPT_stdlib_EQ)) {
Opts.UseLibcxx = (strcmp(A->getValue(), "libc++") == 0);
+ Opts.UseMacPortsLibstdcxx = (strcmp(A->getValue(), "macports-libstdc++") == 0);
+ }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- Opts.ResourceDir = std::string(Args.getLastArgValue(OPT_resource_dir));
</span>
// Canonicalize -fmodules-cache-path before storing it.
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ SmallString<128> P(Args.getLastArgValue(OPT_fmodules_cache_path));
</span> --- orig/tools/clang/lib/Frontend/InitHeaderSearch.cpp
+++ new/tools/clang/lib/Frontend/InitHeaderSearch.cpp
<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:#e0ffe0;'>+@@ -108,7 +108,7 @@ static bool CanPrefixSysroot(StringRef Path) {
</span> #if defined(_WIN32)
return !Path.empty() && llvm::sys::path::is_separator(Path[0]);
#else
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,7 +37,7 @@
</span>
--- orig/tools/clang/include/clang/Driver/ToolChain.h
+++ new/tools/clang/include/clang/Driver/ToolChain.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -91,7 +91,8 @@ public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -94,7 +94,8 @@ public:
</span>
enum CXXStdlibType {
CST_Libcxx,
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,7 +49,7 @@
</span> enum RuntimeLibType {
--- orig/tools/clang/lib/Driver/ToolChains/Darwin.cpp
+++ new/tools/clang/lib/Driver/ToolChains/Darwin.cpp
<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:#e0ffe0;'>+@@ -2045,8 +2045,9 @@ void DarwinClang::AddClangCXXStdlibInclu
</span> return;
llvm::StringRef Sysroot = GetHeaderSysroot(DriverArgs);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,9 +58,9 @@
</span> - switch (GetCXXStdlibType(DriverArgs)) {
+ switch (Type) {
case ToolChain::CST_Libcxx: {
<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:#e0ffe0;'>+ // On Darwin, libc++ can be installed in one of the following two places:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // 1. Alongside the compiler in <install>/include/c++/v1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2088,6 +2089,7 @@ void DarwinClang::AddClangCXXStdlibInclu
</span> }
case ToolChain::CST_Libstdcxx:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -68,7 +68,7 @@
</span> llvm::SmallString<128> UsrIncludeCxx = Sysroot;
llvm::sys::path::append(UsrIncludeCxx, "usr", "include", "c++");
<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:#e0ffe0;'>+@@ -2098,10 +2100,17 @@ void DarwinClang::AddClangCXXStdlibInclu
</span>
case llvm::Triple::ppc:
case llvm::Triple::ppc64:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -90,7 +90,7 @@
</span> IsBaseFound |= AddGnuCPlusPlusIncludePaths(DriverArgs, CC1Args, UsrIncludeCxx,
"4.0.0", "powerpc-apple-darwin8",
arch == llvm::Triple::ppc64 ? "ppc64" : "");
<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:#e0ffe0;'>+@@ -2109,10 +2118,17 @@ void DarwinClang::AddClangCXXStdlibInclu
</span>
case llvm::Triple::x86:
case llvm::Triple::x86_64:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -112,7 +112,7 @@
</span> IsBaseFound |= AddGnuCPlusPlusIncludePaths(DriverArgs, CC1Args, UsrIncludeCxx,
"4.0.0", "i686-apple-darwin8",
arch == llvm::Triple::x86_64 ? "x86_64" : "");
<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:#e0ffe0;'>+@@ -2155,6 +2171,12 @@ void DarwinClang::AddCXXStdlibLibArgs(co
</span> break;
case ToolChain::CST_Libstdcxx:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -127,7 +127,7 @@
</span> // platforms we care about it was -lstdc++.6, so we search for that
--- orig/tools/clang/lib/Driver/ToolChains/Hexagon.cpp.orig 2020-05-06 08:57:03.000000000 -0700
+++ new/tools/clang/lib/Driver/ToolChains/Hexagon.cpp 2020-05-07 12:43:10.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -639,6 +639,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -643,6 +643,8 @@
</span> return ToolChain::CST_Libstdcxx;
}
StringRef Value = A->getValue();
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -138,16 +138,16 @@
</span>
--- orig/tools/clang/lib/Driver/ToolChain.cpp
+++ new/tools/clang/lib/Driver/ToolChain.cpp
<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:#e0ffe0;'>+@@ -965,6 +965,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cxxStdlibType = ToolChain::CST_Libcxx;
</span> else if (LibName == "libstdc++")
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return ToolChain::CST_Libstdcxx;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cxxStdlibType = ToolChain::CST_Libstdcxx;
</span> + else if (LibName == "macports-libstdc++")
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return ToolChain::CST_MacPortsLibstdcxx;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cxxStdlibType = ToolChain::CST_MacPortsLibstdcxx;
</span> else if (LibName == "platform")
<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:#e0ffe0;'>+ cxxStdlibType = GetDefaultCXXStdlibType();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1060,6 +1062,7 @@
</span> break;
case ToolChain::CST_Libstdcxx:
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-devel/files/9003-patch-clang-7.0-default-to-libcxx-on-all-systems.diff b/lang/llvm-devel/files/9003-patch-clang-7.0-default-to-libcxx-on-all-systems.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 0b089626117..3ebd9b9a8bb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-devel/files/9003-patch-clang-7.0-default-to-libcxx-on-all-systems.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-devel/files/9003-patch-clang-7.0-default-to-libcxx-on-all-systems.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,7 +2,7 @@ diff --git llvm-7.0.1.src/tools/clang/lib/Driver/ToolChains/Darwin.cpp llvm-7.0.
</span> index dc540688..64adab5c 100644
--- 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 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:#e0ffe0;'>+@@ -810,8 +810,8 @@ types::ID MachO::LookupTypeForExtension(StringRef Ext) const {
</span> bool MachO::HasNativeLLVMSupport() const { return true; }
ToolChain::CXXStdlibType Darwin::GetDefaultCXXStdlibType() const {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-devel/files/leopard-no-asan.patch b/lang/llvm-devel/files/leopard-no-asan.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 1f6fecb438e..6d73fe61695 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-devel/files/leopard-no-asan.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-devel/files/leopard-no-asan.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- a/projects/compiler-rt/cmake/config-ix.cmake 2015-11-29 22:17:04.000000000 -0800
+++ b/projects/compiler-rt/cmake/config-ix.cmake 2015-11-29 22:19:16.000000000 -0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -361,9 +361,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -414,9 +414,6 @@
</span> else()
set(SANITIZER_MIN_OSX_VERSION ${DEFAULT_SANITIZER_MIN_OSX_VERSION})
endif()
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-devel/files/leopard-no-blocks.patch b/lang/llvm-devel/files/leopard-no-blocks.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 06d40c42e32..0ce12f917ac 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-devel/files/leopard-no-blocks.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-devel/files/leopard-no-blocks.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,7 +12,7 @@ diff --git a/lib/Driver/ToolChains.h b/lib/Driver/ToolChains.h
</span> index 876bb01..27aa2ee 100644
--- a/tools/clang/lib/Driver/ToolChains/Darwin.h
+++ b/tools/clang/lib/Driver/ToolChains/Darwin.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -257,7 +257,7 @@ public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -217,7 +217,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;color:#808080;'>diff --git a/lang/llvm-devel/files/openmp-locations.patch b/lang/llvm-devel/files/openmp-locations.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index cff10f9506e..88a6fa383d7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-devel/files/openmp-locations.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-devel/files/openmp-locations.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,7 +2,7 @@ diff --git a/lib/Driver/ToolChains/Clang.cpp b/lib/Driver/ToolChains/Clang.cpp
</span> index 292cf72b56..d8c6327080 100644
--- a/tools/clang/lib/Driver/ToolChains/Clang.cpp
+++ b/tools/clang/lib/Driver/ToolChains/Clang.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3229,6 +3229,8 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5532,6 +5532,8 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
</span> case Driver::OMPRT_OMP:
case Driver::OMPRT_IOMP5:
// Clang can generate useful OpenMP code for these two runtime libraries.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,7 +14,7 @@ index 292cf72b56..d8c6327080 100644
</span> diff -u a/tools/clang/lib/Driver/ToolChains/CommonArgs.cpp.orig b/tools/clang/lib/Driver/ToolChains/CommonArgs.cpp
--- a/tools/clang/lib/Driver/ToolChains/CommonArgs.cpp.orig 2020-04-19 11:47:05.000000000 -0700
+++ b/tools/clang/lib/Driver/ToolChains/CommonArgs.cpp 2020-04-19 11:48:11.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -521,12 +521,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -673,12 +673,18 @@
</span>
switch (RTKind) {
case Driver::OMPRT_OMP:
</pre><pre style='margin:0'>
</pre>