<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/a81aabb80acd3769703abbe65fcd78a816bfbbf5">https://github.com/macports/macports-ports/commit/a81aabb80acd3769703abbe65fcd78a816bfbbf5</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit a81aabb80acd3769703abbe65fcd78a816bfbbf5
</span>Author: Jeremy Huddleston Sequoia <jeremyhu@macports.org>
AuthorDate: Sun Jun 25 15:28:42 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> llvm-devel: Bump to r306254
</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 | 18 +--
...h-O-CPU-Subtype-to-ppc7400-when-targeting.patch | 10 +-
...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 | 48 ++-----
...ly-Prepare-clang-format-for-replacement-w.patch | 8 +-
...ly-Fix-name-of-scan-view-executable-insid.patch | 4 +-
.../1003-Default-to-ppc7400-for-OSX-10.5.patch | 16 +--
...etpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch | 8 +-
...fragile-ObjC-runtime-when-targeting-darwi.patch | 16 +--
...dc-header-search-paths-for-older-versions.patch | 10 +-
...ssues-pre-Lion-due-to-missing-a-strnlen-d.patch | 4 +-
...ly-Don-t-check-for-the-macosx.internal-SD.patch | 6 +-
...d-iterator-when-building-with-Lion-and-n.patch} | 14 +-
.../files/3001-buildit-build-fix-for-Leopard.patch | 35 -----
...long-long-math-prototypes-when-using-the.patch} | 8 +-
...-compatibility-version-to-RC_ProjectSourc.patch | 28 ----
...omic-using-mutex-lock_guard-for-64b-ops-.patch} | 12 +-
...https-llvm.org-bugs-show_bug.cgi-id-31433.patch | 12 +-
.../files/4002-Fix-build-on-Mountain-Lion.patch | 6 +-
lang/llvm-devel/files/9001-macports-libstdcxx.diff | 141 +++++++++++----------
lang/llvm-devel/files/openmp-locations.patch | 56 +++-----
22 files changed, 188 insertions(+), 288 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 7778ec8..f732908 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;'>@@ -82,7 +82,7 @@ if {${subport} eq "llvm-${llvm_version}"} {
</span> }
fetch.type svn
<span style='display:block; white-space:pre;background:#ffe0e0;'>-svn.revision 296779
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+svn.revision 306254
</span>
depends_extract-append port:subversion
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -134,11 +134,9 @@ if {${subport} eq "clang-${llvm_version}"} {
</span> 1006-Fixup-libstdc-header-search-paths-for-older-versions.patch \
1007-Fix-build-issues-pre-Lion-due-to-missing-a-strnlen-d.patch \
2001-MacPorts-Only-Don-t-check-for-the-macosx.internal-SD.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 3001-buildit-build-fix-for-Leopard.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 3002-buildit-Set-compatibility-version-to-RC_ProjectSourc.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 3003-Fix-local-and-iterator-when-building-with-Lion-and-n.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 3004-Fix-missing-long-long-math-prototypes-when-using-the.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 3005-implement-atomic-using-mutex-lock_guard-for-64b-ops-.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3001-Fix-local-and-iterator-when-building-with-Lion-and-n.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3002-Fix-missing-long-long-math-prototypes-when-using-the.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3003-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;'>@@ -422,7 +420,8 @@ if {${subport} eq "clang-${llvm_version}"} {
</span> if {${subport} eq "lldb-${llvm_version}"} {
post-patch {
reinplace "s|@@PREFIX@@|${prefix}|" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/tools/clang/lib/Driver/Tools.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/tools/clang/lib/Driver/ToolChains/Clang.cpp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/tools/clang/lib/Driver/ToolChains/CommonArgs.cpp
</span>
reinplace "s|@CLANG_FORMAT_PATH@|${prefix}/bin/clang-format-${suffix}|g" \
${worksrcpath}/tools/clang/tools/clang-format/clang-format-bbedit.applescript \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -533,14 +532,15 @@ if {${subport} eq "llvm-${llvm_version}"} {
</span> reinplace "s|@@MACPORTS_HOST_NAME@@|${build_arch}-apple-darwin${os.major}|g" \
${worksrcpath}/tools/clang/lib/Frontend/InitHeaderSearch.cpp
reinplace "s|@@MACPORTS_libstdc++@@|${prefix}/lib/libgcc/libstdc++.6.dylib|g" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/tools/clang/lib/Driver/ToolChains.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/tools/clang/lib/Driver/ToolChains/Darwin.cpp
</span> }
}
default_variants +libstdcxx
post-patch {
reinplace "s|@@PREFIX@@|${prefix}|" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/tools/clang/lib/Driver/Tools.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/tools/clang/lib/Driver/ToolChains/Clang.cpp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/tools/clang/lib/Driver/ToolChains/CommonArgs.cpp
</span>
reinplace "s|@CLANG_FORMAT_PATH@|${prefix}/bin/clang-format-${suffix}|g" \
${worksrcpath}/tools/clang/tools/clang-format/clang-format-bbedit.applescript \
<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 2ac6966..ac47f75 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 a0c10070b02b587bc667059b2418d1561000d3cd Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 8da2367c186a11f869d57d67f29b5e8a966f7220 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,10 +12,10 @@ 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 5847b3a52bf..8ada8541744 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 6d7eb786a68..c22201a60b4 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:#e0ffe0;'>+@@ -200,16 +200,23 @@ public:
</span> // FIXME: This should be in a separate file.
namespace {
class DarwinPPCAsmBackend : public PPCAsmBackend {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,7 +41,7 @@ index 5847b3a52bf..8ada8541744 100644
</span> }
};
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -233,7 +240,7 @@ MCAsmBackend *llvm::createPPCAsmBackend(const Target &T,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -232,7 +239,7 @@ MCAsmBackend *llvm::createPPCAsmBackend(const Target &T,
</span> const Triple &TT, StringRef CPU,
const MCTargetOptions &Options) {
if (TT.isOSDarwin())
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,5 +51,5 @@ index 5847b3a52bf..8ada8541744 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.11.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.13.2
</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 14befa3..7bffa44 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 b8098da2d225e031a92e8bd9d85261415aed5f93 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 41063f8dfdc4053f33dcf29d5662fb84c3f2e437 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 3750d7f4c09..7b163161988 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index aaf760c5b61..69e682bdc9b 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;'>-@@ -476,6 +476,15 @@ void llvm::sys::PrintStackTraceOnErrorSignal(StringRef Argv0,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -472,6 +472,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 3750d7f4c09..7b163161988 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.11.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.13.2
</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 f658643..f04c150 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 62bfda50e50245543b00ad7f8ccd80fb95b1d217 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 5df4562fdd4e2e6b9be8140a64df87cdebfacffa 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, 1 insertion(+), 1 deletion(-)
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 7adac4cbf94..fb47d6079a4 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index c48fcaa7b0d..0c3ac0311a3 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;'>-@@ -193,7 +193,7 @@ bool AsmPrinter::doInitialization(Module &M) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -244,7 +244,7 @@ bool AsmPrinter::doInitialization(Module &M) {
</span> // anyway.
const Triple &TT = TM.getTargetTriple();
// If there is a version specified, Major will be non-zero.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,5 +25,5 @@ index 7adac4cbf94..fb47d6079a4 100644
</span> MCVersionMinType VersionType;
if (TT.isWatchOS()) {
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.11.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.13.2
</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 939326d..34c6483 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 adc969d25c40b21c469bad38d6ac3460b0ebd885 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 0b9ae4905420a6ca865f650f21ec60d2701bd718 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;'>@@ -9,16 +9,15 @@ https://llvm.org/bugs/show_bug.cgi?id=27714
</span>
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
---
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lib/ObjectYAML/MachOYAML.cpp | 11 +++++++++++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tools/llvm-pdbdump/LLVMOutputStyle.cpp | 11 +++++++++++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tools/obj2yaml/macho2yaml.cpp | 13 ++++++++++++-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 3 files changed, 34 insertions(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lib/ObjectYAML/MachOYAML.cpp | 14 ++++++++++++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tools/obj2yaml/macho2yaml.cpp | 16 +++++++++++++++-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2 files changed, 29 insertions(+), 1 deletion(-)
</span>
diff --git llvm_master/lib/ObjectYAML/MachOYAML.cpp macports_master/lib/ObjectYAML/MachOYAML.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 7ebb1bed088..a9f37a3a442 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 46168482787..831a08aec7f 100644
</span> --- llvm_master/lib/ObjectYAML/MachOYAML.cpp
+++ macports_master/lib/ObjectYAML/MachOYAML.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -18,6 +18,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -19,6 +19,20 @@
</span>
#include <string.h> // For memcpy, memset and strnlen.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,35 +38,10 @@ index 7ebb1bed088..a9f37a3a442 100644
</span> namespace llvm {
MachOYAML::LoadCommand::~LoadCommand() {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/tools/llvm-pdbdump/LLVMOutputStyle.cpp b/tools/llvm-pdbdump/LLVMOutputStyle.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 98c67ec9ef3..90f9129d5f1 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/tools/llvm-pdbdump/LLVMOutputStyle.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/tools/llvm-pdbdump/LLVMOutputStyle.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -31,6 +31,20 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <unordered_map>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <Availability.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if __MAC_OS_X_VERSION_MIN_REQUIRED < 1070
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static size_t strnlen(const char *s, size_t maxlen) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ size_t l = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ while (l < maxlen && *s) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ l++;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ s++;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return l;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- using namespace llvm;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- using namespace llvm::codeview;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- using namespace llvm::msf;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/tools/obj2yaml/macho2yaml.cpp b/tools/obj2yaml/macho2yaml.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 9cd05463edc..02678123d76 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/tools/obj2yaml/macho2yaml.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/tools/obj2yaml/macho2yaml.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git llvm_master/tools/obj2yaml/macho2yaml.cpp macports_master/tools/obj2yaml/macho2yaml.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index a1d107dc5af..01934da8078 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- llvm_master/tools/obj2yaml/macho2yaml.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macports_master/tools/obj2yaml/macho2yaml.cpp
</span> @@ -15,7 +15,21 @@
#include "llvm/Support/ErrorHandling.h"
#include "llvm/Support/LEB128.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -92,5 +66,5 @@ index 9cd05463edc..02678123d76 100644
</span> using namespace llvm;
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.11.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.13.2
</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 04a702c..0a98d39 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 f07780b534efdf5084f76ce57ed20111e8e61e2e Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 0d231cc9dc41e2301971a2dcc4b158ffda4f4642 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/1007] 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 0ac2da3ad2..dba511033c 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index aa9c3ff4ca..f661969e3c 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 0ac2da3ad2..dba511033c 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 ae8a6ebf74..93268cd381 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 2412566346..cf35c8738f 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 ae8a6ebf74..93268cd381 100644
</span> binary = vim.eval('g:clang_format_path')
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.11.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.13.2
</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 05be896..e38cd6c 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 4191978f112c6c87d7680402bf12ab8202cd7689 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 89ed96c64b471b9cb7afed1a746973bdb3e11d2c 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/1007] MacPorts Only: Fix name of scan-view executable
<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.11.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.13.2
</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 d1c0ca1..fff56dc 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 55e5fccea9da529605215205888a8d14d8a0bfb8 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From a9eff492902b7e1ab63fefec4677f130844baf49 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/1007] Default to ppc7400 for OSX 10.5+
---
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lib/Driver/Tools.cpp | 3 +++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lib/Driver/ToolChains/CommonArgs.cpp | 3 +++
</span> 1 file changed, 3 insertions(+)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git llvm_master/tools/clang/lib/Driver/Tools.cpp macports_master/tools/clang/lib/Driver/Tools.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index f4cab2a888..8e13e59060 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- llvm_master/tools/clang/lib/Driver/Tools.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ macports_master/tools/clang/lib/Driver/Tools.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2118,6 +2118,9 @@ static std::string getCPUName(const ArgList &Args, const llvm::Triple &T,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git llvm_master/tools/clang/lib/Driver/ToolChains/CommonArgs.cpp macports_master/tools/clang/lib/Driver/ToolChains/CommonArgs.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 5e360f62e2..8a597b5b3a 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- llvm_master/tools/clang/lib/Driver/ToolChains/CommonArgs.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macports_master/tools/clang/lib/Driver/ToolChains/CommonArgs.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -295,6 +295,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 f4cab2a888..8e13e59060 100644
</span> TargetCPUName = "ppc";
}
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.11.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.13.2
</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 ae593d8..c087e4c 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 de36e89244ba27d84d2b0725268e8648e557912e Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From dd54198e556f7759e468c54ec00829facf7fb2e8 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/1007] 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 210e74bf59..966f10d03e 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index f920961950..a1c4025c34 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;'>-@@ -7913,7 +7913,7 @@ void clang::setThreadBackgroundPriority() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8093,7 +8093,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 210e74bf59..966f10d03e 100644
</span> #endif
}
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.11.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.13.2
</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 eaf531c..4d8b3ac 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 211a11fc9d4de5a32af8404ed4773db70a0d5a68 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 58d36399f029a0fe3a6cd904b8ac0067e410de2b 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/1007] Default to fragile ObjC runtime when targeting
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,14 +6,14 @@ Subject: [PATCH 1005/1007] Default to fragile ObjC runtime when targeting
</span>
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
---
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lib/Driver/ToolChains.h | 6 ++++--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lib/Driver/ToolChains/Darwin.h | 6 ++++--
</span> 1 file changed, 4 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git llvm_master/tools/clang/lib/Driver/ToolChains.h macports_master/tools/clang/lib/Driver/ToolChains.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 7dab08915d..73c080b435 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- llvm_master/tools/clang/lib/Driver/ToolChains.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ macports_master/tools/clang/lib/Driver/ToolChains.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -362,8 +362,10 @@ public:
</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 16ed04286a..6909a5d51f 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><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -210,8 +210,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 7dab08915d..73c080b435 100644
</span>
bool UseObjCMixedDispatch() const override { return true; }
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.11.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.13.2
</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 0cee4102..cd2bf58 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 5a26bf491ba1f7e590554d8e761c674ddccabc9f Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 32e785f8b380355920cde72b8edd8b624a81e4a1 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/1007] Fixup libstdc++ header search paths for older
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,10 +15,10 @@ 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 d50fb6d788..c8969b67bf 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 1d7c8a0c87..94a7f09fd5 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;'>-@@ -365,7 +365,7 @@ AddDefaultCPlusPlusIncludePaths(const llvm::Triple &triple, const HeaderSearchOp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -367,7 +367,7 @@ AddDefaultCPlusPlusIncludePaths(const llvm::Triple &triple, const HeaderSearchOp
</span> "powerpc-apple-darwin10", "", "ppc64",
triple);
AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.0.0",
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,7 +27,7 @@ index d50fb6d788..c8969b67bf 100644
</span> triple);
break;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -374,7 +374,7 @@ AddDefaultCPlusPlusIncludePaths(const llvm::Triple &triple, const HeaderSearchOp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -376,7 +376,7 @@ AddDefaultCPlusPlusIncludePaths(const llvm::Triple &triple, const HeaderSearchOp
</span> AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.2.1",
"i686-apple-darwin10", "", "x86_64", triple);
AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.0.0",
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,5 +37,5 @@ index d50fb6d788..c8969b67bf 100644
</span>
case llvm::Triple::arm:
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.11.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.13.2
</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 dc9f897..b504159 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 06a86b2c74ec3f03e5b998e31c116af2d9acb54e Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 9ab1c4b92aebb12c1dbff152f20d223232dda0d6 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/1007] 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.11.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.13.2
</span>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-devel/files/2001-MacPorts-Only-Don-t-check-for-the-macosx.internal-SD.patch b/lang/llvm-devel/files/2001-MacPorts-Only-Don-t-check-for-the-macosx.internal-SD.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 28a2df9..4d52e58 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-devel/files/2001-MacPorts-Only-Don-t-check-for-the-macosx.internal-SD.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-devel/files/2001-MacPorts-Only-Don-t-check-for-the-macosx.internal-SD.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 e3af7250d96fc7fbe2e368db5dcbe26da773a315 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From a847fe965f9b523b67ff7d319b1e0307b7f3288d Mon Sep 17 00:00:00 2001
</span> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Mon, 30 Nov 2015 00:52:14 -0500
Subject: [PATCH 2001/2002] MacPorts Only: Don't check for the macosx.internal
<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, 11 deletions(-)
diff --git llvm_master/projects/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake macports_master/projects/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 28d398672..92a51cfe8 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index baea4a067..b801a153a 100644
</span> --- llvm_master/projects/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake
+++ macports_master/projects/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake
@@ -5,14 +5,6 @@ include(CMakeParseArguments)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,5 +41,5 @@ index 28d398672..92a51cfe8 100644
</span> set(${var} ${var_internal} PARENT_SCOPE)
endif()
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.11.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.13.2
</span>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-devel/files/3003-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>similarity index 86%
rename from lang/llvm-devel/files/3003-Fix-local-and-iterator-when-building-with-Lion-and-n.patch
rename to lang/llvm-devel/files/3001-Fix-local-and-iterator-when-building-with-Lion-and-n.patch
<span style='display:block; white-space:pre;color:#808080;'>index 40e0832..b518631 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-devel/files/3003-Fix-local-and-iterator-when-building-with-Lion-and-n.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/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:#e0e0e0;'>@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From f22ba463b19326ad65f52253c7fb51f548f77038 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 9e5d2dc8be577c1971723412a84c16026f0aca75 Mon Sep 17 00:00:00 2001
</span> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Fri, 16 Jan 2015 21:34:36 -0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 3003/3005] Fix <local> and <iterator> when building with Lion
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 3001/3003] Fix <local> and <iterator> when building with Lion
</span> and newer Availability.h
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,10 +11,10 @@ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span> 2 files changed, 4 insertions(+), 4 deletions(-)
diff --git llvm_master/projects/libcxx/include/iterator macports_master/projects/libcxx/include/iterator
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 731791b..3e1cf5e 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index d163ab1b0..a44890712 100644
</span> --- llvm_master/projects/libcxx/include/iterator
+++ macports_master/projects/libcxx/include/iterator
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1020,8 +1020,8 @@ public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1044,8 +1044,8 @@ public:
</span> _LIBCPP_INLINE_VISIBILITY bool failed() const _NOEXCEPT {return __sbuf_ == 0;}
#if !defined(__APPLE__) || \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,10 +26,10 @@ index 731791b..3e1cf5e 100644
</span> template <class _Ch, class _Tr>
friend
diff --git llvm_master/projects/libcxx/include/locale macports_master/projects/libcxx/include/locale
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index adb03af..027de77 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index d30d950c7..cd2869561 100644
</span> --- llvm_master/projects/libcxx/include/locale
+++ macports_master/projects/libcxx/include/locale
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1316,8 +1316,8 @@ __pad_and_output(_OutputIterator __s,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1372,8 +1372,8 @@ __pad_and_output(_OutputIterator __s,
</span> }
#if !defined(__APPLE__) || \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,5 +41,5 @@ index adb03af..027de77 100644
</span> template <class _CharT, class _Traits>
_LIBCPP_HIDDEN
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.10.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.13.2
</span>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-devel/files/3001-buildit-build-fix-for-Leopard.patch b/lang/llvm-devel/files/3001-buildit-build-fix-for-Leopard.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 15095ce..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-devel/files/3001-buildit-build-fix-for-Leopard.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,35 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From cc6da8932689d4160804777b0fb5277f60089b27 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:10:35 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 3001/3005] buildit build fix for Leopard
</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/buildit | 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_master/projects/libcxx/lib/buildit macports_master/projects/libcxx/lib/buildit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 6451a9b..237e5a7 100755
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- llvm_master/projects/libcxx/lib/buildit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ macports_master/projects/libcxx/lib/buildit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -50,7 +50,7 @@ case $TRIPLE in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- RC_CFLAGS="-arch i386 -arch x86_64"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SOEXT=dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ "$MACOSX_DEPLOYMENT_TARGET" = "10.6" ]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if [ "$MACOSX_DEPLOYMENT_TARGET" = "10.5" ] || [ "$MACOSX_DEPLOYMENT_TARGET" = "10.6" ]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXTRA_FLAGS="-nostdinc++ -std=c++11 -U__STRICT_ANSI__"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDSHARED_FLAGS="-o libc++.1.dylib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -59,7 +59,7 @@ case $TRIPLE in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -install_name /usr/lib/libc++.1.dylib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -Wl,-reexport_library,/usr/lib/libc++abi.dylib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -Wl,-unexported_symbols_list,libc++unexp.exp \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /usr/lib/libSystem.B.dylib"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /usr/lib/libSystem.B.dylib /usr/lib/libgcc_s.1.dylib"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [ -n "$SDKROOT" ]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.10.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/3004-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>similarity index 89%
rename from lang/llvm-devel/files/3004-Fix-missing-long-long-math-prototypes-when-using-the.patch
rename to lang/llvm-devel/files/3002-Fix-missing-long-long-math-prototypes-when-using-the.patch
<span style='display:block; white-space:pre;color:#808080;'>index 2f33671..4a9dbf0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-devel/files/3004-Fix-missing-long-long-math-prototypes-when-using-the.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-devel/files/3002-Fix-missing-long-long-math-prototypes-when-using-the.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 720feba4874d4ca3131753dc31af127e3c509c36 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 272f8f07e4ab1935fa6ce73fdd5373742e8e4c3d Mon Sep 17 00:00:00 2001
</span> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sat, 17 Jan 2015 16:26:20 -0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 3004/3005] Fix missing long long math prototypes when using
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 3002/3003] Fix missing long long math prototypes when using
</span> the Snow Leopard SDK
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,7 +10,7 @@ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span> 1 file changed, 26 insertions(+)
diff --git llvm_master/projects/libcxx/include/math.h macports_master/projects/libcxx/include/math.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index fb0b608..afbe2cf 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 8c30ba85d..023943ca2 100644
</span> --- llvm_master/projects/libcxx/include/math.h
+++ macports_master/projects/libcxx/include/math.h
@@ -300,6 +300,32 @@ long double truncl(long double x);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,5 +47,5 @@ index fb0b608..afbe2cf 100644
</span>
// We support including .h headers inside 'extern "C"' contexts, so switch
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.10.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.13.2
</span>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-devel/files/3002-buildit-Set-compatibility-version-to-RC_ProjectSourc.patch b/lang/llvm-devel/files/3002-buildit-Set-compatibility-version-to-RC_ProjectSourc.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index d3c3317..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-devel/files/3002-buildit-Set-compatibility-version-to-RC_ProjectSourc.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,28 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 54aa9c8f7cf32337c021ccc5b4c9d96eba02c7cb 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:11:37 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 3002/3005] buildit: Set compatibility version to
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- RC_ProjectSourceVersion
</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/buildit | 3 ++-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 2 insertions(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git llvm_master/projects/libcxx/lib/buildit macports_master/projects/libcxx/lib/buildit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 237e5a7..d313efe 100755
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- llvm_master/projects/libcxx/lib/buildit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ macports_master/projects/libcxx/lib/buildit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -54,7 +54,8 @@ case $TRIPLE in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXTRA_FLAGS="-nostdinc++ -std=c++11 -U__STRICT_ANSI__"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDSHARED_FLAGS="-o libc++.1.dylib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- -dynamiclib -nodefaultlibs -current_version 1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ -dynamiclib -nodefaultlibs \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ -current_version ${RC_ProjectSourceVersion} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -compatibility_version 1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -install_name /usr/lib/libc++.1.dylib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -Wl,-reexport_library,/usr/lib/libc++abi.dylib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.10.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/3005-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>similarity index 98%
rename from lang/llvm-devel/files/3005-implement-atomic-using-mutex-lock_guard-for-64b-ops-.patch
rename to lang/llvm-devel/files/3003-implement-atomic-using-mutex-lock_guard-for-64b-ops-.patch
<span style='display:block; white-space:pre;color:#808080;'>index dd25a17..df32aa7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-devel/files/3005-implement-atomic-using-mutex-lock_guard-for-64b-ops-.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-devel/files/3003-implement-atomic-using-mutex-lock_guard-for-64b-ops-.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 74fef469992fa91f4552891fa6ae9ff9f966c3aa Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 6edfb88a439f007e5b22f06389ff65fb20a8900a Mon Sep 17 00:00:00 2001
</span> From: David Fang <fang@csl.cornell.edu>
Date: Wed, 15 Jan 2014 21:27:34 -0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 3005/3005] implement atomic<> using mutex/lock_guard for 64b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 3003/3003] implement atomic<> using mutex/lock_guard for 64b
</span> ops on 32b PPC not pretty, not fast, but passes atomic tests
---
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,7 +12,7 @@ Subject: [PATCH 3005/3005] implement atomic<> using mutex/lock_guard for 64b
</span>
diff --git llvm_master/projects/libcxx/include/__atomic_locked macports_master/projects/libcxx/include/__atomic_locked
new file mode 100644
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 0000000..f10dd74
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 000000000..f10dd747e
</span> --- /dev/null
+++ macports_master/projects/libcxx/include/__atomic_locked
@@ -0,0 +1,240 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -257,10 +257,10 @@ index 0000000..f10dd74
</span> +
+#endif // _LIBCPP_ATOMIC_LOCKED
diff --git llvm_master/projects/libcxx/include/atomic macports_master/projects/libcxx/include/atomic
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index a25b5bf..91abcc3 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index f55e28ff5..9ccf1ca75 100644
</span> --- llvm_master/projects/libcxx/include/atomic
+++ macports_master/projects/libcxx/include/atomic
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1840,4 +1840,50 @@ typedef atomic<uintmax_t> atomic_uintmax_t;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1885,4 +1885,50 @@ typedef atomic<uintmax_t> atomic_uintmax_t;
</span>
_LIBCPP_END_NAMESPACE_STD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -312,5 +312,5 @@ index a25b5bf..91abcc3 100644
</span> +
#endif // _LIBCPP_ATOMIC
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.10.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.13.2
</span>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-devel/files/4001-https-llvm.org-bugs-show_bug.cgi-id-31433.patch b/lang/llvm-devel/files/4001-https-llvm.org-bugs-show_bug.cgi-id-31433.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 6b79178..861ba2c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-devel/files/4001-https-llvm.org-bugs-show_bug.cgi-id-31433.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-devel/files/4001-https-llvm.org-bugs-show_bug.cgi-id-31433.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 a97ebbe6a71d2b08059b3c14d15c7b5885d2122b Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From fb7292fc9c591c958a6f3e4edbe84370a7f9de23 Mon Sep 17 00:00:00 2001
</span> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Tue, 20 Dec 2016 01:08:20 -0800
Subject: [PATCH 4001/4002] https://llvm.org/bugs/show_bug.cgi?id=31433
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,12 +9,12 @@ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span> 1 file changed, 6 insertions(+)
diff --git llvm_master/tools/lldb/cmake/modules/AddLLDB.cmake macports_master/tools/lldb/cmake/modules/AddLLDB.cmake
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 1ca6f3e66..7eef3aff5 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 4c6f1efd6..54799c02a 100644
</span> --- llvm_master/tools/lldb/cmake/modules/AddLLDB.cmake
+++ macports_master/tools/lldb/cmake/modules/AddLLDB.cmake
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -142,6 +142,12 @@ function(add_lldb_executable name)
</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:#e0ffe0;'>+@@ -134,6 +134,12 @@ function(add_lldb_executable name)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_INSTALL_COMPONENT=${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -P "${CMAKE_BINARY_DIR}/cmake_install.cmake")
</span> endif()
+ else()
+ if(ARG_GENERATE_INSTALL)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,5 +26,5 @@ index 1ca6f3e66..7eef3aff5 100644
</span>
if(ARG_INCLUDE_IN_FRAMEWORK AND LLDB_BUILD_FRAMEWORK)
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.11.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.13.2
</span>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-devel/files/4002-Fix-build-on-Mountain-Lion.patch b/lang/llvm-devel/files/4002-Fix-build-on-Mountain-Lion.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 883f924..a45c91f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-devel/files/4002-Fix-build-on-Mountain-Lion.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-devel/files/4002-Fix-build-on-Mountain-Lion.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 e8faf68f804833d1d4620bf67ba8d181ade33ce6 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From dc05da9aad1ea26635fca93316e0f48c0966608c Mon Sep 17 00:00:00 2001
</span> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Tue, 20 Dec 2016 13:55:43 -0800
Subject: [PATCH 4002/4002] Fix build on Mountain Lion
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,7 +16,7 @@ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span> 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git llvm_master/tools/lldb/tools/debugserver/source/MacOSX/MachTask.mm macports_master/tools/lldb/tools/debugserver/source/MacOSX/MachTask.mm
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 37897a5a6..051d88363 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index bd7047ecd..eeda83d33 100644
</span> --- llvm_master/tools/lldb/tools/debugserver/source/MacOSX/MachTask.mm
+++ macports_master/tools/lldb/tools/debugserver/source/MacOSX/MachTask.mm
@@ -24,6 +24,7 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,5 +37,5 @@ index 37897a5a6..051d88363 100644
</span> uint64_t total_used_count =
(physical_memory / pagesize) -
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.11.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.13.2
</span>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-devel/files/9001-macports-libstdcxx.diff b/lang/llvm-devel/files/9001-macports-libstdcxx.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 97b4c38..4bc76e9 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,22 @@
</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;'>-@@ -162,6 +162,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git llvm/tools/clang/include/clang/Driver/ToolChain.h llvm/tools/clang/include/clang/Driver/ToolChain.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 105d0f338a..2e588bceb7 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- llvm/tools/clang/include/clang/Driver/ToolChain.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ llvm/tools/clang/include/clang/Driver/ToolChain.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -53,7 +53,8 @@ public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ enum CXXStdlibType {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CST_Libcxx,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CST_Libstdcxx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CST_Libstdcxx,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CST_MacPortsLibstdcxx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ enum RuntimeLibType {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git llvm/tools/clang/include/clang/Lex/HeaderSearchOptions.h llvm/tools/clang/include/clang/Lex/HeaderSearchOptions.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index ca3a84e75e..bcf9496d40 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- llvm/tools/clang/include/clang/Lex/HeaderSearchOptions.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ llvm/tools/clang/include/clang/Lex/HeaderSearchOptions.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -162,6 +162,9 @@ public:
</span> /// Use libc++ instead of the default libstdc++.
unsigned UseLibcxx : 1;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,9 +26,50 @@
</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;'>-@@ -1407,8 +1407,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git llvm/tools/clang/lib/Driver/ToolChain.cpp llvm/tools/clang/lib/Driver/ToolChain.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 4f82503276..718fb7e4b2 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- llvm/tools/clang/lib/Driver/ToolChain.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ llvm/tools/clang/lib/Driver/ToolChain.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -585,6 +585,8 @@ ToolChain::CXXStdlibType ToolChain::GetCXXStdlibType(const ArgList &Args) const{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return ToolChain::CST_Libcxx;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else if (LibName == "libstdc++")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return ToolChain::CST_Libstdcxx;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else if (LibName == "macports-libstdc++")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return ToolChain::CST_MacPortsLibstdcxx;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else if (LibName == "platform")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return GetDefaultCXXStdlibType();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -658,6 +660,7 @@ void ToolChain::AddCXXStdlibLibArgs(const ArgList &Args,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case ToolChain::CST_Libstdcxx:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ case ToolChain::CST_MacPortsLibstdcxx:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CmdArgs.push_back("-lstdc++");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git llvm/tools/clang/lib/Driver/ToolChains/Darwin.cpp llvm/tools/clang/lib/Driver/ToolChains/Darwin.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index e41b50c40b..4ae80f6218 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- llvm/tools/clang/lib/Driver/ToolChains/Darwin.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ llvm/tools/clang/lib/Driver/ToolChains/Darwin.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1407,6 +1407,13 @@ void DarwinClang::AddCXXStdlibLibArgs(const ArgList &Args,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Otherwise, let the linker search.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CmdArgs.push_back("-lstdc++");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ case ToolChain::CST_MacPortsLibstdcxx:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (getVFS().exists("@@MACPORTS_libstdc++@@")) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CmdArgs.push_back("@@MACPORTS_libstdc++@@");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CmdArgs.push_back("-lstdc++");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git llvm/tools/clang/lib/Frontend/CompilerInvocation.cpp llvm/tools/clang/lib/Frontend/CompilerInvocation.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 6254b0013b..3c2fb48c4b 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- llvm/tools/clang/lib/Frontend/CompilerInvocation.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ llvm/tools/clang/lib/Frontend/CompilerInvocation.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1486,8 +1486,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;'>@@ -22,11 +79,13 @@
</span> + Opts.UseMacPortsLibstdcxx = (strcmp(A->getValue(), "macports-libstdc++") == 0);
+ }
Opts.ResourceDir = Args.getLastArgValue(OPT_resource_dir);
<span style='display:block; white-space:pre;background:#ffe0e0;'>- Opts.ModuleCachePath = Args.getLastArgValue(OPT_fmodules_cache_path);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Opts.ModuleUserBuildPath = Args.getLastArgValue(OPT_fmodules_user_build_path);
</span><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:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Canonicalize -fmodules-cache-path before storing it.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git llvm/tools/clang/lib/Frontend/InitHeaderSearch.cpp llvm/tools/clang/lib/Frontend/InitHeaderSearch.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 94a7f09fd5..96dbb674de 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- llvm/tools/clang/lib/Frontend/InitHeaderSearch.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ llvm/tools/clang/lib/Frontend/InitHeaderSearch.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -108,7 +108,7 @@ static bool CanPrefixSysroot(StringRef Path) {
</span> #if defined(LLVM_ON_WIN32)
return !Path.empty() && llvm::sys::path::is_separator(Path[0]);
#else
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,8 +93,8 @@
</span> + return llvm::sys::path::is_absolute(Path) && Path.find("@@MACPORTS_GCC_INCLUDE_DIR@@")!=0;
#endif
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -361,20 +361,31 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -363,20 +363,31 @@ AddDefaultCPlusPlusIncludePaths(const llvm::Triple &triple, const HeaderSearchOp
</span>
case llvm::Triple::ppc:
case llvm::Triple::ppc64:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,59 +126,3 @@
</span> break;
case llvm::Triple::arm:
<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;'>-@@ -52,7 +52,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- enum CXXStdlibType {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CST_Libcxx,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CST_Libstdcxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CST_Libstdcxx,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CST_MacPortsLibstdcxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- enum RuntimeLibType {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- orig/tools/clang/lib/Driver/ToolChains.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.cpp 2017-01-04 20:52:25.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -786,6 +786,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Otherwise, let the linker search.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CmdArgs.push_back("-lstdc++");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ case ToolChain::CST_MacPortsLibstdcxx:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (getVFS().exists("@@MACPORTS_libstdc++@@")) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CmdArgs.push_back("@@MACPORTS_libstdc++@@");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CmdArgs.push_back("-lstdc++");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3296,6 +3303,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return ToolChain::CST_Libstdcxx;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- StringRef Value = A->getValue();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (Value == "macports-libstdc++" )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return ToolChain::CST_MacPortsLibstdcxx;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (Value != "libstdc++")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- getDriver().Diag(diag::err_drv_invalid_stdlib_name) << A->getAsString(Args);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- orig/tools/clang/lib/Driver/ToolChain.cpp 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;'>-@@ -563,6 +563,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return ToolChain::CST_Libcxx;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else if (LibName == "libstdc++")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return ToolChain::CST_Libstdcxx;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else if (LibName == "macports-libstdc++")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return ToolChain::CST_MacPortsLibstdcxx;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else if (LibName == "platform")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return GetDefaultCXXStdlibType();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -636,6 +638,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case ToolChain::CST_Libstdcxx:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ case ToolChain::CST_MacPortsLibstdcxx:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CmdArgs.push_back("-lstdc++");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-devel/files/openmp-locations.patch b/lang/llvm-devel/files/openmp-locations.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 1b0f419..53419a2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-devel/files/openmp-locations.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-devel/files/openmp-locations.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,21 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- orig/tools/clang/lib/Driver/Tools.cpp.orig 2016-10-31 22:23:57.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ fixed/tools/clang/lib/Driver/Tools.cpp 2016-10-31 22:31:55.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3154,12 +3154,18 @@ static void addOpenMPRuntime(ArgStringLi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/lib/Driver/ToolChains/Clang.cpp b/lib/Driver/ToolChains/Clang.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 292cf72b56..d8c6327080 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/tools/clang/lib/Driver/ToolChains/Clang.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/tools/clang/lib/Driver/ToolChains/Clang.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3229,6 +3229,8 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case Driver::OMPRT_OMP:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case Driver::OMPRT_IOMP5:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Clang can generate useful OpenMP code for these two runtime libraries.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // Automatically find MacPorts' omp.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CmdArgs.push_back("-I@@PREFIX@@/include/libomp");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CmdArgs.push_back("-fopenmp");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // If no option regarding the use of TLS in OpenMP codegeneration is
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/lib/Driver/ToolChains/CommonArgs.cpp b/lib/Driver/ToolChains/CommonArgs.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 8a597b5b3a..9441bb8a56 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/tools/clang/lib/Driver/ToolChains/CommonArgs.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/tools/clang/lib/Driver/ToolChains/CommonArgs.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -444,15 +444,21 @@ bool tools::addOpenMPRuntime(ArgStringList &CmdArgs, const ToolChain &TC,
</span>
switch (TC.getDriver().getOpenMPRuntime(Args)) {
case Driver::OMPRT_OMP:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,6 +27,9 @@
</span> + // Automatically find MacPorts' libomp
+ CmdArgs.push_back("-L@@PREFIX@@/lib/libomp");
CmdArgs.push_back("-lgomp");
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (GompNeedsRT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CmdArgs.push_back("-lrt");
</span> break;
case Driver::OMPRT_IOMP5:
+ // Automatically find MacPorts' libomp
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,35 +37,3 @@
</span> CmdArgs.push_back("-liomp5");
break;
case Driver::OMPRT_Unknown:
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5283,6 +5289,8 @@ void Clang::ConstructJob(Compilation &C,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case Driver::OMPRT_OMP:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case Driver::OMPRT_IOMP5:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Clang can generate useful OpenMP code for these two runtime libraries.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // Automatically find MacPorts' omp.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CmdArgs.push_back("-I@@PREFIX@@/include/libomp");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CmdArgs.push_back("-fopenmp");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // If no option regarding the use of TLS in OpenMP codegeneration is
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -10119,9 +10127,13 @@ void gnutools::Linker::ConstructJob(Comp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Also link the particular OpenMP runtimes.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- switch (ToolChain.getDriver().getOpenMPRuntime(Args)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case Driver::OMPRT_OMP:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // Automatically find MacPorts' libomp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CmdArgs.push_back("-L@@PREFIX@@/lib/libomp");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CmdArgs.push_back("-lomp");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case Driver::OMPRT_GOMP:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // Automatically find MacPorts' libomp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CmdArgs.push_back("-L@@PREFIX@@/lib/libomp");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CmdArgs.push_back("-lgomp");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // FIXME: Exclude this for platforms with libgomp that don't require
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -10129,6 +10141,8 @@ void gnutools::Linker::ConstructJob(Comp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CmdArgs.push_back("-lrt");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case Driver::OMPRT_IOMP5:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // Automatically find MacPorts' libomp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CmdArgs.push_back("-L@@PREFIX@@/lib/libomp");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CmdArgs.push_back("-liomp5");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case Driver::OMPRT_Unknown:
</span></pre><pre style='margin:0'>
</pre>