<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/ccc2b29897f98e4280fd292f42df826b7a0d17ef">https://github.com/macports/macports-ports/commit/ccc2b29897f98e4280fd292f42df826b7a0d17ef</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new ccc2b29 llvm-devel: Bump to r337717
</span>ccc2b29 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit ccc2b29897f98e4280fd292f42df826b7a0d17ef
</span>Author: Jeremy Huddleston Sequoia <jeremyhu@macports.org>
AuthorDate: Mon Jul 23 11:44:13 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> llvm-devel: Bump to r337717
</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 | 5 +-
...h-O-CPU-Subtype-to-ppc7400-when-targeting.patch | 21 +++--
...MASK_CRASH-and-MACH_EXCEPTION_CODES-if-th.patch | 8 +-
...ly-Don-t-embed-the-deployment-target-in-t.patch | 8 +-
...ssues-pre-Lion-due-to-missing-a-strnlen-d.patch | 4 +-
...ly-Prepare-clang-format-for-replacement-w.patch | 8 +-
...ly-Fix-name-of-scan-view-executable-insid.patch | 8 +-
.../1003-Default-to-ppc7400-for-OSX-10.5.patch | 8 +-
...etpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch | 8 +-
...fragile-ObjC-runtime-when-targeting-darwi.patch | 8 +-
...dc-header-search-paths-for-older-versions.patch | 32 ++++----
...ssues-pre-Lion-due-to-missing-a-strnlen-d.patch | 4 +-
...oat.h-to-work-on-Snow-Leopard-and-earlier.patch | 8 +-
...ilds-against-older-macOS-SDKs-that-don-t-.patch | 29 -------
...O_CLOEXEC-for-older-SDKs-that-don-t-have.patch} | 2 +-
lang/llvm-devel/files/9001-macports-libstdcxx.diff | 92 +++++++++++++---------
16 files changed, 120 insertions(+), 133 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 a26306e..0a9abc4 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;'>@@ -81,7 +81,7 @@ if {${subport} eq "llvm-${llvm_version}"} {
</span> }
fetch.type svn
<span style='display:block; white-space:pre;background:#ffe0e0;'>-svn.revision 329027
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+svn.revision 337717
</span>
depends_extract-append port:subversion
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -133,8 +133,7 @@ if {${subport} eq "clang-${llvm_version}"} {
</span> 1005-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch \
1006-Fixup-libstdc-header-search-paths-for-older-versions.patch \
1007-Fix-build-issues-pre-Lion-due-to-missing-a-strnlen-d.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 2001-tsan-Fix-builds-against-older-macOS-SDKs-that-don-t-.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2002-xray-Define-O_CLOEXEC-for-older-SDKs-that-don-t-have.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2001-xray-Define-O_CLOEXEC-for-older-SDKs-that-don-t-have.patch \
</span> 3001-Fix-local-and-iterator-when-building-with-Lion-and-n.patch \
3002-Fix-missing-long-long-math-prototypes-when-using-the.patch \
3003-implement-atomic-using-mutex-lock_guard-for-64b-ops-.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 e93e46f..691042a 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,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From f527be6279e3bd66f90a8ef902d0178bea05d6a5 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 3b3932ac16c4ce7d21e0801efef9e1c73d4e0c20 Mon Sep 17 00:00:00 2001
</span> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sat, 17 Jan 2015 09:03:43 -0800
Subject: [PATCH 1/4] Set the Mach-O CPU Subtype to ppc7400 when targeting
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,20 +12,20 @@ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span> 1 file changed, 10 insertions(+), 3 deletions(-)
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 2a1de244da9..1624597ec4c 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index a405dd70c30..b1b62146d3b 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,17 +201,24 @@ public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -201,16 +201,23 @@ public:
</span> // FIXME: This should be in a separate file.
namespace {
class DarwinPPCAsmBackend : public PPCAsmBackend {
+ Triple TheTriple;
public:
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- DarwinPPCAsmBackend(const Target &T) : PPCAsmBackend(T, false) { }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ DarwinPPCAsmBackend(const Target &T, const Triple &TT) : PPCAsmBackend(T, false), TheTriple(TT) { }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- DarwinPPCAsmBackend(const Target &T) : PPCAsmBackend(T, support::big) { }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ DarwinPPCAsmBackend(const Target &T, const Triple &TT) : PPCAsmBackend(T, support::big), TheTriple(TT) { }
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- std::unique_ptr<MCObjectWriter>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- createObjectWriter(raw_pwrite_stream &OS) const override {
</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> bool is64 = getPointerSize() == 8;
+ MachO::CPUSubTypePowerPC CS = MachO::CPU_SUBTYPE_POWERPC_ALL;
+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,7 +34,6 @@ index 2a1de244da9..1624597ec4c 100644
</span> + }
+
return createPPCMachObjectWriter(
<span style='display:block; white-space:pre;background:#ffe0e0;'>- OS,
</span> /*Is64Bit=*/is64,
(is64 ? MachO::CPU_TYPE_POWERPC64 : MachO::CPU_TYPE_POWERPC),
- MachO::CPU_SUBTYPE_POWERPC_ALL);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,9 +41,9 @@ index 2a1de244da9..1624597ec4c 100644
</span> }
};
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -235,7 +242,7 @@ MCAsmBackend *llvm::createPPCAsmBackend(const Target &T,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const Triple &TT, StringRef CPU,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -236,7 +243,7 @@ MCAsmBackend *llvm::createPPCAsmBackend(const Target &T,
</span> const MCTargetOptions &Options) {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ const Triple &TT = STI.getTargetTriple();
</span> if (TT.isOSDarwin())
- return new DarwinPPCAsmBackend(T);
+ return new DarwinPPCAsmBackend(T, TT);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,5 +51,5 @@ index 2a1de244da9..1624597ec4c 100644
</span> uint8_t OSABI = MCELFObjectTargetWriter::getOSABI(TT.getOS());
bool IsLittleEndian = TT.getArch() == Triple::ppc64le;
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.15.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.17.1 (Apple Git-112)
</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 b4dd8cf..46e723d 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,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 831fb49fcd58b016962d427d83d78e9e55eb1d08 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 5cdaf22bd9051d4e199d642bf0b2ae194318229d Mon Sep 17 00:00:00 2001
</span> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sun, 18 Jan 2015 11:18:13 -0800
Subject: [PATCH 2/4] Define EXC_MASK_CRASH and MACH_EXCEPTION_CODES if they're
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,10 +12,10 @@ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span> 1 file changed, 9 insertions(+)
diff --git llvm_master/lib/Support/Unix/Signals.inc macports_master/lib/Support/Unix/Signals.inc
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index aaf760c5b61..69e682bdc9b 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index de26695d64e..2ac29c12c8d 100644
</span> --- llvm_master/lib/Support/Unix/Signals.inc
+++ macports_master/lib/Support/Unix/Signals.inc
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -472,6 +472,15 @@ void llvm::sys::PrintStackTraceOnErrorSignal(StringRef Argv0,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -564,6 +564,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 aaf760c5b61..69e682bdc9b 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.15.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.17.1 (Apple Git-112)
</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 531d7e3..0f24fc1 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,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 6ffa12e56d4ac413775e2f2d119838e3122c885d Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 78a4f3c47e4a14c28a402828a127b6a9e070115b Mon Sep 17 00:00:00 2001
</span> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sat, 17 Jan 2015 16:41:30 -0800
Subject: [PATCH 3/4] MacPorts Only: Don't embed the deployment target in the
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,10 +12,10 @@ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span> 1 file changed, 4 insertions(+), 2 deletions(-)
diff --git llvm_master/lib/CodeGen/AsmPrinter/AsmPrinter.cpp macports_master/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index d7995447592..2ac927ca4ce 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 1b429331a35..6b6aa3c65d3 100644
</span> --- llvm_master/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
+++ macports_master/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -254,8 +254,10 @@ bool AsmPrinter::doInitialization(Module &M) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -258,8 +258,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 d7995447592..2ac927ca4ce 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.15.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.17.1 (Apple Git-112)
</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 1b7c297..cd932e0 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,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 0ffe84c579f75bb93a29453183d8ebd0595b25e7 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 129be7902cc13ee305724cd4e115b3a21d376fce Mon Sep 17 00:00:00 2001
</span> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Tue, 20 Dec 2016 12:41:21 -0800
Subject: [PATCH 4/4] Fix build issues pre-Lion due to missing a strnlen
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -66,5 +66,5 @@ index fa81ce974ec..1e86f820437 100644
</span> using namespace llvm;
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.15.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.17.1 (Apple Git-112)
</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 4cd5444..d8e8ef6 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,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 54709712b29ce458e99d54922f31769843271e3b Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 1073c30cbf57a41a7b5ca43c585eb203d3d96627 Mon Sep 17 00:00:00 2001
</span> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sat, 17 Jan 2015 17:50:24 -0800
Subject: [PATCH 1001/1008] MacPorts Only: Prepare clang-format for replacement
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,7 +53,7 @@ index 16ff56e502..4b68104a28 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
diff --git llvm_master/tools/clang/tools/clang-format/clang-format.el macports_master/tools/clang/tools/clang-format/clang-format.el
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index aa9c3ff4ca..f661969e3c 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 4f11daf15f..439beddd45 100644
</span> --- llvm_master/tools/clang/tools/clang-format/clang-format.el
+++ macports_master/tools/clang/tools/clang-format/clang-format.el
@@ -36,8 +36,7 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,7 +67,7 @@ index aa9c3ff4ca..f661969e3c 100644
</span>
A string containing the name or the full path of the executable."
diff --git llvm_master/tools/clang/tools/clang-format/clang-format.py macports_master/tools/clang/tools/clang-format/clang-format.py
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 2412566346..cf35c8738f 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 5fe592a920..20b1752477 100644
</span> --- llvm_master/tools/clang/tools/clang-format/clang-format.py
+++ macports_master/tools/clang/tools/clang-format/clang-format.py
@@ -36,7 +36,7 @@ import vim
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -80,5 +80,5 @@ index 2412566346..cf35c8738f 100644
</span> binary = vim.eval('g:clang_format_path')
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.13.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.17.1 (Apple Git-112)
</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 bb4ecf2..280fdd5 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,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 1f5179f2a269cf8e6c3ec4a9fb0e360dd1e30954 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From f688609c4ef2bddecc851efae71dc3dd3154ff97 Mon Sep 17 00:00:00 2001
</span> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sat, 17 Jan 2015 17:55:27 -0800
Subject: [PATCH 1002/1008] MacPorts Only: Fix name of scan-view executable
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,10 +12,10 @@ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span> 1 file changed, 2 insertions(+)
diff --git llvm_master/tools/clang/tools/scan-build/bin/scan-build macports_master/tools/clang/tools/scan-build/bin/scan-build
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index cbf3bf3d6f..f7fad16bba 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index c50f900cc4..17c0e6821b 100755
</span> --- llvm_master/tools/clang/tools/scan-build/bin/scan-build
+++ macports_master/tools/clang/tools/scan-build/bin/scan-build
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1855,6 +1855,8 @@ if (defined $Options{OutputFormat}) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1871,6 +1871,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 cbf3bf3d6f..f7fad16bba 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.13.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.17.1 (Apple Git-112)
</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 674ff46..74adb6a 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,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From e855f1e8b7beb44f9bedeb6b879e7f517b88ee78 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 3fb5a64c13f2e22aac27b00137924a9d70ba194c Mon Sep 17 00:00:00 2001
</span> From: Iain Sandoe <iain@codesourcery.com>
Date: Sun, 27 Jul 2014 20:35:16 +0100
Subject: [PATCH 1003/1008] Default to ppc7400 for OSX 10.5+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,10 +8,10 @@ Subject: [PATCH 1003/1008] Default to ppc7400 for OSX 10.5+
</span> 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 00bd60bc24..931ab66061 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 1e093b25b9..729369180e 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;'>-@@ -314,6 +314,9 @@ std::string tools::getCPUName(const ArgList &Args, const llvm::Triple &T,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -318,6 +318,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 00bd60bc24..931ab66061 100644
</span> TargetCPUName = "ppc";
}
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.13.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.17.1 (Apple Git-112)
</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><span style='display:block; white-space:pre;color:#808080;'>index a1a5eaf..61bd36f 100644
</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;'>+++ b/lang/llvm-devel/files/1004-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.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 ceda1b45e1284cd5ebad1e81e9a6587a85484e5e Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 9f9ae872db92fced923774e7ed8fdbbfa9db8dba Mon Sep 17 00:00:00 2001
</span> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sat, 17 Jan 2015 19:08:57 -0800
Subject: [PATCH 1004/1008] Only call setpriority(PRIO_DARWIN_THREAD, 0,
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,10 +12,10 @@ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span> 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git llvm_master/tools/clang/tools/libclang/CIndex.cpp macports_master/tools/clang/tools/libclang/CIndex.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index d527535a17..ea6c83c7a7 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 499d9abf9a..97a47396ee 100644
</span> --- llvm_master/tools/clang/tools/libclang/CIndex.cpp
+++ macports_master/tools/clang/tools/libclang/CIndex.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -8122,7 +8122,7 @@ void clang::setThreadBackgroundPriority() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8504,7 +8504,7 @@ void clang::setThreadBackgroundPriority() {
</span> if (getenv("LIBCLANG_BGPRIO_DISABLE"))
return;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,5 +25,5 @@ index d527535a17..ea6c83c7a7 100644
</span> #endif
}
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.13.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.17.1 (Apple Git-112)
</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/1005-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 95dbb16..e669a8b 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/1005-Default-to-fragile-ObjC-runtime-when-targeting-darwi.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 143c83b45dd9fff874ad05dc3e20055d24dfa52f Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 8a7a39dcafffba16b02da61c985103e377e81293 Mon Sep 17 00:00:00 2001
</span> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Tue, 20 Jan 2015 00:09:16 -0800
Subject: [PATCH 1005/1008] Default to fragile ObjC runtime when targeting
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,10 +10,10 @@ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span> 1 file changed, 4 insertions(+), 2 deletions(-)
diff --git llvm_master/tools/clang/lib/Driver/ToolChains/Darwin.h macports_master/tools/clang/lib/Driver/ToolChains/Darwin.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 6cb1d04b78..7dd2a58ffe 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index eee6e96671..95ba35162b 100644
</span> --- llvm_master/tools/clang/lib/Driver/ToolChains/Darwin.h
+++ macports_master/tools/clang/lib/Driver/ToolChains/Darwin.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -210,8 +210,10 @@ public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -230,8 +230,10 @@ public:
</span> bool IsEncodeExtendedBlockSignatureDefault() const override { return true; }
bool IsObjCNonFragileABIDefault() const override {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,5 +27,5 @@ index 6cb1d04b78..7dd2a58ffe 100644
</span>
bool UseObjCMixedDispatch() const override { return true; }
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.13.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.17.1 (Apple Git-112)
</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><span style='display:block; white-space:pre;color:#808080;'>index e379bc8..9a304c3 100644
</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;'>+++ b/lang/llvm-devel/files/1006-Fixup-libstdc-header-search-paths-for-older-versions.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 9f84ee73fd563b2d484b80db19b6ad960dfb2f08 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 834f4290d396ffd5cb3d589476f75dd4baa7b6c2 Mon Sep 17 00:00:00 2001
</span> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Mon, 31 Oct 2016 15:06:36 -0700
Subject: [PATCH 1006/1008] Fixup libstdc++ header search paths for older
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,27 +15,27 @@ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span> 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git llvm_master/tools/clang/lib/Frontend/InitHeaderSearch.cpp macports_master/tools/clang/lib/Frontend/InitHeaderSearch.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 1d7c8a0c87..94a7f09fd5 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 8a70404629..db49a73533 100644
</span> --- llvm_master/tools/clang/lib/Frontend/InitHeaderSearch.cpp
+++ macports_master/tools/clang/lib/Frontend/InitHeaderSearch.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -367,7 +367,7 @@ AddDefaultCPlusPlusIncludePaths(const llvm::Triple &triple, const HeaderSearchOp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "powerpc-apple-darwin10", "", "ppc64",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- triple);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.0.0",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "powerpc-apple-darwin10", "", "ppc64",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "powerpc-apple-darwin8", "", "ppc64",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- triple);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -375,7 +375,7 @@ void InitHeaderSearch::AddDefaultCPlusPlusIncludePaths(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "powerpc-apple-darwin10", "",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "ppc64", triple);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IsBaseFound |= AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.0.0",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "powerpc-apple-darwin10", "",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "powerpc-apple-darwin8", "",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "ppc64", triple);
</span> break;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -376,7 +376,7 @@ AddDefaultCPlusPlusIncludePaths(const llvm::Triple &triple, const HeaderSearchOp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.2.1",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "i686-apple-darwin10", "", "x86_64", triple);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.0.0",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "i686-apple-darwin8", "", "", triple);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "i686-apple-darwin8", "", "x86_64", triple);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -385,7 +385,7 @@ void InitHeaderSearch::AddDefaultCPlusPlusIncludePaths(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "i686-apple-darwin10", "",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "x86_64", triple);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IsBaseFound |= AddGnuCPlusPlusIncludePaths(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "/usr/include/c++/4.0.0", "i686-apple-darwin8", "", "", triple);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "/usr/include/c++/4.0.0", "i686-apple-darwin8", "", "x86_64", triple);
</span> break;
case llvm::Triple::arm:
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.13.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.17.1 (Apple Git-112)
</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/1007-Fix-build-issues-pre-Lion-due-to-missing-a-strnlen-d.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 2931003..281b990 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/1007-Fix-build-issues-pre-Lion-due-to-missing-a-strnlen-d.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 091b885411041c711b0d25c43c73deac9cfbb906 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From d82effb962fa2a1d2d4263357783fd29880a3d8b Mon Sep 17 00:00:00 2001
</span> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Tue, 20 Dec 2016 15:53:39 -0800
Subject: [PATCH 1007/1008] Fix build issues pre-Lion due to missing a strnlen
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,5 +38,5 @@ index 24a14b6cdb..c38986d46c 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.13.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.17.1 (Apple Git-112)
</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/1008-Fix-float.h-to-work-on-Snow-Leopard-and-earlier.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index e4cb08f..3b038d9 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/1008-Fix-float.h-to-work-on-Snow-Leopard-and-earlier.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 1756240a138dd99225bc1a4fa2f32606074456ad Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From c1498fed17881cb1a533791368d9f983dd6ea5c0 Mon Sep 17 00:00:00 2001
</span> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Thu, 20 Jul 2017 17:15:35 -0700
Subject: [PATCH 1008/1008] Fix float.h to work on Snow Leopard and earlier
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,7 +12,7 @@ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span> 1 file changed, 6 insertions(+), 1 deletion(-)
diff --git llvm_master/tools/clang/lib/Headers/float.h macports_master/tools/clang/lib/Headers/float.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 0f453d87cb..1db2b28ed7 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 44d4d05494..4970a722ed 100644
</span> --- llvm_master/tools/clang/lib/Headers/float.h
+++ macports_master/tools/clang/lib/Headers/float.h
@@ -31,7 +31,12 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,8 +27,8 @@ index 0f453d87cb..1db2b28ed7 100644
</span> +
+#if ((defined(__APPLE__) && __has_include(<Availability.h>) && (!defined(__MAC_OS_X_VERSION_MAX_ALLOWED) || __MAC_OS_X_VERSION_MAX_ALLOWED >= 101300)) || (defined(__MINGW32__) || defined(_MSC_VER))) && \
__STDC_HOSTED__ && __has_include_next(<float.h>)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # include_next <float.h>
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Prior to Apple's 10.7 SDK, float.h SDK header used to apply an extra level
</span> --
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.13.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.17.1 (Apple Git-112)
</span>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-devel/files/2001-tsan-Fix-builds-against-older-macOS-SDKs-that-don-t-.patch b/lang/llvm-devel/files/2001-tsan-Fix-builds-against-older-macOS-SDKs-that-don-t-.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 3b2547f..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-devel/files/2001-tsan-Fix-builds-against-older-macOS-SDKs-that-don-t-.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 689c59828583bf1ca95c874c0f1a4c5f91f68b71 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Wed, 27 Dec 2017 21:19:34 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 2001/2002] tsan: Fix builds against older macOS SDKs that
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- don't have DISPATCH_NOESCAPE defined
</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/tsan/rtl/tsan_libdispatch_mac.cc | 4 ++++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 4 insertions(+)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git llvm_master/projects/compiler-rt/lib/tsan/rtl/tsan_libdispatch_mac.cc macports_master/projects/compiler-rt/lib/tsan/rtl/tsan_libdispatch_mac.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 8c759a3be..44ac84022 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- llvm_master/projects/compiler-rt/lib/tsan/rtl/tsan_libdispatch_mac.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ macports_master/projects/compiler-rt/lib/tsan/rtl/tsan_libdispatch_mac.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -25,6 +25,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <dispatch/dispatch.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <pthread.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef DISPATCH_NOESCAPE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define DISPATCH_NOESCAPE
</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;'>- typedef long long_t; // NOLINT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- namespace __tsan {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.15.1
</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/2002-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>similarity index 95%
rename from lang/llvm-devel/files/2002-xray-Define-O_CLOEXEC-for-older-SDKs-that-don-t-have.patch
rename to lang/llvm-devel/files/2001-xray-Define-O_CLOEXEC-for-older-SDKs-that-don-t-have.patch
<span style='display:block; white-space:pre;color:#808080;'>index c819db7..9330bbb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-devel/files/2002-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,7 +1,7 @@
</span> From 585a864b88b65cfbe57765d769b92b771bfaf762 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Wed, 27 Dec 2017 23:21:37 -0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 2002/2002] xray: Define O_CLOEXEC for older SDKs that don't
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 2001/2001] xray: Define O_CLOEXEC for older SDKs that don't
</span> have it
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-devel/files/9001-macports-libstdcxx.diff b/lang/llvm-devel/files/9001-macports-libstdcxx.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index c85d383..c73a7b2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-devel/files/9001-macports-libstdcxx.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-devel/files/9001-macports-libstdcxx.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- orig/tools/clang/include/clang/Lex/HeaderSearchOptions.h 2015-11-17 23:54:13.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ new/tools/clang/include/clang/Lex/HeaderSearchOptions.h 2017-01-04 17:50:27.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -166,6 +166,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- orig/tools/clang/include/clang/Lex/HeaderSearchOptions.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ new/tools/clang/include/clang/Lex/HeaderSearchOptions.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -185,6 +185,9 @@ public:
</span> /// Use libc++ instead of the default libstdc++.
unsigned UseLibcxx : 1;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,9 +10,9 @@
</span> /// Whether header search information should be output as for -v.
unsigned Verbose : 1;
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- orig/tools/clang/lib/Frontend/CompilerInvocation.cpp 2016-07-13 15:32:15.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ new/tools/clang/lib/Frontend/CompilerInvocation.cpp 2017-01-04 17:52:18.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1539,8 +1539,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- orig/tools/clang/lib/Frontend/CompilerInvocation.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ new/tools/clang/lib/Frontend/CompilerInvocation.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1721,8 +1721,10 @@ static void ParseHeaderSearchArgs(HeaderSearchOptions &Opts, ArgList &Args,
</span> Opts.UseBuiltinIncludes = !Args.hasArg(OPT_nobuiltininc);
Opts.UseStandardSystemIncludes = !Args.hasArg(OPT_nostdsysteminc);
Opts.UseStandardCXXIncludes = !Args.hasArg(OPT_nostdincxx);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,10 +24,10 @@
</span> Opts.ResourceDir = Args.getLastArgValue(OPT_resource_dir);
// Canonicalize -fmodules-cache-path before storing it.
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- orig/tools/clang/lib/Frontend/InitHeaderSearch.cpp 2016-05-16 10:22:25.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ new/tools/clang/lib/Frontend/InitHeaderSearch.cpp 2017-01-04 18:04:43.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -108,7 +108,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if defined(LLVM_ON_WIN32)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- orig/tools/clang/lib/Frontend/InitHeaderSearch.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ new/tools/clang/lib/Frontend/InitHeaderSearch.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -111,7 +111,7 @@ static bool CanPrefixSysroot(StringRef Path) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if defined(_WIN32)
</span> return !Path.empty() && llvm::sys::path::is_separator(Path[0]);
#else
- return llvm::sys::path::is_absolute(Path);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,32 +35,50 @@
</span> #endif
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -362,6 +362,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -371,9 +371,17 @@ void InitHeaderSearch::AddDefaultCPlusPlusIncludePaths(
</span>
case llvm::Triple::ppc:
case llvm::Triple::ppc64:
<span style='display:block; white-space:pre;background:#e0ffe0;'>+- IsBaseFound = AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.2.1",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "powerpc-apple-darwin10", "",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "ppc64", triple);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ IsBaseFound = false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span> + if (HSOpts.UseMacPortsLibstdcxx) {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AddGnuCPlusPlusIncludePaths("@@MACPORTS_GCC_INCLUDE_DIR@@",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "@@MACPORTS_HOST_NAME@@", "@@MACPORTS_GCC_SUBDIRECTORY_ppc@@", "@@MACPORTS_GCC_SUBDIRECTORY_ppc64@@",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ triple);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ IsBaseFound = AddGnuCPlusPlusIncludePaths("@@MACPORTS_GCC_INCLUDE_DIR@@",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "@@MACPORTS_HOST_NAME@@", "@@MACPORTS_GCC_SUBDIRECTORY_ppc@@", "@@MACPORTS_GCC_SUBDIRECTORY_ppc64@@",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ triple);
</span> + }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.2.1",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "powerpc-apple-darwin10", "", "ppc64",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- triple);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -372,6 +377,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ IsBaseFound |= AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.2.1",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "powerpc-apple-darwin10", "",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "ppc64", triple);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IsBaseFound |= AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.0.0",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "powerpc-apple-darwin8", "",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "ppc64", triple);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -381,9 +389,16 @@ void InitHeaderSearch::AddDefaultCPlusPlusIncludePaths(
</span>
case llvm::Triple::x86:
case llvm::Triple::x86_64:
<span style='display:block; white-space:pre;background:#e0ffe0;'>+- IsBaseFound = AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.2.1",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "i686-apple-darwin10", "",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "x86_64", triple);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ IsBaseFound = false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span> + if (HSOpts.UseMacPortsLibstdcxx) {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AddGnuCPlusPlusIncludePaths("@@MACPORTS_GCC_INCLUDE_DIR@@",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "@@MACPORTS_HOST_NAME@@", "@@MACPORTS_GCC_SUBDIRECTORY_i386@@", "@@MACPORTS_GCC_SUBDIRECTORY_x86_64@@", triple);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ IsBaseFound = AddGnuCPlusPlusIncludePaths("@@MACPORTS_GCC_INCLUDE_DIR@@",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "@@MACPORTS_HOST_NAME@@", "@@MACPORTS_GCC_SUBDIRECTORY_i386@@", "@@MACPORTS_GCC_SUBDIRECTORY_x86_64@@", triple);
</span> + }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.2.1",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "i686-apple-darwin10", "", "x86_64", triple);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.0.0",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- orig/tools/clang/include/clang/Driver/ToolChain.h 2016-06-16 03:36:09.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ new/tools/clang/include/clang/Driver/ToolChain.h 2017-01-04 18:08:42.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -75,7 +75,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ IsBaseFound |= AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.2.1",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "i686-apple-darwin10", "",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "x86_64", triple);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IsBaseFound |= AddGnuCPlusPlusIncludePaths(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "/usr/include/c++/4.0.0", "i686-apple-darwin8", "", "x86_64", triple);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- orig/tools/clang/include/clang/Driver/ToolChain.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ new/tools/clang/include/clang/Driver/ToolChain.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -91,7 +91,8 @@ public:
</span>
enum CXXStdlibType {
CST_Libcxx,
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,9 +88,9 @@
</span> };
enum RuntimeLibType {
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- orig/tools/clang/lib/Driver/ToolChains/Darwin.cpp 2016-11-23 14:25:50.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ new/tools/clang/lib/Driver/ToolChains/Darwin.cpp 2017-09-23 20:52:46.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1455,6 +1455,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- orig/tools/clang/lib/Driver/ToolChains/Darwin.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ new/tools/clang/lib/Driver/ToolChains/Darwin.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1729,6 +1729,12 @@ void DarwinClang::AddCXXStdlibLibArgs(const ArgList &Args,
</span> break;
case ToolChain::CST_Libstdcxx:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -85,9 +103,9 @@
</span> // Unfortunately, -lstdc++ doesn't always exist in the standard search path;
// it was previously found in the gcc lib dir. However, for all the Darwin
// platforms we care about it was -lstdc++.6, so we search for that
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- orig/tools/clang/lib/Driver/ToolChains/Hexagon.cpp.orig 2017-09-24 13:38:59.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ new/tools/clang/lib/Driver/ToolChains/Hexagon.cpp 2017-09-24 14:15:41.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -467,6 +467,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- orig/tools/clang/lib/Driver/ToolChains/Hexagon.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ new/tools/clang/lib/Driver/ToolChains/Hexagon.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -557,6 +557,8 @@ HexagonToolChain::GetCXXStdlibType(const ArgList &Args) const {
</span> return ToolChain::CST_Libstdcxx;
StringRef Value = A->getValue();
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -96,9 +114,9 @@
</span> if (Value != "libstdc++")
getDriver().Diag(diag::err_drv_invalid_stdlib_name) << A->getAsString(Args);
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- orig/tools/clang/lib/Driver/ToolChain.cpp 2016-07-15 16:13:27.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ new/tools/clang/lib/Driver/ToolChain.cpp 2017-01-05 08:14:23.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -601,6 +601,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- orig/tools/clang/lib/Driver/ToolChain.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ new/tools/clang/lib/Driver/ToolChain.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -674,6 +674,8 @@ ToolChain::CXXStdlibType ToolChain::GetCXXStdlibType(const ArgList &Args) const{
</span> return ToolChain::CST_Libcxx;
else if (LibName == "libstdc++")
return ToolChain::CST_Libstdcxx;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -107,8 +125,8 @@
</span> else if (LibName == "platform")
return GetDefaultCXXStdlibType();
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -682,6 +684,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -755,6 +757,7 @@ void ToolChain::AddCXXStdlibLibArgs(const ArgList &Args,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span>
case ToolChain::CST_Libstdcxx:
+ case ToolChain::CST_MacPortsLibstdcxx:
</pre><pre style='margin:0'>
</pre>