<pre style='margin:0'>
Jeremy Huddleston Sequoia (jeremyhu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e54f7652f9227ae6a7d7a972b4a28a2a9b31f1b4">https://github.com/macports/macports-ports/commit/e54f7652f9227ae6a7d7a972b4a28a2a9b31f1b4</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit e54f7652f9227ae6a7d7a972b4a28a2a9b31f1b4
</span>Author: Jeremy Huddleston Sequoia <jeremyhu@macports.org>
AuthorDate: Thu Jul 4 13:42:20 2019 -0700
<span style='display:block; white-space:pre;color:#404040;'> llvm-devel: Bump to trunk r365158
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@macports.org>
</span>---
lang/llvm-devel/Portfile | 32 +--
...h-O-CPU-Subtype-to-ppc7400-when-targeting.patch | 59 ++--
...MASK_CRASH-and-MACH_EXCEPTION_CODES-if-th.patch | 16 +-
...ly-Don-t-embed-the-deployment-target-in-t.patch | 16 +-
...ssues-pre-Lion-due-to-missing-a-strnlen-d.patch | 38 +--
...nly-call-pthread_setname_np-on-SnowLeopar.patch | 10 +-
...etpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch | 29 ++
...ly-Prepare-clang-format-for-replacement-w.patch | 46 +--
...ly-Fix-name-of-scan-view-executable-insid.patch | 16 +-
.../1003-Default-to-ppc7400-for-OSX-10.5.patch | 10 +-
...ragile-ObjC-runtime-when-targeting-darwi.patch} | 14 +-
...etpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch | 29 --
...dc-header-search-paths-for-older-versions.patch | 41 +++
...sues-pre-Lion-due-to-missing-a-strnlen-d.patch} | 16 +-
...dc-header-search-paths-for-older-versions.patch | 41 ---
...at.h-to-work-on-Snow-Leopard-and-earlier.patch} | 16 +-
...-O_CLOEXEC-for-older-SDKs-that-don-t-have.patch | 20 +-
.../2002-Work-around-no-libdispatch-on-10.6.patch | 26 +-
...nd-iterator-when-building-with-Lion-and-n.patch | 45 ---
...-long-long-math-prototypes-when-using-the.patch | 51 ----
...tomic-using-mutex-lock_guard-for-64b-ops-.patch | 316 ---------------------
...e-Check-that-a-certificate-for-lldb-is-pr.patch | 42 +++
22 files changed, 259 insertions(+), 670 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 5a77d1b..b5cfa98 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;'>@@ -84,7 +84,7 @@ if {${subport} eq "llvm-${llvm_version}"} {
</span> }
fetch.type svn
<span style='display:block; white-space:pre;background:#ffe0e0;'>-svn.revision 357237
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+svn.revision 365158
</span>
depends_extract-append port:subversion
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -125,22 +125,22 @@ patchfiles \
</span> 0002-Define-EXC_MASK_CRASH-and-MACH_EXCEPTION_CODES-if-th.patch \
0003-MacPorts-Only-Don-t-embed-the-deployment-target-in-t.patch \
0004-Fix-build-issues-pre-Lion-due-to-missing-a-strnlen-d.patch \
<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:#e0ffe0;'>+ 0005-Threading-Only-call-pthread_setname_np-on-SnowLeopar.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0006-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch
</span>
if {${subport} eq "clang-${llvm_version}"} {
patchfiles-append \
1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch \
1002-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch \
1003-Default-to-ppc7400-for-OSX-10.5.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 1004-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1005-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1006-Fixup-libstdc-header-search-paths-for-older-versions.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1007-Fix-build-issues-pre-Lion-due-to-missing-a-strnlen-d.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1004-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1005-Fixup-libstdc-header-search-paths-for-older-versions.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1006-Fix-build-issues-pre-Lion-due-to-missing-a-strnlen-d.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1007-Fix-float.h-to-work-on-Snow-Leopard-and-earlier.patch \
</span> 2001-xray-Define-O_CLOEXEC-for-older-SDKs-that-don-t-have.patch \
2002-Work-around-no-libdispatch-on-10.6.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 3001-Fix-local-and-iterator-when-building-with-Lion-and-n.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 3002-Fix-missing-long-long-math-prototypes-when-using-the.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 3003-implement-atomic-using-mutex-lock_guard-for-64b-ops-.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3001-Fix-missing-long-long-math-prototypes-when-using-the.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3002-implement-atomic-using-mutex-lock_guard-for-64b-ops-.patch \
</span> openmp-locations.patch
# https://llvm.org/bugs/show_bug.cgi?id=25681
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -162,10 +162,11 @@ if {${subport} eq "lldb-${llvm_version}"} {
</span> 1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch \
1002-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch \
1003-Default-to-ppc7400-for-OSX-10.5.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 1004-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1005-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1006-Fixup-libstdc-header-search-paths-for-older-versions.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1007-Fix-build-issues-pre-Lion-due-to-missing-a-strnlen-d.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1004-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1005-Fixup-libstdc-header-search-paths-for-older-versions.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1006-Fix-build-issues-pre-Lion-due-to-missing-a-strnlen-d.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1007-Fix-float.h-to-work-on-Snow-Leopard-and-earlier.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 4001-Revert-CMake-Check-that-a-certificate-for-lldb-is-pr.patch \
</span> openmp-locations.patch
# https://llvm.org/bugs/show_bug.cgi?id=25681
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -470,10 +471,6 @@ if {${subport} eq "lldb-${llvm_version}"} {
</span>
build.dir ${build.dir}/tools/lldb
<span style='display:block; white-space:pre;background:#ffe0e0;'>- post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -d ${destroot}${prefix}/share/doc/lldb-${llvm_version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 ${worksrcpath}/tools/lldb/docs/code-signing.txt ${destroot}${prefix}/share/doc/lldb-${llvm_version}/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> post-activate {
ui_msg "Please follow the instructions in ${prefix}/share/doc/lldb-${llvm_version}/code-signing.txt and then codesign lldb-server with:"
if {${os.major} >= 13} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -590,6 +587,7 @@ if {${subport} eq "llvm-${llvm_version}"} {
</span>
variant libstdcxx description {-stdlib=macports-libstdc++ searches for MacPorts libstdc++} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # TODO: This variant is currently broken. We need to rebase this patch.
</span> patchfiles-append 9001-macports-libstdcxx.diff
post-patch {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-devel/files/0001-Set-the-Mach-O-CPU-Subtype-to-ppc7400-when-targeting.patch b/lang/llvm-devel/files/0001-Set-the-Mach-O-CPU-Subtype-to-ppc7400-when-targeting.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 691042a..20473bc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-devel/files/0001-Set-the-Mach-O-CPU-Subtype-to-ppc7400-when-targeting.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-devel/files/0001-Set-the-Mach-O-CPU-Subtype-to-ppc7400-when-targeting.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,55 +1,38 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 3b3932ac16c4ce7d21e0801efef9e1c73d4e0c20 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 7b739282165d49031835b9413d273762f0ec53d9 Mon Sep 17 00:00:00 2001
</span> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sat, 17 Jan 2015 09:03:43 -0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1/4] Set the Mach-O CPU Subtype to ppc7400 when targeting
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1/6] Set the Mach-O CPU Subtype to ppc7400 when targeting
</span> Leopard
http://llvm.org/bugs/show_bug.cgi?id=18463
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
---
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lib/Target/PowerPC/MCTargetDesc/PPCAsmBackend.cpp | 13 ++++++++++---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 10 insertions(+), 3 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lib/Target/PowerPC/MCTargetDesc/PPCAsmBackend.cpp | 8 +++++++-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 7 insertions(+), 1 deletion(-)
</span>
diff --git llvm_master/lib/Target/PowerPC/MCTargetDesc/PPCAsmBackend.cpp macports_master/lib/Target/PowerPC/MCTargetDesc/PPCAsmBackend.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index a405dd70c30..b1b62146d3b 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index ec4eb700563..1478baf9bef 100644
</span> --- llvm_master/lib/Target/PowerPC/MCTargetDesc/PPCAsmBackend.cpp
+++ macports_master/lib/Target/PowerPC/MCTargetDesc/PPCAsmBackend.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -201,16 +201,23 @@ public:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // FIXME: This should be in a separate file.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- namespace {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- class DarwinPPCAsmBackend : public PPCAsmBackend {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Triple TheTriple;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- public:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- DarwinPPCAsmBackend(const Target &T) : PPCAsmBackend(T, support::big) { }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ DarwinPPCAsmBackend(const Target &T, const Triple &TT) : PPCAsmBackend(T, support::big), TheTriple(TT) { }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- std::unique_ptr<MCObjectTargetWriter>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- createObjectTargetWriter() const override {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool is64 = getPointerSize() == 8;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ MachO::CPUSubTypePowerPC CS = MachO::CPU_SUBTYPE_POWERPC_ALL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -208,10 +208,16 @@ public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ std::unique_ptr<MCObjectTargetWriter>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ createObjectTargetWriter() const override {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool Is64 = TT.isPPC64();
</span> +
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (TheTriple.isOSDarwin() && !TheTriple.isMacOSXVersionLT(10,5)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CS = MachO::CPU_SUBTYPE_POWERPC_7400;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ MachO::CPUSubTypePowerPC CS = MachO::CPU_SUBTYPE_POWERPC_ALL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (TT.isOSDarwin() && !TT.isMacOSXVersionLT(10,5)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CS = MachO::CPU_SUBTYPE_POWERPC_7400;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span> +
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return createPPCMachObjectWriter(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*Is64Bit=*/is64,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (is64 ? MachO::CPU_TYPE_POWERPC64 : MachO::CPU_TYPE_POWERPC),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- MachO::CPU_SUBTYPE_POWERPC_ALL);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CS);
</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;'>-@@ -236,7 +243,7 @@ MCAsmBackend *llvm::createPPCAsmBackend(const Target &T,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const MCTargetOptions &Options) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const Triple &TT = STI.getTargetTriple();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (TT.isOSDarwin())
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return new DarwinPPCAsmBackend(T);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return new DarwinPPCAsmBackend(T, TT);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return createPPCMachObjectWriter(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*Is64Bit=*/Is64,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (Is64 ? MachO::CPU_TYPE_POWERPC64 : MachO::CPU_TYPE_POWERPC),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- MachO::CPU_SUBTYPE_POWERPC_ALL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CS);
</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:#ffe0e0;'>- uint8_t OSABI = MCELFObjectTargetWriter::getOSABI(TT.getOS());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool IsLittleEndian = TT.getArch() == Triple::ppc64le;
</span> --
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.17.1 (Apple Git-112)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.21.0 (Apple Git-120)
</span>
<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 a8d7773..5c22622 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;'>@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From a01f092533323329dc6d5ec97e3fb98dc162edc9 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 55278bd7f154686d9b9b8e31e4e526f8584468f6 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/4] Define EXC_MASK_CRASH and MACH_EXCEPTION_CODES if they're
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 2/6] Define EXC_MASK_CRASH and MACH_EXCEPTION_CODES if they're
</span> not defined in the SDK
The 10.4 SDK does not define these macros
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,11 +11,11 @@ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span> lib/Support/Unix/Signals.inc | 9 +++++++++
1 file changed, 9 insertions(+)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git llvm_release_80/lib/Support/Unix/Signals.inc macports_release_80/lib/Support/Unix/Signals.inc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index ad88d5e9690..f6126b11630 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- llvm_release_80/lib/Support/Unix/Signals.inc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ macports_release_80/lib/Support/Unix/Signals.inc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -569,6 +569,15 @@ void llvm::sys::PrintStackTraceOnErrorSignal(StringRef Argv0,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+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:#e0ffe0;'>+index ec3935928d2..529bbfb34c2 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- llvm_master/lib/Support/Unix/Signals.inc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macports_master/lib/Support/Unix/Signals.inc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -565,6 +565,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 ad88d5e9690..f6126b11630 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.20.1 (Apple Git-116)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.21.0 (Apple Git-120)
</span>
<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 9c1f711..0e73b2e 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;'>@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From bc46e7ec9797ff027266a7874be93ea075c0499f Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 9b6ac68dbf1643543a3f1c4287255406069f061a 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/4] MacPorts Only: Don't embed the deployment target in the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 3/6] MacPorts Only: Don't embed the deployment target in the
</span> asm when using -fno-integrated-as
http://llvm.org/bugs/show_bug.cgi?id=21636
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,11 +11,11 @@ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span> lib/CodeGen/AsmPrinter/AsmPrinter.cpp | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git llvm_release_80/lib/CodeGen/AsmPrinter/AsmPrinter.cpp macports_release_80/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 7070451e333..aa2a8ceebb5 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- llvm_release_80/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ macports_release_80/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -262,8 +262,10 @@ bool AsmPrinter::doInitialization(Module &M) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+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:#e0ffe0;'>+index 7adc59d096f..336d1384b8d 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- llvm_master/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macports_master/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -272,8 +272,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;'>@@ -29,5 +29,5 @@ index 7070451e333..aa2a8ceebb5 100644
</span> // Allow the target to emit any magic that it wants at the start of the file.
EmitStartOfAsmFile(M);
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.20.1 (Apple Git-116)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.21.0 (Apple Git-120)
</span>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-devel/files/0004-Fix-build-issues-pre-Lion-due-to-missing-a-strnlen-d.patch b/lang/llvm-devel/files/0004-Fix-build-issues-pre-Lion-due-to-missing-a-strnlen-d.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index f79fe59..bb221aa 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-devel/files/0004-Fix-build-issues-pre-Lion-due-to-missing-a-strnlen-d.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-devel/files/0004-Fix-build-issues-pre-Lion-due-to-missing-a-strnlen-d.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 129be7902cc13ee305724cd4e115b3a21d376fce Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From e37fcfbad830c9bfe7375847f230f69899360444 Mon Sep 17 00:00:00 2001
</span> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Tue, 20 Dec 2016 12:41:21 -0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 4/4] Fix build issues pre-Lion due to missing a strnlen
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 4/6] Fix build issues pre-Lion due to missing a strnlen
</span> definition
https://trac.macports.org/ticket/51520
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,10 +14,10 @@ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span> 2 files changed, 29 insertions(+), 1 deletion(-)
diff --git llvm_master/lib/ObjectYAML/MachOYAML.cpp macports_master/lib/ObjectYAML/MachOYAML.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index e00a4ea9307..0daba44573c 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index d12f12cf443..57464def3da 100644
</span> --- llvm_master/lib/ObjectYAML/MachOYAML.cpp
+++ macports_master/lib/ObjectYAML/MachOYAML.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -22,6 +22,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -21,6 +21,20 @@
</span> #include <cstdint>
#include <cstring>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,10 +39,10 @@ index e00a4ea9307..0daba44573c 100644
</span>
MachOYAML::LoadCommand::~LoadCommand() = default;
diff --git llvm_master/tools/obj2yaml/macho2yaml.cpp macports_master/tools/obj2yaml/macho2yaml.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index fa81ce974ec..1e86f820437 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 63e81686632..3c9b0cf8748 100644
</span> --- llvm_master/tools/obj2yaml/macho2yaml.cpp
+++ macports_master/tools/obj2yaml/macho2yaml.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -15,7 +15,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -14,7 +14,21 @@
</span> #include "llvm/Support/ErrorHandling.h"
#include "llvm/Support/LEB128.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -65,28 +65,6 @@ index fa81ce974ec..1e86f820437 100644
</span>
using namespace llvm;
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/tools/llvm-readobj/ObjDumper.cpp.orig 2018-09-03 23:25:13.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/tools/llvm-readobj/ObjDumper.cpp 2018-09-03 23:26:25.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -27,6 +27,20 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ObjDumper::~ObjDumper() {
</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;'>-+#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;'>- static void printAsPrintable(raw_ostream &W, const uint8_t *Start, size_t Len) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for (size_t i = 0; i < Len; i++)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- W << (isPrint(Start[i]) ? static_cast<char>(Start[i]) : '.');
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.21.0 (Apple Git-120)
</span>
<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 da1f466..292b4f7 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;'>@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 1bbe86f7fae2f5222ee6d88d7e3c8d2dae3145c6 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From fc3f9d69c4a99764af0885335c10e5286be351e9 Mon Sep 17 00:00:00 2001
</span> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Wed, 27 Dec 2017 23:05:43 -0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 5/5] Threading: Only call pthread_setname_np() on SnowLeopard+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 5/6] Threading: Only call pthread_setname_np() on SnowLeopard+
</span>
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
---
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,10 +9,10 @@ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span> 1 file changed, 3 insertions(+)
diff --git llvm_master/lib/Support/Unix/Threading.inc macports_master/lib/Support/Unix/Threading.inc
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 267af388ecd..1c8c1b026e3 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index ed9a9656305..e8f9a13860f 100644
</span> --- llvm_master/lib/Support/Unix/Threading.inc
+++ macports_master/lib/Support/Unix/Threading.inc
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -15,6 +15,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -14,6 +14,7 @@
</span> #include "llvm/ADT/Twine.h"
#if defined(__APPLE__)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,5 +32,5 @@ index 267af388ecd..1c8c1b026e3 100644
</span>
void llvm::get_thread_name(SmallVectorImpl<char> &Name) {
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.15.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.21.0 (Apple Git-120)
</span>
<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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..de0a810
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</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;'>@@ -0,0 +1,29 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From e6f64b0058a576c78f7ad4dee747c269b0444006 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: Thu, 4 Jul 2019 13:23:19 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 6/6] Only call setpriority(PRIO_DARWIN_THREAD, 0,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PRIO_DARWIN_BG) if it is available
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Tiger and earlier versions of darwin do not support this.
</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;'>+ lib/Support/Unix/Threading.inc | 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 llvm_master/lib/Support/Unix/Threading.inc macports_master/lib/Support/Unix/Threading.inc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index e8f9a13860f..e731f750c1d 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- llvm_master/lib/Support/Unix/Threading.inc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macports_master/lib/Support/Unix/Threading.inc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -237,7 +237,7 @@ SetThreadPriorityResult llvm::set_thread_priority(ThreadPriority Priority) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ &priority)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ? SetThreadPriorityResult::SUCCESS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ : SetThreadPriorityResult::FAILURE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#elif defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif defined(__APPLE__) && defined(PRIO_DARWIN_THREAD) && defined(PRIO_DARWIN_BG)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // https://developer.apple.com/library/archive/documentation/System/Conceptual/ManPages_iPhoneOS/man2/getpriority.2.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // When setting a thread into background state the scheduling priority is set
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // to lowest value, disk and network IO are throttled. Network IO will be
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.21.0 (Apple Git-120)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><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 f2498fb..30e782c 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;'>@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 2e4692aba7027972d6fa621cafe3f33a54c627c5 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From d179c9b8622c923eec16cbd99b514862df3d3554 Mon Sep 17 00:00:00 2001
</span> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sat, 17 Jan 2015 17:50:24 -0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1001/1008] MacPorts Only: Prepare clang-format for replacement
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1001/1007] MacPorts Only: Prepare clang-format for replacement
</span> with absolute path
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,10 +13,10 @@ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span> tools/clang-format/clang-format.py | 2 +-
5 files changed, 5 insertions(+), 6 deletions(-)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git llvm_release_80/tools/clang/tools/clang-format/clang-format-bbedit.applescript macports_release_80/tools/clang/tools/clang-format/clang-format-bbedit.applescript
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git llvm_master/tools/clang/tools/clang-format/clang-format-bbedit.applescript macports_master/tools/clang/tools/clang-format/clang-format-bbedit.applescript
</span> index fa88fe9004..eb09448be5 100644
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- llvm_release_80/tools/clang/tools/clang-format/clang-format-bbedit.applescript
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ macports_release_80/tools/clang/tools/clang-format/clang-format-bbedit.applescript
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- llvm_master/tools/clang/tools/clang-format/clang-format-bbedit.applescript
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macports_master/tools/clang/tools/clang-format/clang-format-bbedit.applescript
</span> @@ -15,7 +15,7 @@ tell application "BBEdit"
end tell
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,11 +26,11 @@ index fa88fe9004..eb09448be5 100644
</span>
tell application "BBEdit"
-- "set contents of text document 1 to newContents" scrolls to the bottom while
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git llvm_release_80/tools/clang/tools/clang-format/clang-format-diff.py macports_release_80/tools/clang/tools/clang-format/clang-format-diff.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index d6d3510416..d9b558e70b 100755
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- llvm_release_80/tools/clang/tools/clang-format/clang-format-diff.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ macports_release_80/tools/clang/tools/clang-format/clang-format-diff.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -59,7 +59,7 @@ def main():
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git llvm_master/tools/clang/tools/clang-format/clang-format-diff.py macports_master/tools/clang/tools/clang-format/clang-format-diff.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 3ba0abefc9..d67e3733bd 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- llvm_master/tools/clang/tools/clang-format/clang-format-diff.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macports_master/tools/clang/tools/clang-format/clang-format-diff.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -58,7 +58,7 @@ def main():
</span> parser.add_argument('-style',
help='formatting style to apply (LLVM, Google, Chromium, '
'Mozilla, WebKit)')
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,10 +39,10 @@ index d6d3510416..d9b558e70b 100755
</span> help='location of binary to use for clang-format')
args = parser.parse_args()
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git llvm_release_80/tools/clang/tools/clang-format/clang-format-sublime.py macports_release_80/tools/clang/tools/clang-format/clang-format-sublime.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 5ea9a27825..83a2967625 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- llvm_release_80/tools/clang/tools/clang-format/clang-format-sublime.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ macports_release_80/tools/clang/tools/clang-format/clang-format-sublime.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git llvm_master/tools/clang/tools/clang-format/clang-format-sublime.py macports_master/tools/clang/tools/clang-format/clang-format-sublime.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 20c867092e..ae823c1d05 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- llvm_master/tools/clang/tools/clang-format/clang-format-sublime.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macports_master/tools/clang/tools/clang-format/clang-format-sublime.py
</span> @@ -18,7 +18,7 @@ import sublime_plugin
import subprocess
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,10 +52,10 @@ index 5ea9a27825..83a2967625 100644
</span>
# Change this to format according to other formatting styles. See the output of
# 'clang-format --help' for a list of supported styles. The default looks for
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git llvm_release_80/tools/clang/tools/clang-format/clang-format.el macports_release_80/tools/clang/tools/clang-format/clang-format.el
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 4f11daf15f..439beddd45 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- llvm_release_80/tools/clang/tools/clang-format/clang-format.el
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ macports_release_80/tools/clang/tools/clang-format/clang-format.el
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git llvm_master/tools/clang/tools/clang-format/clang-format.el macports_master/tools/clang/tools/clang-format/clang-format.el
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 0b9dc8d6fa..eebc4d115e 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- llvm_master/tools/clang/tools/clang-format/clang-format.el
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macports_master/tools/clang/tools/clang-format/clang-format.el
</span> @@ -36,8 +36,7 @@
:group 'tools)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -66,10 +66,10 @@ index 4f11daf15f..439beddd45 100644
</span> "Location of the clang-format executable.
A string containing the name or the full path of the executable."
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git llvm_release_80/tools/clang/tools/clang-format/clang-format.py macports_release_80/tools/clang/tools/clang-format/clang-format.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index fe068bd41c..e0f1128a1c 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- llvm_release_80/tools/clang/tools/clang-format/clang-format.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ macports_release_80/tools/clang/tools/clang-format/clang-format.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git llvm_master/tools/clang/tools/clang-format/clang-format.py macports_master/tools/clang/tools/clang-format/clang-format.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 0c772f91f6..33c96180a4 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- llvm_master/tools/clang/tools/clang-format/clang-format.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macports_master/tools/clang/tools/clang-format/clang-format.py
</span> @@ -36,7 +36,7 @@ import vim
# set g:clang_format_path to the path to clang-format if it is not on the path
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -80,5 +80,5 @@ index fe068bd41c..e0f1128a1c 100644
</span> binary = vim.eval('g:clang_format_path')
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.20.1 (Apple Git-116)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.21.0 (Apple Git-120)
</span>
<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 6c8d568..8ca3a70 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;'>@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From de851daf838bf4bce181f7f944c5244106cb5aea Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From c391f668b5a767a3d003cf3fc7b8b4e7a321a06e 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/1008] MacPorts Only: Fix name of scan-view executable
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1002/1007] MacPorts Only: Fix name of scan-view executable
</span> inside scan-build
http://trac.macports.org/ticket/35006
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,11 +11,11 @@ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span> tools/scan-build/bin/scan-build | 2 ++
1 file changed, 2 insertions(+)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git llvm_release_80/tools/clang/tools/scan-build/bin/scan-build macports_release_80/tools/clang/tools/scan-build/bin/scan-build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index fd0dd66b2d..bd5340c6b6 100755
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- llvm_release_80/tools/clang/tools/scan-build/bin/scan-build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ macports_release_80/tools/clang/tools/scan-build/bin/scan-build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1915,6 +1915,8 @@ if (defined $Options{OutputFormat}) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git llvm_master/tools/clang/tools/scan-build/bin/scan-build macports_master/tools/clang/tools/scan-build/bin/scan-build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 903e19a290..0be6057853 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- llvm_master/tools/clang/tools/scan-build/bin/scan-build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macports_master/tools/clang/tools/scan-build/bin/scan-build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1933,6 +1933,8 @@ if (defined $Options{OutputFormat}) {
</span> Diag "Analysis run complete.\n";
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;'>@@ -25,5 +25,5 @@ index fd0dd66b2d..bd5340c6b6 100755
</span> if (! -x $ScanView) { $ScanView = Cwd::realpath("$RealBin/../../scan-view/bin/scan-view"); }
exec $ScanView, "$Options{OutputDir}";
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.20.1 (Apple Git-116)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.21.0 (Apple Git-120)
</span>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-devel/files/1003-Default-to-ppc7400-for-OSX-10.5.patch b/lang/llvm-devel/files/1003-Default-to-ppc7400-for-OSX-10.5.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 74adb6a..b260335 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-devel/files/1003-Default-to-ppc7400-for-OSX-10.5.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-devel/files/1003-Default-to-ppc7400-for-OSX-10.5.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,17 +1,17 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 3fb5a64c13f2e22aac27b00137924a9d70ba194c Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From f6fa657bb497a3d9dedfa80e713ddaa10e384fc2 Mon Sep 17 00:00:00 2001
</span> From: Iain Sandoe <iain@codesourcery.com>
Date: Sun, 27 Jul 2014 20:35:16 +0100
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1003/1008] Default to ppc7400 for OSX 10.5+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1003/1007] Default to ppc7400 for OSX 10.5+
</span>
---
lib/Driver/ToolChains/CommonArgs.cpp | 3 +++
1 file changed, 3 insertions(+)
diff --git llvm_master/tools/clang/lib/Driver/ToolChains/CommonArgs.cpp macports_master/tools/clang/lib/Driver/ToolChains/CommonArgs.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 1e093b25b9..729369180e 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index d0c9d7d396..dbf7a15002 100644
</span> --- llvm_master/tools/clang/lib/Driver/ToolChains/CommonArgs.cpp
+++ macports_master/tools/clang/lib/Driver/ToolChains/CommonArgs.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -318,6 +318,9 @@ std::string tools::getCPUName(const ArgList &Args, const llvm::Triple &T,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -299,6 +299,9 @@ std::string tools::getCPUName(const ArgList &Args, const llvm::Triple &T,
</span> TargetCPUName = "ppc64";
else if (T.getArch() == llvm::Triple::ppc64le)
TargetCPUName = "ppc64le";
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,5 +22,5 @@ index 1e093b25b9..729369180e 100644
</span> TargetCPUName = "ppc";
}
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.17.1 (Apple Git-112)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.21.0 (Apple Git-120)
</span>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-devel/files/1005-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch b/lang/llvm-devel/files/1004-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch
</span>similarity index 65%
rename from lang/llvm-devel/files/1005-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch
rename to lang/llvm-devel/files/1004-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch
<span style='display:block; white-space:pre;color:#808080;'>index 3a6ce33..83fedd2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-devel/files/1005-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-devel/files/1004-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 74d7964d3f0a4d6af5842da68ddc94c68847a0aa Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From a4f95a5ec1e6d615dbb246d3577735a3575d1179 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 1005/1008] Default to fragile ObjC runtime when targeting
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1004/1007] 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:#e0e0e0;'>@@ -9,10 +9,10 @@ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span> lib/Driver/ToolChains/Darwin.h | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git llvm_release_80/tools/clang/lib/Driver/ToolChains/Darwin.h macports_release_80/tools/clang/lib/Driver/ToolChains/Darwin.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index d753f8967a..c73f74133c 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- llvm_release_80/tools/clang/lib/Driver/ToolChains/Darwin.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ macports_release_80/tools/clang/lib/Driver/ToolChains/Darwin.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+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:#e0ffe0;'>+index 2dc7c85880..639853df05 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- llvm_master/tools/clang/lib/Driver/ToolChains/Darwin.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macports_master/tools/clang/lib/Driver/ToolChains/Darwin.h
</span> @@ -229,8 +229,10 @@ public:
bool IsEncodeExtendedBlockSignatureDefault() const override { return true; }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,5 +27,5 @@ index d753f8967a..c73f74133c 100644
</span>
bool UseObjCMixedDispatch() const override { return true; }
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.20.1 (Apple Git-116)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.21.0 (Apple Git-120)
</span>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-devel/files/1004-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch b/lang/llvm-devel/files/1004-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 61bd36f..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-devel/files/1004-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,29 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 9f9ae872db92fced923774e7ed8fdbbfa9db8dba 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: Sat, 17 Jan 2015 19:08:57 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1004/1008] Only call setpriority(PRIO_DARWIN_THREAD, 0,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PRIO_DARWIN_BG) if it is available
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Tiger and earlier versions of darwin do not support this.
</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;'>- tools/libclang/CIndex.cpp | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 1 insertion(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git llvm_master/tools/clang/tools/libclang/CIndex.cpp macports_master/tools/clang/tools/libclang/CIndex.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 499d9abf9a..97a47396ee 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- llvm_master/tools/clang/tools/libclang/CIndex.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ macports_master/tools/clang/tools/libclang/CIndex.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -8504,7 +8504,7 @@ void clang::setThreadBackgroundPriority() {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (getenv("LIBCLANG_BGPRIO_DISABLE"))
</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;'>--#ifdef USE_DARWIN_THREADS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(USE_DARWIN_THREADS) && defined(PRIO_DARWIN_THREAD) && defined(PRIO_DARWIN_BG)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- setpriority(PRIO_DARWIN_THREAD, 0, PRIO_DARWIN_BG);
</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;'>-2.17.1 (Apple Git-112)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-devel/files/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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..f26118e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</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;'>@@ -0,0 +1,41 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From c5863b6661267780e20f529edf4831e1e65aa6a3 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: Mon, 31 Oct 2016 15:06:36 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1005/1007] Fixup libstdc++ header search paths for older
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ versions of Mac OS X
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+The subpaths were removed in Lion. Leopard and Snow Leopard had darwin8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+symlinks for compatibility.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://llvm.org/bugs/show_bug.cgi?id=30858
</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;'>+ 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 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:#e0ffe0;'>+index 5de7d7132d..165a331fe5 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- llvm_master/tools/clang/lib/Driver/ToolChains/Darwin.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macports_master/tools/clang/lib/Driver/ToolChains/Darwin.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1958,7 +1958,7 @@ void DarwinClang::AddClangCXXStdlibIncludeArgs(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "powerpc-apple-darwin10",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ arch == llvm::Triple::ppc64 ? "ppc64" : "");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IsBaseFound |= AddGnuCPlusPlusIncludePaths(DriverArgs, CC1Args, UsrIncludeCxx,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "4.0.0", "powerpc-apple-darwin10",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "4.0.0", "powerpc-apple-darwin8",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ arch == llvm::Triple::ppc64 ? "ppc64" : "");
</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;'>+@@ -1970,7 +1970,7 @@ void DarwinClang::AddClangCXXStdlibIncludeArgs(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ arch == llvm::Triple::x86_64 ? "x86_64" : "");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IsBaseFound |= AddGnuCPlusPlusIncludePaths(DriverArgs, CC1Args, UsrIncludeCxx,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "4.0.0", "i686-apple-darwin8",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ arch == llvm::Triple::x86_64 ? "x86_64" : "");
</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 llvm::Triple::arm:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.21.0 (Apple Git-120)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-devel/files/1007-Fix-build-issues-pre-Lion-due-to-missing-a-strnlen-d.patch b/lang/llvm-devel/files/1006-Fix-build-issues-pre-Lion-due-to-missing-a-strnlen-d.patch
</span>similarity index 66%
rename from lang/llvm-devel/files/1007-Fix-build-issues-pre-Lion-due-to-missing-a-strnlen-d.patch
rename to lang/llvm-devel/files/1006-Fix-build-issues-pre-Lion-due-to-missing-a-strnlen-d.patch
<span style='display:block; white-space:pre;color:#808080;'>index e6959f1..fce3d3e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-devel/files/1007-Fix-build-issues-pre-Lion-due-to-missing-a-strnlen-d.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-devel/files/1006-Fix-build-issues-pre-Lion-due-to-missing-a-strnlen-d.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From fbce72a5f9f5ad4d09e162bafda76ce4a8fd3159 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 175e835fb2403a9fe6a620c9a663b3045547dfe6 Mon Sep 17 00:00:00 2001
</span> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Tue, 20 Dec 2016 15:53:39 -0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1007/1008] Fix build issues pre-Lion due to missing a strnlen
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1006/1007] Fix build issues pre-Lion due to missing a strnlen
</span> definition
https://trac.macports.org/ticket/51520
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,11 +12,11 @@ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span> lib/Lex/HeaderMap.cpp | 14 ++++++++++++++
1 file changed, 14 insertions(+)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git llvm_release_80/tools/clang/lib/Lex/HeaderMap.cpp macports_release_80/tools/clang/lib/Lex/HeaderMap.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 23cb053c2d..f99ae9ede8 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- llvm_release_80/tools/clang/lib/Lex/HeaderMap.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ macports_release_80/tools/clang/lib/Lex/HeaderMap.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -26,6 +26,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+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:#e0ffe0;'>+index e0bf58b675..1db3380602 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- llvm_master/tools/clang/lib/Lex/HeaderMap.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macports_master/tools/clang/lib/Lex/HeaderMap.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -25,6 +25,20 @@
</span> #include <memory>
using namespace clang;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,5 +38,5 @@ index 23cb053c2d..f99ae9ede8 100644
</span> /// format, used to look up keys in the hash table. The hash table uses simple
/// linear probing based on this function.
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.20.1 (Apple Git-116)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.21.0 (Apple Git-120)
</span>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-devel/files/1006-Fixup-libstdc-header-search-paths-for-older-versions.patch b/lang/llvm-devel/files/1006-Fixup-libstdc-header-search-paths-for-older-versions.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index f666803..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-devel/files/1006-Fixup-libstdc-header-search-paths-for-older-versions.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,41 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From b0c021885e00327d0cbe5aed390cde934ebf179b 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: Mon, 31 Oct 2016 15:06:36 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1006/1008] 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:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-The subpaths were removed in Lion. Leopard and Snow Leopard had darwin8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-symlinks for compatibility.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://llvm.org/bugs/show_bug.cgi?id=30858
</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/Frontend/InitHeaderSearch.cpp | 4 ++--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 2 insertions(+), 2 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git llvm_release_80/tools/clang/lib/Frontend/InitHeaderSearch.cpp macports_release_80/tools/clang/lib/Frontend/InitHeaderSearch.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 67842b5dca..42d71c1e30 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- llvm_release_80/tools/clang/lib/Frontend/InitHeaderSearch.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ macports_release_80/tools/clang/lib/Frontend/InitHeaderSearch.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -376,7 +376,7 @@ void InitHeaderSearch::AddDefaultCPlusPlusIncludePaths(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "powerpc-apple-darwin10", "",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "ppc64", triple);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- IsBaseFound |= AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.0.0",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "powerpc-apple-darwin10", "",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "powerpc-apple-darwin8", "",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "ppc64", triple);
</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;'>-@@ -386,7 +386,7 @@ void InitHeaderSearch::AddDefaultCPlusPlusIncludePaths(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "i686-apple-darwin10", "",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "x86_64", triple);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- IsBaseFound |= AddGnuCPlusPlusIncludePaths(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "/usr/include/c++/4.0.0", "i686-apple-darwin8", "", "", triple);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "/usr/include/c++/4.0.0", "i686-apple-darwin8", "", "x86_64", triple);
</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 llvm::Triple::arm:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.20.1 (Apple Git-116)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-devel/files/1008-Fix-float.h-to-work-on-Snow-Leopard-and-earlier.patch b/lang/llvm-devel/files/1007-Fix-float.h-to-work-on-Snow-Leopard-and-earlier.patch
</span>similarity index 69%
rename from lang/llvm-devel/files/1008-Fix-float.h-to-work-on-Snow-Leopard-and-earlier.patch
rename to lang/llvm-devel/files/1007-Fix-float.h-to-work-on-Snow-Leopard-and-earlier.patch
<span style='display:block; white-space:pre;color:#808080;'>index 8cb0495..c9bc6a4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-devel/files/1008-Fix-float.h-to-work-on-Snow-Leopard-and-earlier.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-devel/files/1007-Fix-float.h-to-work-on-Snow-Leopard-and-earlier.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 2ffb631069c97e076eab2a2f0b634ce6b3a6d3b2 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From eae229c3da65a256c168f3e36e00448812acbf9c 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 1008/1008] Fix float.h to work on Snow Leopard and earlier
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1007/1007] Fix float.h to work on Snow Leopard and earlier
</span>
https://bugs.llvm.org/show_bug.cgi?id=31504
https://trac.macports.org/ticket/54135
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,11 +11,11 @@ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span> lib/Headers/float.h | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git llvm_release_80/tools/clang/lib/Headers/float.h macports_release_80/tools/clang/lib/Headers/float.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 56215cd624..5f9bd36db2 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- llvm_release_80/tools/clang/lib/Headers/float.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ macports_release_80/tools/clang/lib/Headers/float.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -31,7 +31,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+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:#e0ffe0;'>+index ed610b24aa..9dc3c0a12a 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- llvm_master/tools/clang/lib/Headers/float.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macports_master/tools/clang/lib/Headers/float.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -17,7 +17,12 @@
</span> * 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 56215cd624..5f9bd36db2 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.20.1 (Apple Git-116)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.21.0 (Apple Git-120)
</span>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-devel/files/2001-xray-Define-O_CLOEXEC-for-older-SDKs-that-don-t-have.patch b/lang/llvm-devel/files/2001-xray-Define-O_CLOEXEC-for-older-SDKs-that-don-t-have.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 91c205d..80b52f7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-devel/files/2001-xray-Define-O_CLOEXEC-for-older-SDKs-that-don-t-have.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-devel/files/2001-xray-Define-O_CLOEXEC-for-older-SDKs-that-don-t-have.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From c254025f32afe73adf830b96ad1b6abcceb02ac9 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From efa7f9f49c1491483910d438b3d5be927c9e5ddc Mon Sep 17 00:00:00 2001
</span> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Wed, 27 Dec 2017 23:21:37 -0800
Subject: [PATCH 2001/2002] xray: Define O_CLOEXEC for older SDKs that don't
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,11 +10,11 @@ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span> lib/xray/xray_x86_64.cc | 6 ++++++
2 files changed, 12 insertions(+)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git llvm_release_80/projects/compiler-rt/lib/xray/xray_utils.cc macports_release_80/projects/compiler-rt/lib/xray/xray_utils.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 59ba6c308..3496d3b1b 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- llvm_release_80/projects/compiler-rt/lib/xray/xray_utils.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ macports_release_80/projects/compiler-rt/lib/xray/xray_utils.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -37,6 +37,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git llvm_master/projects/compiler-rt/lib/xray/xray_utils.cc macports_master/projects/compiler-rt/lib/xray/xray_utils.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 82674baa5..5caa31723 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- llvm_master/projects/compiler-rt/lib/xray/xray_utils.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macports_master/projects/compiler-rt/lib/xray/xray_utils.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -36,6 +36,12 @@
</span> #include <zircon/syscalls.h>
#endif
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,10 +27,10 @@ index 59ba6c308..3496d3b1b 100644
</span> namespace __xray {
#if SANITIZER_FUCHSIA
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git llvm_release_80/projects/compiler-rt/lib/xray/xray_x86_64.cc macports_release_80/projects/compiler-rt/lib/xray/xray_x86_64.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git llvm_master/projects/compiler-rt/lib/xray/xray_x86_64.cc macports_master/projects/compiler-rt/lib/xray/xray_x86_64.cc
</span> index e63ee1b3b..65b59ec61 100644
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- llvm_release_80/projects/compiler-rt/lib/xray/xray_x86_64.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ macports_release_80/projects/compiler-rt/lib/xray/xray_x86_64.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- llvm_master/projects/compiler-rt/lib/xray/xray_x86_64.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macports_master/projects/compiler-rt/lib/xray/xray_x86_64.cc
</span> @@ -26,6 +26,12 @@
#include <tuple>
#include <unistd.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,5 +45,5 @@ index e63ee1b3b..65b59ec61 100644
</span>
#if SANITIZER_LINUX
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.20.1 (Apple Git-116)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.21.0 (Apple Git-120)
</span>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-devel/files/2002-Work-around-no-libdispatch-on-10.6.patch b/lang/llvm-devel/files/2002-Work-around-no-libdispatch-on-10.6.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index d0bc58f..a479bac 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-devel/files/2002-Work-around-no-libdispatch-on-10.6.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-devel/files/2002-Work-around-no-libdispatch-on-10.6.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 8e721ff306a2746c8ce5606cb5163119656f8003 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 1e8e2bcaa13263c4aa11ab6ef31ec944776a100d Mon Sep 17 00:00:00 2001
</span> From: Ken Cunningham <kencu@macports.org>
Date: Thu, 28 Mar 2019 21:26:26 -0700
Subject: [PATCH 2002/2002] Work around no libdispatch on < 10.6
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,11 +7,11 @@ Subject: [PATCH 2002/2002] Work around no libdispatch on < 10.6
</span> lib/builtins/os_version_check.c | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git llvm_release_80/projects/compiler-rt/lib/builtins/os_version_check.c macports_release_80/projects/compiler-rt/lib/builtins/os_version_check.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index e0d40edc7..406dfaf16 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- llvm_release_80/projects/compiler-rt/lib/builtins/os_version_check.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ macports_release_80/projects/compiler-rt/lib/builtins/os_version_check.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -15,8 +15,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+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:#e0ffe0;'>+index 3794b9794..e3877449a 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- llvm_master/projects/compiler-rt/lib/builtins/os_version_check.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macports_master/projects/compiler-rt/lib/builtins/os_version_check.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -13,8 +13,11 @@
</span>
#ifdef __APPLE__
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,21 +23,21 @@ index e0d40edc7..406dfaf16 100644
</span> #include <dlfcn.h>
#include <stdint.h>
#include <stdio.h>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -25,7 +28,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23,7 +26,9 @@
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- /* These three variables hold the host's OS version. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // These three variables hold the host's OS version.
</span> static int32_t GlobalMajor, GlobalMinor, GlobalSubminor;
-static dispatch_once_t DispatchOnceCounter;
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
+ static dispatch_once_t DispatchOnceCounter;
+#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>- /* We can't include <CoreFoundation/CoreFoundation.h> directly from here, so
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * just forward declare everything that we need from it. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -205,7 +210,13 @@ Fail:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // We can't include <CoreFoundation/CoreFoundation.h> directly from here, so
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // just forward declare everything that we need from it.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -203,7 +208,13 @@ Fail:
</span>
int32_t __isOSVersionAtLeast(int32_t Major, int32_t Minor, int32_t Subminor) {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Populate the global version variables, if they haven't already. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Populate the global version variables, if they haven't already.
</span> +#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
dispatch_once_f(&DispatchOnceCounter, NULL, parseSystemVersionPList);
+#else
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,5 +49,5 @@ index e0d40edc7..406dfaf16 100644
</span> if (Major < GlobalMajor)
return 1;
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.20.1 (Apple Git-116)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.21.0 (Apple Git-120)
</span>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-devel/files/3001-Fix-local-and-iterator-when-building-with-Lion-and-n.patch b/lang/llvm-devel/files/3001-Fix-local-and-iterator-when-building-with-Lion-and-n.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index f75d983..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-devel/files/3001-Fix-local-and-iterator-when-building-with-Lion-and-n.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,45 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 7c827b37bfae77c0582f963441a8f2259f6358b0 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: Fri, 16 Jan 2015 21:34:36 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 3001/3003] Fix <local> and <iterator> when building with Lion
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- and newer Availability.h
</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;'>- include/iterator | 4 ++--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include/locale | 4 ++--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2 files changed, 4 insertions(+), 4 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git llvm_release_80/projects/libcxx/include/iterator macports_release_80/projects/libcxx/include/iterator
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index bda177e11..78f7ec93a 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- llvm_release_80/projects/libcxx/include/iterator
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ macports_release_80/projects/libcxx/include/iterator
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1080,8 +1080,8 @@ public:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _LIBCPP_INLINE_VISIBILITY bool failed() const _NOEXCEPT {return __sbuf_ == 0;}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if !defined(__APPLE__) || \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED > __MAC_10_8) || \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && __IPHONE_OS_VERSION_MIN_REQUIRED > __IPHONE_6_0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && defined(__MAC_10_8) && __MAC_OS_X_VERSION_MIN_REQUIRED > __MAC_10_8) || \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && defined(__IPHONE_6_0) && __IPHONE_OS_VERSION_MIN_REQUIRED > __IPHONE_6_0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- template <class _Ch, class _Tr>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- friend
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git llvm_release_80/projects/libcxx/include/locale macports_release_80/projects/libcxx/include/locale
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 2043892fa..14877f674 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- llvm_release_80/projects/libcxx/include/locale
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ macports_release_80/projects/libcxx/include/locale
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1374,8 +1374,8 @@ __pad_and_output(_OutputIterator __s,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if !defined(__APPLE__) || \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED > __MAC_10_8) || \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && __IPHONE_OS_VERSION_MIN_REQUIRED > __IPHONE_6_0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && defined(__MAC_10_8) && __MAC_OS_X_VERSION_MIN_REQUIRED > __MAC_10_8) || \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && defined(__IPHONE_6_0) && __IPHONE_OS_VERSION_MIN_REQUIRED > __IPHONE_6_0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- template <class _CharT, class _Traits>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _LIBCPP_HIDDEN
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.20.1 (Apple Git-116)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-devel/files/3002-Fix-missing-long-long-math-prototypes-when-using-the.patch b/lang/llvm-devel/files/3002-Fix-missing-long-long-math-prototypes-when-using-the.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 83723e7..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-devel/files/3002-Fix-missing-long-long-math-prototypes-when-using-the.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,51 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 7dce4fe412d0ebcd5ccd8b6d48e284e133c52d7e 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: Sat, 17 Jan 2015 16:26:20 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 3002/3003] 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:#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;'>- include/math.h | 26 ++++++++++++++++++++++++++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 26 insertions(+)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git llvm_release_80/projects/libcxx/include/math.h macports_release_80/projects/libcxx/include/math.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 3cc72aa27..6fb2d8b51 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- llvm_release_80/projects/libcxx/include/math.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ macports_release_80/projects/libcxx/include/math.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -300,6 +300,32 @@ long double truncl(long double x);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include_next <math.h>
</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;'>-+# if __has_include(<Availability.h>)
</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_MAX_ALLOWED < 1070
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# define __APPLE_BAD_MATH_H 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# define __APPLE_BAD_MATH_H 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# define __APPLE_BAD_MATH_H 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# if __APPLE_BAD_MATH_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* These prototypes are incorrectly omitted from <math.h> on Snow Leopard despite being available */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+extern "C" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ extern long long int llrintl(long double);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ extern long long int llrint(double);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ extern long long int llrintf(float);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ extern long long int llroundl(long double);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ extern long long int llround(double);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ extern long long int llroundf(float);
</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 // __APPLE__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef __cplusplus
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // We support including .h headers inside 'extern "C"' contexts, so switch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.20.1 (Apple Git-116)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-devel/files/3003-implement-atomic-using-mutex-lock_guard-for-64b-ops-.patch b/lang/llvm-devel/files/3003-implement-atomic-using-mutex-lock_guard-for-64b-ops-.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 95ee938..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-devel/files/3003-implement-atomic-using-mutex-lock_guard-for-64b-ops-.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,316 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 2fcbb80c4a28fb39f31d5a5c5ad08bde05336244 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: David Fang <fang@csl.cornell.edu>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Wed, 15 Jan 2014 21:27:34 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 3003/3003] 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:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</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:#ffe0e0;'>- 2 files changed, 286 insertions(+)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- create mode 100644 include/__atomic_locked
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git llvm_release_80/projects/libcxx/include/__atomic_locked macports_release_80/projects/libcxx/include/__atomic_locked
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-new file mode 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 000000000..f10dd747e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ macports_release_80/projects/libcxx/include/__atomic_locked
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1,240 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// -*- C++ -*-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+//===--------------------------- __atomic_locked --------------------------===//
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+//
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// The LLVM Compiler Infrastructure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+//
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// This file is distributed under the University of Illinois Open Source
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// License. See LICENSE.TXT for details.
</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;'>-+#ifndef _LIBCPP_ATOMIC_LOCKED
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define _LIBCPP_ATOMIC_LOCKED
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <__mutex_base> // for mutex and lock_guard
</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;'>-+ This provides slow-but-usable lock-based atomic access to
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ structures for which atomic lock-free functions are missing.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ This is motivated by the desire for 64b atomic operations
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ on 32b PowerPC architectures.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+**/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#pragma GCC system_header
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+_LIBCPP_BEGIN_NAMESPACE_STD
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+template <class _Tp, bool = is_integral<_Tp>::value && !is_same<_Tp, bool>::value>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+struct __atomic_mutex_locked // false
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ mutable _Atomic(_Tp) __a_;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ mutable mutex __lock_;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ typedef lock_guard<mutex> lock_type;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _Tp& na(void) const { return reinterpret_cast<_Tp&>(__a_); }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ volatile _Tp& na(void) const volatile { return reinterpret_cast<volatile _Tp&>(__a_); }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _LIBCPP_INLINE_VISIBILITY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ bool is_lock_free() const volatile _NOEXCEPT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {return false;}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _LIBCPP_INLINE_VISIBILITY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ bool is_lock_free() const _NOEXCEPT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {return false;}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _LIBCPP_INLINE_VISIBILITY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ void store(_Tp __d, memory_order = memory_order_seq_cst) volatile _NOEXCEPT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ { const lock_type g(const_cast<mutex&>(__lock_)); na() = __d; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _LIBCPP_INLINE_VISIBILITY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ void store(_Tp __d, memory_order = memory_order_seq_cst) _NOEXCEPT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ { const lock_type g(__lock_); na() = __d; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _LIBCPP_INLINE_VISIBILITY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _Tp load(memory_order = memory_order_seq_cst) const volatile _NOEXCEPT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ { const lock_type g(const_cast<mutex&>(__lock_)); return na(); }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _LIBCPP_INLINE_VISIBILITY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _Tp load(memory_order = memory_order_seq_cst) const _NOEXCEPT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ { const lock_type g(__lock_); return na(); }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _LIBCPP_INLINE_VISIBILITY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ operator _Tp() const volatile _NOEXCEPT {return load();}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _LIBCPP_INLINE_VISIBILITY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ operator _Tp() const _NOEXCEPT {return load();}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _LIBCPP_INLINE_VISIBILITY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _Tp exchange(_Tp __d, memory_order = memory_order_seq_cst) volatile _NOEXCEPT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ { const lock_type g(const_cast<mutex&>(__lock_));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // or use std::swap
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const _Tp ret = na(); na() = __d; return ret; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _LIBCPP_INLINE_VISIBILITY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _Tp exchange(_Tp __d, memory_order = memory_order_seq_cst) _NOEXCEPT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ { const lock_type g(__lock_);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // or use std::swap
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const _Tp ret = na(); na() = __d; return ret; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _LIBCPP_INLINE_VISIBILITY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ bool compare_exchange_weak(_Tp& __e, _Tp __d,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ memory_order __s, memory_order __f) volatile _NOEXCEPT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ { const lock_type g(const_cast<mutex&>(__lock_));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (na() == __e) { na() = __d; return true; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else { __e = na(); return false; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _LIBCPP_INLINE_VISIBILITY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ bool compare_exchange_weak(_Tp& __e, _Tp __d,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ memory_order __s, memory_order __f) _NOEXCEPT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ { const lock_type g(__lock_);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (na() == __e) { na() = __d; return true; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else { __e = na(); return false; }
</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;'>-+ // for now, _weak inditinguishable from _strong
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _LIBCPP_INLINE_VISIBILITY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ bool compare_exchange_strong(_Tp& __e, _Tp __d,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ memory_order __s, memory_order __f) volatile _NOEXCEPT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {return compare_exchange_weak(__e, __d, __s, __f);}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _LIBCPP_INLINE_VISIBILITY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ bool compare_exchange_strong(_Tp& __e, _Tp __d,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ memory_order __s, memory_order __f) _NOEXCEPT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {return compare_exchange_weak(__e, __d, __s, __f);}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _LIBCPP_INLINE_VISIBILITY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ bool compare_exchange_weak(_Tp& __e, _Tp __d,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ memory_order __m = memory_order_seq_cst) volatile _NOEXCEPT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {return compare_exchange_weak(__e, __d, __m, __m);}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _LIBCPP_INLINE_VISIBILITY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ bool compare_exchange_weak(_Tp& __e, _Tp __d,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ memory_order __m = memory_order_seq_cst) _NOEXCEPT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {return compare_exchange_weak(__e, __d, __m, __m);}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _LIBCPP_INLINE_VISIBILITY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ bool compare_exchange_strong(_Tp& __e, _Tp __d,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ memory_order __m = memory_order_seq_cst) volatile _NOEXCEPT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {return compare_exchange_strong(__e, __d, __m, __m);}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _LIBCPP_INLINE_VISIBILITY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ bool compare_exchange_strong(_Tp& __e, _Tp __d,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ memory_order __m = memory_order_seq_cst) _NOEXCEPT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {return compare_exchange_strong(__e, __d, __m, __m);}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _LIBCPP_INLINE_VISIBILITY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef _LIBCPP_HAS_NO_DEFAULTED_FUNCTIONS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ __atomic_mutex_locked() _NOEXCEPT = default;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ __atomic_mutex_locked() _NOEXCEPT : __a_() {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif // _LIBCPP_HAS_NO_DEFAULTED_FUNCTIONS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _LIBCPP_INLINE_VISIBILITY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _LIBCPP_CONSTEXPR __atomic_mutex_locked(_Tp __d) _NOEXCEPT : __a_(__d) {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef _LIBCPP_HAS_NO_DELETED_FUNCTIONS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ __atomic_mutex_locked(const __atomic_mutex_locked&) = delete;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ __atomic_mutex_locked& operator=(const __atomic_mutex_locked&) = delete;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ __atomic_mutex_locked& operator=(const __atomic_mutex_locked&) volatile = delete;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else // _LIBCPP_HAS_NO_DELETED_FUNCTIONS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+private:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ __atomic_mutex_locked(const __atomic_mutex_locked&);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ __atomic_mutex_locked& operator=(const __atomic_mutex_locked&);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ __atomic_mutex_locked& operator=(const __atomic_mutex_locked&) volatile;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif // _LIBCPP_HAS_NO_DELETED_FUNCTIONS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}; // end struct __atomic_mutex_locked
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// atomic<Integral>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+template <class _Tp>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+struct __atomic_mutex_locked<_Tp, true>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ : public __atomic_mutex_locked<_Tp, false>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ typedef __atomic_mutex_locked<_Tp, false> __base;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ typedef typename __base::lock_type lock_type;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ using __base::__lock_;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ using __base::na;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _LIBCPP_INLINE_VISIBILITY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ __atomic_mutex_locked() _NOEXCEPT _LIBCPP_DEFAULT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _LIBCPP_INLINE_VISIBILITY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _LIBCPP_CONSTEXPR __atomic_mutex_locked(_Tp __d) _NOEXCEPT : __base(__d) {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _LIBCPP_INLINE_VISIBILITY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _Tp fetch_add(_Tp __op, memory_order __m = memory_order_seq_cst) volatile _NOEXCEPT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ { const lock_type g(const_cast<mutex&>(__lock_));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const _Tp ret = na(); na() += __op; return ret;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _LIBCPP_INLINE_VISIBILITY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _Tp fetch_add(_Tp __op, memory_order __m = memory_order_seq_cst) _NOEXCEPT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ { const lock_type g(__lock_);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const _Tp ret = na(); na() += __op; return ret;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _LIBCPP_INLINE_VISIBILITY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _Tp fetch_sub(_Tp __op, memory_order __m = memory_order_seq_cst) volatile _NOEXCEPT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ { const lock_type g(const_cast<mutex&>(__lock_));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const _Tp ret = na(); na() -= __op; return ret;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _LIBCPP_INLINE_VISIBILITY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _Tp fetch_sub(_Tp __op, memory_order __m = memory_order_seq_cst) _NOEXCEPT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ { const lock_type g(__lock_);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const _Tp ret = na(); na() -= __op; return ret;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _LIBCPP_INLINE_VISIBILITY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _Tp fetch_and(_Tp __op, memory_order __m = memory_order_seq_cst) volatile _NOEXCEPT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ { const lock_type g(const_cast<mutex&>(__lock_));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const _Tp ret = na(); na() &= __op; return ret;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _LIBCPP_INLINE_VISIBILITY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _Tp fetch_and(_Tp __op, memory_order __m = memory_order_seq_cst) _NOEXCEPT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ { const lock_type g(__lock_);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const _Tp ret = na(); na() &= __op; return ret;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _LIBCPP_INLINE_VISIBILITY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _Tp fetch_or(_Tp __op, memory_order __m = memory_order_seq_cst) volatile _NOEXCEPT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ { const lock_type g(const_cast<mutex&>(__lock_));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const _Tp ret = na(); na() |= __op; return ret;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _LIBCPP_INLINE_VISIBILITY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _Tp fetch_or(_Tp __op, memory_order __m = memory_order_seq_cst) _NOEXCEPT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ { const lock_type g(__lock_);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const _Tp ret = na(); na() |= __op; return ret;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _LIBCPP_INLINE_VISIBILITY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _Tp fetch_xor(_Tp __op, memory_order __m = memory_order_seq_cst) volatile _NOEXCEPT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ { const lock_type g(const_cast<mutex&>(__lock_));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const _Tp ret = na(); na() ^= __op; return ret;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _LIBCPP_INLINE_VISIBILITY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _Tp fetch_xor(_Tp __op, memory_order __m = memory_order_seq_cst) _NOEXCEPT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ { const lock_type g(__lock_);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const _Tp ret = na(); na() ^= __op; return ret;
</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;'>-+ _LIBCPP_INLINE_VISIBILITY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _Tp operator++(int) volatile _NOEXCEPT {return fetch_add(_Tp(1));}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _LIBCPP_INLINE_VISIBILITY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _Tp operator++(int) _NOEXCEPT {return fetch_add(_Tp(1));}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _LIBCPP_INLINE_VISIBILITY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _Tp operator--(int) volatile _NOEXCEPT {return fetch_sub(_Tp(1));}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _LIBCPP_INLINE_VISIBILITY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _Tp operator--(int) _NOEXCEPT {return fetch_sub(_Tp(1));}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _LIBCPP_INLINE_VISIBILITY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _Tp operator++() volatile _NOEXCEPT {return fetch_add(_Tp(1)) + _Tp(1);}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _LIBCPP_INLINE_VISIBILITY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _Tp operator++() _NOEXCEPT {return fetch_add(_Tp(1)) + _Tp(1);}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _LIBCPP_INLINE_VISIBILITY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _Tp operator--() volatile _NOEXCEPT {return fetch_sub(_Tp(1)) - _Tp(1);}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _LIBCPP_INLINE_VISIBILITY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _Tp operator--() _NOEXCEPT {return fetch_sub(_Tp(1)) - _Tp(1);}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _LIBCPP_INLINE_VISIBILITY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _Tp operator+=(_Tp __op) volatile _NOEXCEPT {return fetch_add(__op) + __op;}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _LIBCPP_INLINE_VISIBILITY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _Tp operator+=(_Tp __op) _NOEXCEPT {return fetch_add(__op) + __op;}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _LIBCPP_INLINE_VISIBILITY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _Tp operator-=(_Tp __op) volatile _NOEXCEPT {return fetch_sub(__op) - __op;}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _LIBCPP_INLINE_VISIBILITY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _Tp operator-=(_Tp __op) _NOEXCEPT {return fetch_sub(__op) - __op;}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _LIBCPP_INLINE_VISIBILITY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _Tp operator&=(_Tp __op) volatile _NOEXCEPT {return fetch_and(__op) & __op;}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _LIBCPP_INLINE_VISIBILITY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _Tp operator&=(_Tp __op) _NOEXCEPT {return fetch_and(__op) & __op;}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _LIBCPP_INLINE_VISIBILITY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _Tp operator|=(_Tp __op) volatile _NOEXCEPT {return fetch_or(__op) | __op;}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _LIBCPP_INLINE_VISIBILITY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _Tp operator|=(_Tp __op) _NOEXCEPT {return fetch_or(__op) | __op;}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _LIBCPP_INLINE_VISIBILITY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _Tp operator^=(_Tp __op) volatile _NOEXCEPT {return fetch_xor(__op) ^ __op;}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _LIBCPP_INLINE_VISIBILITY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _Tp operator^=(_Tp __op) _NOEXCEPT {return fetch_xor(__op) ^ __op;}
</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;'>-+_LIBCPP_END_NAMESPACE_STD
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif // _LIBCPP_ATOMIC_LOCKED
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git llvm_release_80/projects/libcxx/include/atomic macports_release_80/projects/libcxx/include/atomic
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index d37e7b4b0..aed9e91a3 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- llvm_release_80/projects/libcxx/include/atomic
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ macports_release_80/projects/libcxx/include/atomic
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1885,4 +1885,50 @@ typedef atomic<uintmax_t> atomic_uintmax_t;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _LIBCPP_END_NAMESPACE_STD
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(__ppc__) && !defined(__ppc64__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// specialize fallback implementation where 64b atomics are missing
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <__atomic_locked>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+_LIBCPP_BEGIN_NAMESPACE_STD
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+template <>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+struct atomic<long long> : public __atomic_mutex_locked<long long>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ typedef long long _Tp;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ typedef __atomic_mutex_locked<_Tp> __base;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _LIBCPP_INLINE_VISIBILITY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ atomic() _NOEXCEPT _LIBCPP_DEFAULT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _LIBCPP_INLINE_VISIBILITY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _LIBCPP_CONSTEXPR atomic(_Tp __d) _NOEXCEPT : __base(__d) {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _LIBCPP_INLINE_VISIBILITY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _Tp operator=(_Tp __d) volatile _NOEXCEPT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {__base::store(__d); return __d;}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _LIBCPP_INLINE_VISIBILITY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _Tp operator=(_Tp __d) _NOEXCEPT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {__base::store(__d); return __d;}
</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;'>-+template <>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+struct atomic<unsigned long long> :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public __atomic_mutex_locked<unsigned long long>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ typedef unsigned long long _Tp;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ typedef __atomic_mutex_locked<_Tp> __base;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _LIBCPP_INLINE_VISIBILITY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ atomic() _NOEXCEPT _LIBCPP_DEFAULT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _LIBCPP_INLINE_VISIBILITY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _LIBCPP_CONSTEXPR atomic(_Tp __d) _NOEXCEPT : __base(__d) {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _LIBCPP_INLINE_VISIBILITY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _Tp operator=(_Tp __d) volatile _NOEXCEPT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {__base::store(__d); return __d;}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _LIBCPP_INLINE_VISIBILITY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _Tp operator=(_Tp __d) _NOEXCEPT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {__base::store(__d); return __d;}
</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;'>-+_LIBCPP_END_NAMESPACE_STD
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif // defined(__ppc__) && !defined(__ppc64__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif // _LIBCPP_ATOMIC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.20.1 (Apple Git-116)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-devel/files/4001-Revert-CMake-Check-that-a-certificate-for-lldb-is-pr.patch b/lang/llvm-devel/files/4001-Revert-CMake-Check-that-a-certificate-for-lldb-is-pr.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..545bb79
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-devel/files/4001-Revert-CMake-Check-that-a-certificate-for-lldb-is-pr.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,42 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 18fa1f9e9bfc525b7ffc59088297694a89f36373 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: Thu, 4 Jul 2019 20:08:00 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 4001/4001] Revert "[CMake] Check that a certificate for lldb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ is present at build time."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://bugs.llvm.org/show_bug.cgi?id=42514
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+This reverts commit cb1c23cd40cea52c0816004dfa4fe1f81ce93deb.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tools/debugserver/source/CMakeLists.txt | 15 ---------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 15 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git llvm_master/tools/lldb/tools/debugserver/source/CMakeLists.txt macports_master/tools/lldb/tools/debugserver/source/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 863afaaec..d63dc23ef 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- llvm_master/tools/lldb/tools/debugserver/source/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macports_master/tools/lldb/tools/debugserver/source/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -142,21 +142,6 @@ else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ message(STATUS "lldb debugserver will not be available.")
</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;'>+-# On MacOS, debugserver needs to be codesigned when built. Check if we have
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# a certificate instead of failing in the middle of the build.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if(build_and_sign_debugserver)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- execute_process(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- COMMAND security find-certificate -Z -p -c ${LLDB_CODESIGN_IDENTITY_USED} /Library/Keychains/System.keychain
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- RESULT_VARIABLE cert_return
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- OUTPUT_QUIET
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ERROR_QUIET)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (cert_return)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- message(FATAL_ERROR "Certificate for debugserver not found. Run scripts/macos-setup-codesign.sh or "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "use the system debugserver passing -DLLDB_USE_SYSTEM_DEBUGSERVER=ON to CMake")
</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;'>+ if(APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(IOS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ find_library(BACKBOARD_LIBRARY BackBoardServices
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.21.0 (Apple Git-120)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>