<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/dca2c7ae4a4e4ad1164b389ae82ae9f8c3dc6e90">https://github.com/macports/macports-ports/commit/dca2c7ae4a4e4ad1164b389ae82ae9f8c3dc6e90</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit dca2c7ae4a4e4ad1164b389ae82ae9f8c3dc6e90
</span>Author: Jeremy Huddleston Sequoia <jeremyhu@macports.org>
AuthorDate: Mon Oct 31 15:38:27 2016 -0700
<span style='display:block; white-space:pre;color:#404040;'> clang*: Fixup libstdc++ header search paths for Leopard and earlier
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The subpaths were removed in Lion. Leopard and Snow Leopard had darwin8
</span><span style='display:block; white-space:pre;color:#404040;'> symlinks for compatibility.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> https://llvm.org/bugs/show_bug.cgi?id=30858
</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-3.3/Portfile | 3 +-
...dc-header-search-paths-for-older-versions.patch | 42 +++++++++++++++++++++
lang/llvm-3.4/Portfile | 4 +-
...ly-Prepare-clang-format-for-replacement-w.patch | 4 +-
...ly-Fix-name-of-scan-view-executable-insid.patch | 4 +-
...3-MacPorts-Only-Fix-libclang_rt-dylib-ids.patch | 4 +-
...ly-Relocate-clang-resources-using-llvm-ve.patch | 4 +-
...werpc-darwin-external-tools-with-arch-ppc.patch | 4 +-
.../1006-Default-to-ppc7400-for-OSX-10.5.patch | 4 +-
...no-objc-legacy-dispatch-behavior-when-the.patch | 4 +-
...VIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__.patch | 4 +-
...etpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch | 4 +-
...dylib-install-name-when-building-on-Tiger.patch | 4 +-
...e-clang-builds-also-build-compiler_rt-ver.patch | 35 +++++++++++++++++
...dc-header-search-paths-for-older-versions.patch | 42 +++++++++++++++++++++
lang/llvm-3.5/Portfile | 3 +-
...ly-Prepare-clang-format-for-replacement-w.patch | 4 +-
...ly-Fix-name-of-scan-view-executable-insid.patch | 4 +-
...3-MacPorts-Only-Fix-libclang_rt-dylib-ids.patch | 4 +-
...ly-Relocate-clang-resources-using-llvm-ve.patch | 4 +-
...werpc-darwin-external-tools-with-arch-ppc.patch | 4 +-
.../1006-Default-to-ppc7400-for-OSX-10.5.patch | 4 +-
...etpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch | 4 +-
...fragile-ObjC-runtime-when-targeting-darwi.patch | 4 +-
...dc-header-search-paths-for-older-versions.patch | 42 +++++++++++++++++++++
lang/llvm-3.6/Portfile | 3 +-
...ly-Prepare-clang-format-for-replacement-w.patch | 37 +++++++++---------
...ly-Fall-back-on-xcodebuild-sdk-when-xcrun.patch | 13 ++++---
...ly-Fix-name-of-scan-view-executable-insid.patch | 13 ++++---
...4-MacPorts-Only-Fix-libclang_rt-dylib-ids.patch | 13 ++++---
...ly-Relocate-clang-resources-using-llvm-ve.patch | 19 +++++-----
.../1006-Default-to-ppc7400-for-OSX-10.5.patch | 15 ++++----
...etpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch | 13 ++++---
...fragile-ObjC-runtime-when-targeting-darwi.patch | 13 ++++---
...dc-header-search-paths-for-older-versions.patch | 42 +++++++++++++++++++++
lang/llvm-3.7/Portfile | 3 +-
...ly-Prepare-clang-format-for-replacement-w.patch | 4 +-
...ly-Fall-back-on-xcodebuild-sdk-when-xcrun.patch | 4 +-
...ly-Fix-name-of-scan-view-executable-insid.patch | 4 +-
...ly-Relocate-clang-resources-using-llvm-ve.patch | 4 +-
.../1005-Default-to-ppc7400-for-OSX-10.5.patch | 4 +-
...etpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch | 4 +-
...fragile-ObjC-runtime-when-targeting-darwi.patch | 4 +-
...dc-header-search-paths-for-older-versions.patch | 42 +++++++++++++++++++++
lang/llvm-3.8/Portfile | 3 +-
...ly-Prepare-clang-format-for-replacement-w.patch | 36 +++++++++---------
...ly-Fall-back-on-xcodebuild-sdk-when-xcrun.patch | 12 +++---
...ly-Fix-name-of-scan-view-executable-insid.patch | 12 +++---
...ly-Relocate-clang-resources-using-llvm-ve.patch | 18 ++++-----
.../1005-Default-to-ppc7400-for-OSX-10.5.patch | 16 ++++----
...etpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch | 16 ++++----
...fragile-ObjC-runtime-when-targeting-darwi.patch | 14 +++----
...dc-header-search-paths-for-older-versions.patch | 42 +++++++++++++++++++++
lang/llvm-3.9/Portfile | 3 +-
...ly-Prepare-clang-format-for-replacement-w.patch | 37 +++++++++---------
...ly-Fix-name-of-scan-view-executable-insid.patch | 17 +++++----
.../1003-Default-to-ppc7400-for-OSX-10.5.patch | 17 +++++----
...etpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch | 17 +++++----
...fragile-ObjC-runtime-when-targeting-darwi.patch | 17 +++++----
...dc-header-search-paths-for-older-versions.patch | 42 +++++++++++++++++++++
lang/llvm-devel/Portfile | 3 +-
...ly-Prepare-clang-format-for-replacement-w.patch | 12 +++---
...ly-Fix-name-of-scan-view-executable-insid.patch | 10 ++---
.../1003-Default-to-ppc7400-for-OSX-10.5.patch | 10 ++---
...etpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch | 10 ++---
...fragile-ObjC-runtime-when-targeting-darwi.patch | 10 ++---
...dc-header-search-paths-for-older-versions.patch | 41 ++++++++++++++++++++
lang/llvm-devel/files/openmp-locations.patch | 44 +++++++++++-----------
68 files changed, 674 insertions(+), 282 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-3.3/Portfile b/lang/llvm-3.3/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f7017b5..24b8152 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-3.3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-3.3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +9,7 @@ PortGroup select 1.0
</span> set llvm_version 3.3
name llvm-${llvm_version}
revision 10
<span style='display:block; white-space:pre;background:#ffe0e0;'>-subport clang-${llvm_version} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport clang-${llvm_version} { revision 11 }
</span> set suffix mp-${llvm_version}
set sub_prefix ${prefix}/libexec/llvm-${llvm_version}
dist_subdir llvm
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -99,6 +99,7 @@ if {${subport} == "clang-${llvm_version}"} {
</span>
patchfiles-append tiger-shlib-clang.patch tiger-libclang.patch scan-build-PR-35006.patch \
0001-Comment-out-SL-cctools-workaround.patch \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1012-Fixup-libstdc-header-search-paths-for-older-versions.patch \
</span> mavericks-libc++.patch \
snowleopard-cmath.patch \
yosemite-deployment-target.patch \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-3.3/files/1012-Fixup-libstdc-header-search-paths-for-older-versions.patch b/lang/llvm-3.3/files/1012-Fixup-libstdc-header-search-paths-for-older-versions.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..ae9fca0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-3.3/files/1012-Fixup-libstdc-header-search-paths-for-older-versions.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,42 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 392f6518506567796d4e9a74a3896021b0bffcbf Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Mon, 31 Oct 2016 15:06:36 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1012/1012] Fixup libstdc++ header search paths for older
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ versions of Mac OS X
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+The subpaths were removed in Lion. Leopard and Snow Leopard had darwin8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+symlinks for compatibility.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://llvm.org/bugs/show_bug.cgi?id=30858
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+(cherry picked from commit e23e3e73fd7bc8e841725813d54df1ff5c0db88d)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lib/Frontend/InitHeaderSearch.cpp | 4 ++--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 2 insertions(+), 2 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git llvm_release_34/tools/clang/lib/Frontend/InitHeaderSearch.cpp macports_release_34/tools/clang/lib/Frontend/InitHeaderSearch.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index d144cbb..f4beab0 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- llvm_release_34/tools/clang/lib/Frontend/InitHeaderSearch.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macports_release_34/tools/clang/lib/Frontend/InitHeaderSearch.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -357,7 +357,7 @@ AddDefaultCPlusPlusIncludePaths(const llvm::Triple &triple, const HeaderSearchOp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "powerpc-apple-darwin10", "", "ppc64",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ triple);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.0.0",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "powerpc-apple-darwin10", "", "ppc64",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "powerpc-apple-darwin8", "", "ppc64",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ triple);
</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;'>+@@ -366,7 +366,7 @@ AddDefaultCPlusPlusIncludePaths(const llvm::Triple &triple, const HeaderSearchOp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.2.1",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "i686-apple-darwin10", "", "x86_64", triple);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.0.0",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "i686-apple-darwin8", "", "", triple);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case llvm::Triple::arm:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.10.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-3.4/Portfile b/lang/llvm-3.4/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e49d8dd..3695fa0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-3.4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-3.4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,7 +12,7 @@ set llvm_version 3.4
</span> set llvm_version_no_dot 34
name llvm-${llvm_version}
revision 11
<span style='display:block; white-space:pre;background:#ffe0e0;'>-subport clang-${llvm_version} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport clang-${llvm_version} { revision 12 }
</span> set suffix mp-${llvm_version}
set sub_prefix ${prefix}/libexec/llvm-${llvm_version}
dist_subdir llvm
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -132,6 +132,8 @@ if {${subport} eq "clang-${llvm_version}"} {
</span> 1008-Change-__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__.patch \
1009-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch \
1010-Fix-dylib-install-name-when-building-on-Tiger.patch \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1011-Make-verbose-clang-builds-also-build-compiler_rt-ver.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1012-Fixup-libstdc-header-search-paths-for-older-versions.patch \
</span> 2001-MacPorts-Only-Comment-out-SL-cctools-workaround.patch \
2002-On-darwin-build-ppc-slices-of-the-compiler-runtime-i.patch \
3001-buildit-build-fix-for-Leopard.patch \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-3.4/files/1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch b/lang/llvm-3.4/files/1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 686a0fb..06f174f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-3.4/files/1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-3.4/files/1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span> From 47d961284ee5012426d7ed9aa694c5092ec77d09 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sat, 17 Jan 2015 17:50:24 -0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1001/1010] MacPorts Only: Prepare clang-format for replacement
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1001/1012] MacPorts Only: Prepare clang-format for replacement
</span> with absolute path
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -86,5 +86,5 @@ index f5a5756..666ab46 100644
</span> # Change this to format according to other formatting styles. See the output of
# 'clang-format --help' for a list of supported styles. The default looks for
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.2.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.10.1
</span>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-3.4/files/1002-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch b/lang/llvm-3.4/files/1002-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 9d6a5cb..c027051 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-3.4/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-3.4/files/1002-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span> From b63ecbd1b0a7b65e736bcd3be08cd6935ec2b49e Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sat, 17 Jan 2015 17:55:27 -0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1002/1010] MacPorts Only: Fix name of scan-view executable
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1002/1012] MacPorts Only: Fix name of scan-view executable
</span> inside scan-build
http://trac.macports.org/ticket/35006
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,5 +26,5 @@ index 0f119f6..175d577 100755
</span> exec $ScanView, "$HtmlDir";
}
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.2.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.10.1
</span>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-3.4/files/1003-MacPorts-Only-Fix-libclang_rt-dylib-ids.patch b/lang/llvm-3.4/files/1003-MacPorts-Only-Fix-libclang_rt-dylib-ids.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index d178021..ab2de48 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-3.4/files/1003-MacPorts-Only-Fix-libclang_rt-dylib-ids.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-3.4/files/1003-MacPorts-Only-Fix-libclang_rt-dylib-ids.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span> From cc0e2a7b162eea6f7918dd29cfbbcd96aaa59a09 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sat, 17 Jan 2015 17:56:44 -0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1003/1010] MacPorts Only: Fix libclang_rt dylib ids
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1003/1012] MacPorts Only: Fix libclang_rt dylib ids
</span>
We should probably not be shipping these.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,5 +24,5 @@ index c6f38b2..273e482 100644
</span> # Rule to install runtime libraries.
RuntimeLibraryInstall.$1: \
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.2.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.10.1
</span>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-3.4/files/1004-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch b/lang/llvm-3.4/files/1004-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 21d136b..d609895 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-3.4/files/1004-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-3.4/files/1004-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span> From 6c249a820605f4e2f998d5849b5be1005bf480e3 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sat, 17 Jan 2015 17:58:25 -0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1004/1010] MacPorts Only: Relocate clang resources using llvm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1004/1012] MacPorts Only: Relocate clang resources using llvm
</span> version
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -71,5 +71,5 @@ index 273e482..3ecee5c 100644
</span>
endif
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.2.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.10.1
</span>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-3.4/files/1005-Call-powerpc-darwin-external-tools-with-arch-ppc.patch b/lang/llvm-3.4/files/1005-Call-powerpc-darwin-external-tools-with-arch-ppc.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index c761691..3f72a0a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-3.4/files/1005-Call-powerpc-darwin-external-tools-with-arch-ppc.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-3.4/files/1005-Call-powerpc-darwin-external-tools-with-arch-ppc.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span> From e149c95a9e4135360256d4037c6a9718e6c03f97 Mon Sep 17 00:00:00 2001
From: Rafael Espindola <rafael.espindola@gmail.com>
Date: Thu, 28 Aug 2014 21:23:05 +0000
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1005/1010] Call powerpc-darwin external tools with -arch ppc.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1005/1012] Call powerpc-darwin external tools with -arch ppc.
</span>
With this patch we call external tools for powerpc-darwin with "-arch ppc"
instead of "-arch powerpc", so as to be compatible with the cctools assembler
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -114,5 +114,5 @@ index 60bf61d..e7e5e89 100644
</span> +// CHECK-LD-PPC64: {{ld(.exe)?"}}
+// CHECK-LD-PPC64: "-arch" "ppc64"
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.2.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.10.1
</span>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-3.4/files/1006-Default-to-ppc7400-for-OSX-10.5.patch b/lang/llvm-3.4/files/1006-Default-to-ppc7400-for-OSX-10.5.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index bbb0449..6c614b7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-3.4/files/1006-Default-to-ppc7400-for-OSX-10.5.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-3.4/files/1006-Default-to-ppc7400-for-OSX-10.5.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span> From 0a8c33e1e541afd67d1e73dbb5c3dce7642ce9c2 Mon Sep 17 00:00:00 2001
From: Iain Sandoe <iain@codesourcery.com>
Date: Sun, 27 Jul 2014 20:35:16 +0100
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1006/1010] Default to ppc7400 for OSX 10.5+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1006/1012] Default to ppc7400 for OSX 10.5+
</span>
(cherry picked from commit 971aa68baad8c240f1abf30e62bd947a8923e3fa)
---
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,5 +23,5 @@ index ca966c5..f8d1695 100644
</span> TargetCPUName = "ppc";
}
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.2.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.10.1
</span>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-3.4/files/1007-reinstate-fno-objc-legacy-dispatch-behavior-when-the.patch b/lang/llvm-3.4/files/1007-reinstate-fno-objc-legacy-dispatch-behavior-when-the.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index cedb44a..0857b43 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-3.4/files/1007-reinstate-fno-objc-legacy-dispatch-behavior-when-the.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-3.4/files/1007-reinstate-fno-objc-legacy-dispatch-behavior-when-the.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span> From f19c8901645037dcf8fb45a3d3ae25653a40df78 Mon Sep 17 00:00:00 2001
From: Fariborz Jahanian <fjahanian@apple.com>
Date: Mon, 20 Jan 2014 19:32:33 +0000
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1007/1010] reinstate -fno-objc-legacy-dispatch behavior when
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1007/1012] reinstate -fno-objc-legacy-dispatch behavior when
</span> the deployment target is 10.5 or earlier
<rdar://problem/18971940>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -91,5 +91,5 @@ index 1742deb..1b3f7a8 100644
</span>
// RUN: %clang -target x86_64-apple-darwin10 -S -### %s \
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.2.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.10.1
</span>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-3.4/files/1008-Change-__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__.patch b/lang/llvm-3.4/files/1008-Change-__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 1b0b371..751de28 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-3.4/files/1008-Change-__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-3.4/files/1008-Change-__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span> From ab94d8e941daedf76ac64fdbd48f55e7f76f8fcd Mon Sep 17 00:00:00 2001
From: Bob Wilson <bob.wilson@apple.com>
Date: Fri, 8 Aug 2014 21:45:53 +0000
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1008/1010] Change
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1008/1012] Change
</span> __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ for versions > 10.9.
The previous encoding only allowed a single digit for the minor version
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -63,5 +63,5 @@ index 7234ab4..2e0804b 100644
</span> +// RUN: %clang -target x86_64-apple-macosx -mmacosx-version-min=10.10 -dM -E -o %t %s
+// RUN: grep '__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__' %t | grep '101000' | count 1
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.2.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.10.1
</span>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-3.4/files/1009-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch b/lang/llvm-3.4/files/1009-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index aca16f5..5ea660a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-3.4/files/1009-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-3.4/files/1009-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span> From a77967e715ba05ad0b295efeb4b81554a4f978e7 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sat, 17 Jan 2015 19:08:57 -0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1009/1010] Only call setpriority(PRIO_DARWIN_THREAD, 0,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1009/1012] Only call setpriority(PRIO_DARWIN_THREAD, 0,
</span> PRIO_DARWIN_BG) if it is available
Tiger and earlier versions of darwin do not support this.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,5 +29,5 @@ index f53e5c1..2189f09 100644
</span> #endif
}
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.2.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.10.1
</span>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-3.4/files/1010-Fix-dylib-install-name-when-building-on-Tiger.patch b/lang/llvm-3.4/files/1010-Fix-dylib-install-name-when-building-on-Tiger.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 9ffc289..2a4b0af 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-3.4/files/1010-Fix-dylib-install-name-when-building-on-Tiger.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-3.4/files/1010-Fix-dylib-install-name-when-building-on-Tiger.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span> From f87a09a7b12c8c6eeaf74df7ecefd9d6c81763cf Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sun, 18 Jan 2015 02:04:36 -0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1010/1010] Fix dylib install name when building on Tiger
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1010/1012] Fix dylib install name when building on Tiger
</span>
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
---
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,5 +28,5 @@ index 43ecbd1..971cc43 100644
</span> # If we're doing an Apple-style build, add the LTO object path.
ifeq ($(RC_XBS),YES)
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.2.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.10.1
</span>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-3.4/files/1011-Make-verbose-clang-builds-also-build-compiler_rt-ver.patch b/lang/llvm-3.4/files/1011-Make-verbose-clang-builds-also-build-compiler_rt-ver.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..df1eef2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-3.4/files/1011-Make-verbose-clang-builds-also-build-compiler_rt-ver.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,35 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 4c9c2d9af33b9b4dbef5c9e15435aa3996136217 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Jonathan Roelofs <jonathan@codesourcery.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Wed, 14 May 2014 23:07:16 +0000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1011/1012] Make verbose clang builds also build compiler_rt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ verbosely
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@208821 91177308-0d34-0410-b5e6-96231b3b80d8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+(cherry picked from commit c85839cf5e69572d949ee7795043ba03c3627451)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ runtime/compiler-rt/Makefile | 2 ++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 2 insertions(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git llvm_release_34/tools/clang/runtime/compiler-rt/Makefile macports_release_34/tools/clang/runtime/compiler-rt/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 3ecee5c..33e20a1 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- llvm_release_34/tools/clang/runtime/compiler-rt/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macports_release_34/tools/clang/runtime/compiler-rt/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -165,6 +165,7 @@ BuildRuntimeLibraries:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ProjSrcRoot=$(COMPILERRT_SRC_ROOT) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ProjObjRoot=$(PROJ_OBJ_DIR) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CC="$(ToolDir)/clang" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ VERBOSE=$(VERBOSE) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LLVM_ANDROID_TOOLCHAIN_DIR="$(LLVM_ANDROID_TOOLCHAIN_DIR)" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(COMPILERRT_MAKE_FLAGS) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(RuntimeDirs:%=clang_%)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -173,6 +174,7 @@ CleanRuntimeLibraries:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(Verb) $(MAKE) -C $(COMPILERRT_SRC_ROOT) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ProjSrcRoot=$(COMPILERRT_SRC_ROOT) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ProjObjRoot=$(PROJ_OBJ_DIR) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ VERBOSE=$(VERBOSE) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(COMPILERRT_MAKE_FLAGS) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ clean
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .PHONY: CleanRuntimeLibraries
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.10.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-3.4/files/1012-Fixup-libstdc-header-search-paths-for-older-versions.patch b/lang/llvm-3.4/files/1012-Fixup-libstdc-header-search-paths-for-older-versions.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..ae9fca0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-3.4/files/1012-Fixup-libstdc-header-search-paths-for-older-versions.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,42 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 392f6518506567796d4e9a74a3896021b0bffcbf Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Mon, 31 Oct 2016 15:06:36 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1012/1012] Fixup libstdc++ header search paths for older
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ versions of Mac OS X
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+The subpaths were removed in Lion. Leopard and Snow Leopard had darwin8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+symlinks for compatibility.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://llvm.org/bugs/show_bug.cgi?id=30858
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+(cherry picked from commit e23e3e73fd7bc8e841725813d54df1ff5c0db88d)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lib/Frontend/InitHeaderSearch.cpp | 4 ++--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 2 insertions(+), 2 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git llvm_release_34/tools/clang/lib/Frontend/InitHeaderSearch.cpp macports_release_34/tools/clang/lib/Frontend/InitHeaderSearch.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index d144cbb..f4beab0 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- llvm_release_34/tools/clang/lib/Frontend/InitHeaderSearch.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macports_release_34/tools/clang/lib/Frontend/InitHeaderSearch.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -357,7 +357,7 @@ AddDefaultCPlusPlusIncludePaths(const llvm::Triple &triple, const HeaderSearchOp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "powerpc-apple-darwin10", "", "ppc64",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ triple);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.0.0",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "powerpc-apple-darwin10", "", "ppc64",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "powerpc-apple-darwin8", "", "ppc64",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ triple);
</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;'>+@@ -366,7 +366,7 @@ AddDefaultCPlusPlusIncludePaths(const llvm::Triple &triple, const HeaderSearchOp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.2.1",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "i686-apple-darwin10", "", "x86_64", triple);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.0.0",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "i686-apple-darwin8", "", "", triple);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case llvm::Triple::arm:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.10.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-3.5/Portfile b/lang/llvm-3.5/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index fe07bf5..0a8e7cb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-3.5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-3.5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,7 +8,7 @@ set llvm_version 3.5
</span> set llvm_version_no_dot 35
name llvm-${llvm_version}
revision 8
<span style='display:block; white-space:pre;background:#ffe0e0;'>-subport clang-${llvm_version} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport clang-${llvm_version} { revision 9 }
</span> set suffix mp-${llvm_version}
set sub_prefix ${prefix}/libexec/llvm-${llvm_version}
dist_subdir llvm
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -131,6 +131,7 @@ if {${subport} eq "clang-${llvm_version}"} {
</span> 1006-Default-to-ppc7400-for-OSX-10.5.patch \
1007-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch \
1008-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1009-Fixup-libstdc-header-search-paths-for-older-versions.patch \
</span> 2001-MacPorts-Only-Comment-out-SL-cctools-workaround.patch \
2002-Do-not-build-a-separate-x86_64h-Haswell-slice-for-th.patch \
2003-Build-Darwin-libclang_rt-libraries-against-real-SDKs.patch \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-3.5/files/1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch b/lang/llvm-3.5/files/1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 5433396..63b59f3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-3.5/files/1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-3.5/files/1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span> From be249dfc99009e07f65c01463ac62d9592aa00d7 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sat, 17 Jan 2015 17:50:24 -0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1001/1008] MacPorts Only: Prepare clang-format for replacement
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1001/1009] MacPorts Only: Prepare clang-format for replacement
</span> with absolute path
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -84,5 +84,5 @@ index 16a1879..1107737 100644
</span> # Change this to format according to other formatting styles. See the output of
# 'clang-format --help' for a list of supported styles. The default looks for
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.2.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.10.1
</span>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-3.5/files/1002-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch b/lang/llvm-3.5/files/1002-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index fef0cdb..8b610a9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-3.5/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-3.5/files/1002-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span> From 61fae0901db990788b0db66406afdfb4ba75f2dc Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sat, 17 Jan 2015 17:55:27 -0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1002/1008] MacPorts Only: Fix name of scan-view executable
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1002/1009] MacPorts Only: Fix name of scan-view executable
</span> inside scan-build
http://trac.macports.org/ticket/35006
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,5 +26,5 @@ index 153be2d..e2ce273 100755
</span> exec $ScanView, "$HtmlDir";
}
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.2.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.10.1
</span>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-3.5/files/1003-MacPorts-Only-Fix-libclang_rt-dylib-ids.patch b/lang/llvm-3.5/files/1003-MacPorts-Only-Fix-libclang_rt-dylib-ids.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index e940503..f8d6b97 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-3.5/files/1003-MacPorts-Only-Fix-libclang_rt-dylib-ids.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-3.5/files/1003-MacPorts-Only-Fix-libclang_rt-dylib-ids.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span> From f4ceb2cbee715c5c3e795818b21dfd70928d6a81 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sat, 17 Jan 2015 17:56:44 -0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1003/1008] MacPorts Only: Fix libclang_rt dylib ids
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1003/1009] MacPorts Only: Fix libclang_rt dylib ids
</span>
We should probably not be shipping these.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,5 +24,5 @@ index ccd83a3..d858338 100644
</span> # Rule to install runtime libraries.
RuntimeLibraryInstall.$1: \
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.2.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.10.1
</span>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-3.5/files/1004-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch b/lang/llvm-3.5/files/1004-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index f5ce7c4..d32dd0a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-3.5/files/1004-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-3.5/files/1004-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span> From a16420beabdb6d675c48d4c546fb827247e4d287 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sat, 17 Jan 2015 17:58:25 -0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1004/1008] MacPorts Only: Relocate clang resources using llvm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1004/1009] MacPorts Only: Relocate clang resources using llvm
</span> version
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -71,5 +71,5 @@ index d858338..02ce6b6 100644
</span>
endif
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.2.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.10.1
</span>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-3.5/files/1005-Call-powerpc-darwin-external-tools-with-arch-ppc.patch b/lang/llvm-3.5/files/1005-Call-powerpc-darwin-external-tools-with-arch-ppc.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index c06aa20..8873776 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-3.5/files/1005-Call-powerpc-darwin-external-tools-with-arch-ppc.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-3.5/files/1005-Call-powerpc-darwin-external-tools-with-arch-ppc.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span> From 85b43b6a6cabfbf2b8b65c91c921c92a86e2ffee Mon Sep 17 00:00:00 2001
From: Rafael Espindola <rafael.espindola@gmail.com>
Date: Thu, 28 Aug 2014 21:23:05 +0000
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1005/1008] Call powerpc-darwin external tools with -arch ppc.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1005/1009] Call powerpc-darwin external tools with -arch ppc.
</span>
With this patch we call external tools for powerpc-darwin with "-arch ppc"
instead of "-arch powerpc", so as to be compatible with the cctools assembler
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -114,5 +114,5 @@ index 60bf61d..e7e5e89 100644
</span> +// CHECK-LD-PPC64: {{ld(.exe)?"}}
+// CHECK-LD-PPC64: "-arch" "ppc64"
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.2.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.10.1
</span>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-3.5/files/1006-Default-to-ppc7400-for-OSX-10.5.patch b/lang/llvm-3.5/files/1006-Default-to-ppc7400-for-OSX-10.5.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index fc8eead..5563e3f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-3.5/files/1006-Default-to-ppc7400-for-OSX-10.5.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-3.5/files/1006-Default-to-ppc7400-for-OSX-10.5.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span> From fb1d2809e5d8bc633fb5e4131e1896078fb2da70 Mon Sep 17 00:00:00 2001
From: Iain Sandoe <iain@codesourcery.com>
Date: Sun, 27 Jul 2014 20:35:16 +0100
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1006/1008] Default to ppc7400 for OSX 10.5+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1006/1009] Default to ppc7400 for OSX 10.5+
</span>
(cherry picked from commit 971aa68baad8c240f1abf30e62bd947a8923e3fa)
---
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,5 +23,5 @@ index 68d5fc6..066f7d5 100644
</span> TargetCPUName = "ppc";
}
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.2.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.10.1
</span>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-3.5/files/1007-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch b/lang/llvm-3.5/files/1007-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 8e88833..f192e44 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-3.5/files/1007-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-3.5/files/1007-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span> From dacdb84b2114efa6a42bc5c20ba2cd2001a83e94 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sat, 17 Jan 2015 19:08:57 -0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1007/1008] Only call setpriority(PRIO_DARWIN_THREAD, 0,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1007/1009] Only call setpriority(PRIO_DARWIN_THREAD, 0,
</span> PRIO_DARWIN_BG) if it is available
Tiger and earlier versions of darwin do not support this.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,5 +26,5 @@ index fc8703a..c46d258 100644
</span> #endif
}
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.2.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.10.1
</span>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-3.5/files/1008-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch b/lang/llvm-3.5/files/1008-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 9becb52..92e47ad 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-3.5/files/1008-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-3.5/files/1008-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span> From cac98596c74040bef53be8cb6882f301c0fb9ffa Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Tue, 20 Jan 2015 00:09:16 -0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1008/1008] Default to fragile ObjC runtime when targeting
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1008/1009] Default to fragile ObjC runtime when targeting
</span> darwin/ppc
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,5 +28,5 @@ index b5df866..bc9f273 100644
</span>
bool UseObjCMixedDispatch() const override {
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.2.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.10.1
</span>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-3.5/files/1009-Fixup-libstdc-header-search-paths-for-older-versions.patch b/lang/llvm-3.5/files/1009-Fixup-libstdc-header-search-paths-for-older-versions.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..b988ac9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-3.5/files/1009-Fixup-libstdc-header-search-paths-for-older-versions.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,42 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From f60806fcfdb9c20bab6f5fab55e12b30fc19d0ff Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Mon, 31 Oct 2016 15:06:36 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1009/1009] Fixup libstdc++ header search paths for older
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ versions of Mac OS X
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+The subpaths were removed in Lion. Leopard and Snow Leopard had darwin8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+symlinks for compatibility.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://llvm.org/bugs/show_bug.cgi?id=30858
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+(cherry picked from commit e23e3e73fd7bc8e841725813d54df1ff5c0db88d)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lib/Frontend/InitHeaderSearch.cpp | 4 ++--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 2 insertions(+), 2 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git llvm_release_35/tools/clang/lib/Frontend/InitHeaderSearch.cpp macports_release_35/tools/clang/lib/Frontend/InitHeaderSearch.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index d2edc94..19ad217 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- llvm_release_35/tools/clang/lib/Frontend/InitHeaderSearch.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macports_release_35/tools/clang/lib/Frontend/InitHeaderSearch.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -359,7 +359,7 @@ AddDefaultCPlusPlusIncludePaths(const llvm::Triple &triple, const HeaderSearchOp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "powerpc-apple-darwin10", "", "ppc64",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ triple);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.0.0",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "powerpc-apple-darwin10", "", "ppc64",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "powerpc-apple-darwin8", "", "ppc64",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ triple);
</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;'>+@@ -368,7 +368,7 @@ AddDefaultCPlusPlusIncludePaths(const llvm::Triple &triple, const HeaderSearchOp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.2.1",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "i686-apple-darwin10", "", "x86_64", triple);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.0.0",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "i686-apple-darwin8", "", "", triple);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case llvm::Triple::arm:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.10.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-3.6/Portfile b/lang/llvm-3.6/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c1938bc..4b78898 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-3.6/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-3.6/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,7 +8,7 @@ set llvm_version 3.6
</span> set llvm_version_no_dot 36
name llvm-${llvm_version}
revision 4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-subport clang-${llvm_version} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport clang-${llvm_version} { revision 5 }
</span> set suffix mp-${llvm_version}
set sub_prefix ${prefix}/libexec/llvm-${llvm_version}
dist_subdir llvm
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -131,6 +131,7 @@ if {${subport} eq "clang-${llvm_version}"} {
</span> 1006-Default-to-ppc7400-for-OSX-10.5.patch \
1007-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch \
1008-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1009-Fixup-libstdc-header-search-paths-for-older-versions.patch \
</span> 2001-MacPorts-Only-Comment-out-SL-cctools-workaround.patch \
2002-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch \
2003-Fall-back-on-xcodebuild-sdk-when-xcrun-sdk-is-not-su.patch \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-3.6/files/1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch b/lang/llvm-3.6/files/1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index dd83cd2..68bab64 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-3.6/files/1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-3.6/files/1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +1,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 6fdbdc072ecd1eac579af61e5985cb935d02a52b Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 78082d8eaa68bf0f475e5b6508855fea3233e5b3 Mon Sep 17 00:00:00 2001
</span> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sat, 17 Jan 2015 17:50:24 -0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1001/1008] MacPorts Only: Prepare clang-format for replacement
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1001/1009] MacPorts Only: Prepare clang-format for replacement
</span> with absolute path
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+(cherry picked from commit d95bdf342037ee815fa21e871dd9479bc3572550)
</span> ---
tools/clang-format/clang-format-bbedit.applescript | 2 +-
tools/clang-format/clang-format-diff.py | 2 +-
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,10 +14,10 @@ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span> tools/clang-format/clang-format.py | 2 +-
5 files changed, 5 insertions(+), 6 deletions(-)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git llvm_master/tools/clang/tools/clang-format/clang-format-bbedit.applescript macports_master/tools/clang/tools/clang-format/clang-format-bbedit.applescript
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git llvm_release_36/tools/clang/tools/clang-format/clang-format-bbedit.applescript macports_release_36/tools/clang/tools/clang-format/clang-format-bbedit.applescript
</span> index fa88fe9..eb09448 100644
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- llvm_master/tools/clang/tools/clang-format/clang-format-bbedit.applescript
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ macports_master/tools/clang/tools/clang-format/clang-format-bbedit.applescript
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- llvm_release_36/tools/clang/tools/clang-format/clang-format-bbedit.applescript
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macports_release_36/tools/clang/tools/clang-format/clang-format-bbedit.applescript
</span> @@ -15,7 +15,7 @@ tell application "BBEdit"
end tell
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,10 +27,10 @@ index fa88fe9..eb09448 100644
</span>
tell application "BBEdit"
-- "set contents of text document 1 to newContents" scrolls to the bottom while
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git llvm_master/tools/clang/tools/clang-format/clang-format-diff.py macports_master/tools/clang/tools/clang-format/clang-format-diff.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git llvm_release_36/tools/clang/tools/clang-format/clang-format-diff.py macports_release_36/tools/clang/tools/clang-format/clang-format-diff.py
</span> index 23adb07..063c5d2 100755
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- llvm_master/tools/clang/tools/clang-format/clang-format-diff.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ macports_master/tools/clang/tools/clang-format/clang-format-diff.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- llvm_release_36/tools/clang/tools/clang-format/clang-format-diff.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macports_release_36/tools/clang/tools/clang-format/clang-format-diff.py
</span> @@ -32,7 +32,7 @@ import sys
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,10 +40,10 @@ index 23adb07..063c5d2 100755
</span>
def main():
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git llvm_master/tools/clang/tools/clang-format/clang-format-sublime.py macports_master/tools/clang/tools/clang-format/clang-format-sublime.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git llvm_release_36/tools/clang/tools/clang-format/clang-format-sublime.py macports_release_36/tools/clang/tools/clang-format/clang-format-sublime.py
</span> index 16ff56e..4b68104 100644
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- llvm_master/tools/clang/tools/clang-format/clang-format-sublime.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ macports_master/tools/clang/tools/clang-format/clang-format-sublime.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- llvm_release_36/tools/clang/tools/clang-format/clang-format-sublime.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macports_release_36/tools/clang/tools/clang-format/clang-format-sublime.py
</span> @@ -18,7 +18,7 @@ import sublime_plugin
import subprocess
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,10 +53,10 @@ index 16ff56e..4b68104 100644
</span>
# Change this to format according to other formatting styles. See the output of
# 'clang-format --help' for a list of supported styles. The default looks for
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git llvm_master/tools/clang/tools/clang-format/clang-format.el macports_master/tools/clang/tools/clang-format/clang-format.el
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git llvm_release_36/tools/clang/tools/clang-format/clang-format.el macports_release_36/tools/clang/tools/clang-format/clang-format.el
</span> index ab0991b..a2a278a 100644
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- llvm_master/tools/clang/tools/clang-format/clang-format.el
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ macports_master/tools/clang/tools/clang-format/clang-format.el
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- llvm_release_36/tools/clang/tools/clang-format/clang-format.el
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macports_release_36/tools/clang/tools/clang-format/clang-format.el
</span> @@ -36,8 +36,7 @@
:group 'tools)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -66,10 +67,10 @@ index ab0991b..a2a278a 100644
</span> "Location of the clang-format executable.
A string containing the name or the full path of the executable."
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git llvm_master/tools/clang/tools/clang-format/clang-format.py macports_master/tools/clang/tools/clang-format/clang-format.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git llvm_release_36/tools/clang/tools/clang-format/clang-format.py macports_release_36/tools/clang/tools/clang-format/clang-format.py
</span> index a79205a..e71362a 100644
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- llvm_master/tools/clang/tools/clang-format/clang-format.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ macports_master/tools/clang/tools/clang-format/clang-format.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- llvm_release_36/tools/clang/tools/clang-format/clang-format.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macports_release_36/tools/clang/tools/clang-format/clang-format.py
</span> @@ -25,7 +25,7 @@ import vim
# set g:clang_format_path to the path to clang-format if it is not on the path
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -80,5 +81,5 @@ index a79205a..e71362a 100644
</span> binary = vim.eval('g:clang_format_path')
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.2.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.10.1
</span>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-3.6/files/1002-MacPorts-Only-Fall-back-on-xcodebuild-sdk-when-xcrun.patch b/lang/llvm-3.6/files/1002-MacPorts-Only-Fall-back-on-xcodebuild-sdk-when-xcrun.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 6e8ea28..7b9972ad 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-3.6/files/1002-MacPorts-Only-Fall-back-on-xcodebuild-sdk-when-xcrun.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-3.6/files/1002-MacPorts-Only-Fall-back-on-xcodebuild-sdk-when-xcrun.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,18 +1,19 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 3a51db8fffb0298c927fb8a183d47392027bbbc6 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 79e05f2e249166cc4fb5ce0280a845e890211632 Mon Sep 17 00:00:00 2001
</span> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sat, 17 Jan 2015 17:51:10 -0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1002/1008] MacPorts Only: Fall back on xcodebuild -sdk when
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1002/1009] MacPorts Only: Fall back on xcodebuild -sdk when
</span> xcrun --sdk is not supported
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+(cherry picked from commit c69389a9ad48948076d754f99b94fbf797ea01fd)
</span> ---
runtime/compiler-rt/Makefile | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git llvm_master/tools/clang/runtime/compiler-rt/Makefile macports_master/tools/clang/runtime/compiler-rt/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git llvm_release_36/tools/clang/runtime/compiler-rt/Makefile macports_release_36/tools/clang/runtime/compiler-rt/Makefile
</span> index f06ef99..b0946ba 100644
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- llvm_master/tools/clang/runtime/compiler-rt/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ macports_master/tools/clang/runtime/compiler-rt/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- llvm_release_36/tools/clang/runtime/compiler-rt/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macports_release_36/tools/clang/runtime/compiler-rt/Makefile
</span> @@ -81,8 +81,18 @@ RuntimeLibrary.darwin.Configs := \
profile_osx.a \
ubsan_osx.a
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,5 +36,5 @@ index f06ef99..b0946ba 100644
</span> ifneq ($(IOS_SDK)$(IOSSIM_SDK),)
RuntimeLibrary.darwin.Configs += ios.a profile_ios.a
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.2.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.10.1
</span>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-3.6/files/1003-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch b/lang/llvm-3.6/files/1003-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 2fe4a46..0e16cd4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-3.6/files/1003-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-3.6/files/1003-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,20 +1,21 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 95d6351d09e6ed8b288d0801ee9c8970477fdb57 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From de812842f6aefc661bf261574e4962295a753cb8 Mon Sep 17 00:00:00 2001
</span> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sat, 17 Jan 2015 17:55:27 -0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1003/1008] MacPorts Only: Fix name of scan-view executable
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1003/1009] MacPorts Only: Fix name of scan-view executable
</span> inside scan-build
http://trac.macports.org/ticket/35006
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+(cherry picked from commit cf37a2cc4435f757228e928f5fbfb6cadd1b2e21)
</span> ---
tools/scan-build/scan-build | 2 ++
1 file changed, 2 insertions(+)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git llvm_master/tools/clang/tools/scan-build/scan-build macports_master/tools/clang/tools/scan-build/scan-build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git llvm_release_36/tools/clang/tools/scan-build/scan-build macports_release_36/tools/clang/tools/scan-build/scan-build
</span> index d52d8f5..2a3d1db 100755
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- llvm_master/tools/clang/tools/scan-build/scan-build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ macports_master/tools/clang/tools/scan-build/scan-build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- llvm_release_36/tools/clang/tools/scan-build/scan-build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macports_release_36/tools/clang/tools/scan-build/scan-build
</span> @@ -1728,6 +1728,8 @@ if (defined $OutputFormat) {
Diag "Analysis run complete.\n";
Diag "Viewing analysis results in '$HtmlDir' using scan-view.\n";
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,5 +26,5 @@ index d52d8f5..2a3d1db 100755
</span> exec $ScanView, "$HtmlDir";
}
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.2.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.10.1
</span>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-3.6/files/1004-MacPorts-Only-Fix-libclang_rt-dylib-ids.patch b/lang/llvm-3.6/files/1004-MacPorts-Only-Fix-libclang_rt-dylib-ids.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 0d04653..ad6a2aa 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-3.6/files/1004-MacPorts-Only-Fix-libclang_rt-dylib-ids.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-3.6/files/1004-MacPorts-Only-Fix-libclang_rt-dylib-ids.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,19 +1,20 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 3459ae4f0909a6ab1fb5df79db042609b56a9231 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 11717e9dd54f3cce92faaf8a9a0397a422c15e01 Mon Sep 17 00:00:00 2001
</span> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sat, 17 Jan 2015 17:56:44 -0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1004/1008] MacPorts Only: Fix libclang_rt dylib ids
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1004/1009] MacPorts Only: Fix libclang_rt dylib ids
</span>
We should probably not be shipping these.
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+(cherry picked from commit 1e79aa1d2d652fe79c244c185eeff76c2e40caf2)
</span> ---
runtime/compiler-rt/Makefile | 1 +
1 file changed, 1 insertion(+)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git llvm_master/tools/clang/runtime/compiler-rt/Makefile macports_master/tools/clang/runtime/compiler-rt/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git llvm_release_36/tools/clang/runtime/compiler-rt/Makefile macports_release_36/tools/clang/runtime/compiler-rt/Makefile
</span> index b0946ba..5549038 100644
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- llvm_master/tools/clang/runtime/compiler-rt/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ macports_master/tools/clang/runtime/compiler-rt/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- llvm_release_36/tools/clang/runtime/compiler-rt/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macports_release_36/tools/clang/runtime/compiler-rt/Makefile
</span> @@ -244,6 +244,7 @@ $(PROJ_resources_lib)/$1/libclang_rt.%.dylib: \
$(ResourceLibDir)/$1/libclang_rt.%.dylib | $(PROJ_resources_lib)/$1
$(Echo) Installing compiler runtime library: $1/$$*
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,5 +24,5 @@ index b0946ba..5549038 100644
</span> # Rule to install runtime libraries.
RuntimeLibraryInstall.$1: \
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.2.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.10.1
</span>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-3.6/files/1005-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch b/lang/llvm-3.6/files/1005-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index d39804d..fe5666e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-3.6/files/1005-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-3.6/files/1005-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,19 +1,20 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 2984534bbb28860bef27168878a91cead3474cb3 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From e7a386e44c9e16f0371239dde18bff7379d5b194 Mon Sep 17 00:00:00 2001
</span> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sat, 17 Jan 2015 17:58:25 -0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1005/1008] MacPorts Only: Relocate clang resources using llvm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1005/1009] MacPorts Only: Relocate clang resources using llvm
</span> version
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+(cherry picked from commit 0111fcf6f32dfeb41ae0b1e9be0258b899d97200)
</span> ---
lib/Headers/Makefile | 3 ++-
runtime/compiler-rt/Makefile | 15 ++++++++++++++-
2 files changed, 16 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git llvm_master/tools/clang/lib/Headers/Makefile macports_master/tools/clang/lib/Headers/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git llvm_release_36/tools/clang/lib/Headers/Makefile macports_release_36/tools/clang/lib/Headers/Makefile
</span> index 903acac..7c37992 100644
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- llvm_master/tools/clang/lib/Headers/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ macports_master/tools/clang/lib/Headers/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- llvm_release_36/tools/clang/lib/Headers/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macports_release_36/tools/clang/lib/Headers/Makefile
</span> @@ -16,6 +16,7 @@ include $(CLANG_LEVEL)/Makefile
CLANG_VERSION := $(word 3,$(shell grep "CLANG_VERSION " \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,10 +32,10 @@ index 903acac..7c37992 100644
</span>
INSTHEADERS := $(addprefix $(PROJ_headers)/, $(HEADERS))
INSTHEADERS += $(PROJ_headers)/arm_neon.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git llvm_master/tools/clang/runtime/compiler-rt/Makefile macports_master/tools/clang/runtime/compiler-rt/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git llvm_release_36/tools/clang/runtime/compiler-rt/Makefile macports_release_36/tools/clang/runtime/compiler-rt/Makefile
</span> index 5549038..50f0a81 100644
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- llvm_master/tools/clang/runtime/compiler-rt/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ macports_master/tools/clang/runtime/compiler-rt/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- llvm_release_36/tools/clang/runtime/compiler-rt/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macports_release_36/tools/clang/runtime/compiler-rt/Makefile
</span> @@ -18,9 +18,10 @@ include $(CLANG_LEVEL)/Makefile
CLANG_VERSION := $(word 3,$(shell grep "CLANG_VERSION " \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,5 +71,5 @@ index 5549038..50f0a81 100644
</span>
endif
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.2.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.10.1
</span>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-3.6/files/1006-Default-to-ppc7400-for-OSX-10.5.patch b/lang/llvm-3.6/files/1006-Default-to-ppc7400-for-OSX-10.5.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 24621a4..27fdbcb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-3.6/files/1006-Default-to-ppc7400-for-OSX-10.5.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-3.6/files/1006-Default-to-ppc7400-for-OSX-10.5.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,16 +1,17 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 07ba2946e8edd7dd65126fa5108c14474a916f34 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 06fedc7f7464dd53af9bdfd7095a7dc36d5cc43c Mon Sep 17 00:00:00 2001
</span> From: Iain Sandoe <iain@codesourcery.com>
Date: Sun, 27 Jul 2014 20:35:16 +0100
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1006/1008] Default to ppc7400 for OSX 10.5+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1006/1009] Default to ppc7400 for OSX 10.5+
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+(cherry picked from commit 971aa68baad8c240f1abf30e62bd947a8923e3fa)
</span> ---
lib/Driver/Tools.cpp | 3 +++
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 db43fde..46956e7 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:#e0ffe0;'>+diff --git llvm_release_36/tools/clang/lib/Driver/Tools.cpp macports_release_36/tools/clang/lib/Driver/Tools.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index d625c0e..51f37b5 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- llvm_release_36/tools/clang/lib/Driver/Tools.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macports_release_36/tools/clang/lib/Driver/Tools.cpp
</span> @@ -1499,6 +1499,9 @@ static std::string getCPUName(const ArgList &Args, const llvm::Triple &T) {
TargetCPUName = "ppc64";
else if (T.getArch() == llvm::Triple::ppc64le)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,5 +23,5 @@ index db43fde..46956e7 100644
</span> TargetCPUName = "ppc";
}
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.2.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.10.1
</span>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-3.6/files/1007-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch b/lang/llvm-3.6/files/1007-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 4f087c4..85f984a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-3.6/files/1007-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-3.6/files/1007-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,20 +1,21 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From a98b6c303f44aa9f55c766aab1db65873a4e9c71 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From edb95a6a610e4780efb98365296dc5d2740e0f9c Mon Sep 17 00:00:00 2001
</span> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sat, 17 Jan 2015 19:08:57 -0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1007/1008] Only call setpriority(PRIO_DARWIN_THREAD, 0,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1007/1009] Only call setpriority(PRIO_DARWIN_THREAD, 0,
</span> PRIO_DARWIN_BG) if it is available
Tiger and earlier versions of darwin do not support this.
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+(cherry picked from commit 92a47c4641be0c3fbc0e660f5680b3d4d524887f)
</span> ---
tools/libclang/CIndex.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git llvm_master/tools/clang/tools/libclang/CIndex.cpp macports_master/tools/clang/tools/libclang/CIndex.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git llvm_release_36/tools/clang/tools/libclang/CIndex.cpp macports_release_36/tools/clang/tools/libclang/CIndex.cpp
</span> index 00ef8c0..6f124be 100644
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- llvm_master/tools/clang/tools/libclang/CIndex.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ macports_master/tools/clang/tools/libclang/CIndex.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- llvm_release_36/tools/clang/tools/libclang/CIndex.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macports_release_36/tools/clang/tools/libclang/CIndex.cpp
</span> @@ -7044,7 +7044,7 @@ void clang::setThreadBackgroundPriority() {
if (getenv("LIBCLANG_BGPRIO_DISABLE"))
return;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,5 +26,5 @@ index 00ef8c0..6f124be 100644
</span> #endif
}
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.2.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.10.1
</span>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-3.6/files/1008-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch b/lang/llvm-3.6/files/1008-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index fb54537..d47894c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-3.6/files/1008-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-3.6/files/1008-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,18 +1,19 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 4f54947c85c0b54d17577d5387d0b01068bb4f80 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 4d9fcb258c0c75f64ce9cb09c746367e0268006e Mon Sep 17 00:00:00 2001
</span> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Tue, 20 Jan 2015 00:09:16 -0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1008/1008] Default to fragile ObjC runtime when targeting
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1008/1009] Default to fragile ObjC runtime when targeting
</span> darwin/ppc
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+(cherry picked from commit 4f54947c85c0b54d17577d5387d0b01068bb4f80)
</span> ---
lib/Driver/ToolChains.h | 6 ++++--
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:#e0ffe0;'>+diff --git llvm_release_36/tools/clang/lib/Driver/ToolChains.h macports_release_36/tools/clang/lib/Driver/ToolChains.h
</span> index 47fb10d..80535f5 100644
<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:#e0ffe0;'>+--- llvm_release_36/tools/clang/lib/Driver/ToolChains.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macports_release_36/tools/clang/lib/Driver/ToolChains.h
</span> @@ -273,8 +273,10 @@ public:
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,5 +28,5 @@ index 47fb10d..80535f5 100644
</span>
bool UseObjCMixedDispatch() const override {
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.2.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.10.1
</span>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-3.6/files/1009-Fixup-libstdc-header-search-paths-for-older-versions.patch b/lang/llvm-3.6/files/1009-Fixup-libstdc-header-search-paths-for-older-versions.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..d512724
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-3.6/files/1009-Fixup-libstdc-header-search-paths-for-older-versions.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,42 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From af993af8ae8933736e2edbd83da4bfdae4da9f5e Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Mon, 31 Oct 2016 15:06:36 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1009/1009] Fixup libstdc++ header search paths for older
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ versions of Mac OS X
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+The subpaths were removed in Lion. Leopard and Snow Leopard had darwin8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+symlinks for compatibility.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://llvm.org/bugs/show_bug.cgi?id=30858
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+(cherry picked from commit e23e3e73fd7bc8e841725813d54df1ff5c0db88d)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lib/Frontend/InitHeaderSearch.cpp | 4 ++--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 2 insertions(+), 2 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git llvm_release_36/tools/clang/lib/Frontend/InitHeaderSearch.cpp macports_release_36/tools/clang/lib/Frontend/InitHeaderSearch.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index a518a0a..5ef35de 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- llvm_release_36/tools/clang/lib/Frontend/InitHeaderSearch.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macports_release_36/tools/clang/lib/Frontend/InitHeaderSearch.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -359,7 +359,7 @@ AddDefaultCPlusPlusIncludePaths(const llvm::Triple &triple, const HeaderSearchOp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "powerpc-apple-darwin10", "", "ppc64",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ triple);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.0.0",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "powerpc-apple-darwin10", "", "ppc64",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "powerpc-apple-darwin8", "", "ppc64",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ triple);
</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;'>+@@ -368,7 +368,7 @@ AddDefaultCPlusPlusIncludePaths(const llvm::Triple &triple, const HeaderSearchOp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.2.1",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "i686-apple-darwin10", "", "x86_64", triple);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.0.0",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "i686-apple-darwin8", "", "", triple);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case llvm::Triple::arm:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.10.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-3.7/Portfile b/lang/llvm-3.7/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a1c3cb3..d98f063 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-3.7/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-3.7/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +9,7 @@ set llvm_version 3.7
</span> set llvm_version_no_dot 37
name llvm-${llvm_version}
revision 4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-subport clang-${llvm_version} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport clang-${llvm_version} { revision 5 }
</span> set suffix mp-${llvm_version}
set sub_prefix ${prefix}/libexec/llvm-${llvm_version}
dist_subdir llvm
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -132,6 +132,7 @@ if {${subport} eq "clang-${llvm_version}"} {
</span> 1005-Default-to-ppc7400-for-OSX-10.5.patch \
1006-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch \
1007-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1008-Fixup-libstdc-header-search-paths-for-older-versions.patch \
</span> 2001-MacPorts-Only-Comment-out-SL-cctools-workaround.patch \
2002-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch \
2003-Fall-back-on-xcodebuild-sdk-when-xcrun-sdk-is-not-su.patch \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-3.7/files/1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch b/lang/llvm-3.7/files/1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 329d184..4aacfe5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-3.7/files/1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-3.7/files/1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span> From 034ac61d5081c0dce0b42f2e69d09c3ae12f0de8 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sat, 17 Jan 2015 17:50:24 -0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1001/1007] MacPorts Only: Prepare clang-format for replacement
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1001/1008] MacPorts Only: Prepare clang-format for replacement
</span> with absolute path
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -80,5 +80,5 @@ index 5cb41fc..e8a5904 100644
</span> binary = vim.eval('g:clang_format_path')
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.6.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.10.1
</span>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-3.7/files/1002-MacPorts-Only-Fall-back-on-xcodebuild-sdk-when-xcrun.patch b/lang/llvm-3.7/files/1002-MacPorts-Only-Fall-back-on-xcodebuild-sdk-when-xcrun.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 0058746..3fea2f8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-3.7/files/1002-MacPorts-Only-Fall-back-on-xcodebuild-sdk-when-xcrun.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-3.7/files/1002-MacPorts-Only-Fall-back-on-xcodebuild-sdk-when-xcrun.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span> From 1e29ab26da7f574ce29eeb949f5c46378968e0dd Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sat, 17 Jan 2015 17:51:10 -0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1002/1007] MacPorts Only: Fall back on xcodebuild -sdk when
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1002/1008] MacPorts Only: Fall back on xcodebuild -sdk when
</span> xcrun --sdk is not supported
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,5 +36,5 @@ index 9976438..fc43e72 100644
</span> ifneq ($(IOS_SDK)$(IOSSIM_SDK),)
RuntimeLibrary.darwin.Configs += ios.a profile_ios.a
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.6.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.10.1
</span>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-3.7/files/1003-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch b/lang/llvm-3.7/files/1003-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index e59eeca..ee75a4f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-3.7/files/1003-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-3.7/files/1003-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span> From 318d95a01c63460d78f224346f52d731f56d4671 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sat, 17 Jan 2015 17:55:27 -0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1003/1007] MacPorts Only: Fix name of scan-view executable
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1003/1008] MacPorts Only: Fix name of scan-view executable
</span> inside scan-build
http://trac.macports.org/ticket/35006
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,5 +25,5 @@ index d7cadc3..9fd4e2a 100755
</span> exec $ScanView, "$HtmlDir";
}
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.6.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.10.1
</span>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-3.7/files/1004-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch b/lang/llvm-3.7/files/1004-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 7beebc9..f71b857 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-3.7/files/1004-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-3.7/files/1004-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span> From e84a39c6a5f2c80cc76b10deb5d5e46a900d823c Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sat, 17 Jan 2015 17:58:25 -0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1004/1007] MacPorts Only: Relocate clang resources using llvm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1004/1008] MacPorts Only: Relocate clang resources using llvm
</span> version
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,5 +70,5 @@ index fc43e72..49a5b08 100644
</span>
endif
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.6.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.10.1
</span>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-3.7/files/1005-Default-to-ppc7400-for-OSX-10.5.patch b/lang/llvm-3.7/files/1005-Default-to-ppc7400-for-OSX-10.5.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 9c0a298..02fc078 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-3.7/files/1005-Default-to-ppc7400-for-OSX-10.5.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-3.7/files/1005-Default-to-ppc7400-for-OSX-10.5.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span> From a57f54ce05b13f4b1b1ff2323f7851354101dde0 Mon Sep 17 00:00:00 2001
From: Iain Sandoe <iain@codesourcery.com>
Date: Sun, 27 Jul 2014 20:35:16 +0100
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1005/1007] Default to ppc7400 for OSX 10.5+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1005/1008] Default to ppc7400 for OSX 10.5+
</span>
---
lib/Driver/Tools.cpp | 3 +++
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,5 +22,5 @@ index 19ebbb9..1d46d50 100644
</span> TargetCPUName = "ppc";
}
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.6.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.10.1
</span>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-3.7/files/1006-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch b/lang/llvm-3.7/files/1006-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 7f5e1c4..7c94c62 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-3.7/files/1006-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-3.7/files/1006-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span> From bbf0a25518afce71036613356ca039b2960a942a Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sat, 17 Jan 2015 19:08:57 -0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1006/1007] Only call setpriority(PRIO_DARWIN_THREAD, 0,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1006/1008] Only call setpriority(PRIO_DARWIN_THREAD, 0,
</span> PRIO_DARWIN_BG) if it is available
Tiger and earlier versions of darwin do not support this.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,5 +25,5 @@ index 8225a6c..c59a44f 100644
</span> #endif
}
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.6.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.10.1
</span>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-3.7/files/1007-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch b/lang/llvm-3.7/files/1007-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 598ccf5..4566580 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-3.7/files/1007-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-3.7/files/1007-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span> From d87ffa679c996f8782b8c6abb20a2064b60dc2c4 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Tue, 20 Jan 2015 00:09:16 -0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1007/1007] Default to fragile ObjC runtime when targeting
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1007/1008] Default to fragile ObjC runtime when targeting
</span> darwin/ppc
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,5 +28,5 @@ index 59eaade..03585e6 100644
</span>
bool UseObjCMixedDispatch() const override { return true; }
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.6.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.10.1
</span>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-3.7/files/1008-Fixup-libstdc-header-search-paths-for-older-versions.patch b/lang/llvm-3.7/files/1008-Fixup-libstdc-header-search-paths-for-older-versions.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..a7a9931
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-3.7/files/1008-Fixup-libstdc-header-search-paths-for-older-versions.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,42 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From f3f88020a301663048559b8245174f08650dff9c Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Mon, 31 Oct 2016 15:06:36 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1008/1008] Fixup libstdc++ header search paths for older
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ versions of Mac OS X
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+The subpaths were removed in Lion. Leopard and Snow Leopard had darwin8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+symlinks for compatibility.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://llvm.org/bugs/show_bug.cgi?id=30858
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+(cherry picked from commit e23e3e73fd7bc8e841725813d54df1ff5c0db88d)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lib/Frontend/InitHeaderSearch.cpp | 4 ++--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 2 insertions(+), 2 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git llvm_release_37/tools/clang/lib/Frontend/InitHeaderSearch.cpp macports_release_37/tools/clang/lib/Frontend/InitHeaderSearch.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index e3a17c9..e08e615 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- llvm_release_37/tools/clang/lib/Frontend/InitHeaderSearch.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macports_release_37/tools/clang/lib/Frontend/InitHeaderSearch.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -341,7 +341,7 @@ AddDefaultCPlusPlusIncludePaths(const llvm::Triple &triple, const HeaderSearchOp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "powerpc-apple-darwin10", "", "ppc64",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ triple);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.0.0",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "powerpc-apple-darwin10", "", "ppc64",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "powerpc-apple-darwin8", "", "ppc64",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ triple);
</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;'>+@@ -350,7 +350,7 @@ AddDefaultCPlusPlusIncludePaths(const llvm::Triple &triple, const HeaderSearchOp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.2.1",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "i686-apple-darwin10", "", "x86_64", triple);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.0.0",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "i686-apple-darwin8", "", "", triple);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case llvm::Triple::arm:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.10.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-3.8/Portfile b/lang/llvm-3.8/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a267560..2222003 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-3.8/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-3.8/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,7 +13,7 @@ set llvm_version 3.8
</span> set llvm_version_no_dot 38
name llvm-${llvm_version}
revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-subport clang-${llvm_version} { revision 3 }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport clang-${llvm_version} { revision 4 }
</span> set suffix mp-${llvm_version}
set sub_prefix ${prefix}/libexec/llvm-${llvm_version}
dist_subdir llvm
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -133,6 +133,7 @@ if {${subport} eq "clang-${llvm_version}"} {
</span> 1005-Default-to-ppc7400-for-OSX-10.5.patch \
1006-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch \
1007-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1008-Fixup-libstdc-header-search-paths-for-older-versions.patch \
</span> 2001-MacPorts-Only-Comment-out-SL-cctools-workaround.patch \
2002-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch \
2003-Fall-back-on-xcodebuild-sdk-when-xcrun-sdk-is-not-su.patch \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-3.8/files/1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch b/lang/llvm-3.8/files/1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index b7b1427..3ae6398 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-3.8/files/1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-3.8/files/1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 7dbc94035eaddc6140e9d868bca254288e101078 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From cf598f011d9ffc0293822a4c60bac67a6a148137 Mon Sep 17 00:00:00 2001
</span> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sat, 17 Jan 2015 17:50:24 -0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1001/1007] MacPorts Only: Prepare clang-format for replacement
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1001/1008] MacPorts Only: Prepare clang-format for replacement
</span> with absolute path
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,10 +13,10 @@ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span> tools/clang-format/clang-format.py | 2 +-
5 files changed, 5 insertions(+), 6 deletions(-)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git llvm_master/tools/clang/tools/clang-format/clang-format-bbedit.applescript macports_master/tools/clang/tools/clang-format/clang-format-bbedit.applescript
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git llvm_release_38/tools/clang/tools/clang-format/clang-format-bbedit.applescript macports_release_38/tools/clang/tools/clang-format/clang-format-bbedit.applescript
</span> index fa88fe9..eb09448 100644
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- llvm_master/tools/clang/tools/clang-format/clang-format-bbedit.applescript
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ macports_master/tools/clang/tools/clang-format/clang-format-bbedit.applescript
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- llvm_release_38/tools/clang/tools/clang-format/clang-format-bbedit.applescript
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macports_release_38/tools/clang/tools/clang-format/clang-format-bbedit.applescript
</span> @@ -15,7 +15,7 @@ tell application "BBEdit"
end tell
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,10 +26,10 @@ index fa88fe9..eb09448 100644
</span>
tell application "BBEdit"
-- "set contents of text document 1 to newContents" scrolls to the bottom while
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git llvm_master/tools/clang/tools/clang-format/clang-format-diff.py macports_master/tools/clang/tools/clang-format/clang-format-diff.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git llvm_release_38/tools/clang/tools/clang-format/clang-format-diff.py macports_release_38/tools/clang/tools/clang-format/clang-format-diff.py
</span> index 9e02bb0..b62bef3 100755
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- llvm_master/tools/clang/tools/clang-format/clang-format-diff.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ macports_master/tools/clang/tools/clang-format/clang-format-diff.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- llvm_release_38/tools/clang/tools/clang-format/clang-format-diff.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macports_release_38/tools/clang/tools/clang-format/clang-format-diff.py
</span> @@ -32,7 +32,7 @@ import sys
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,10 +39,10 @@ index 9e02bb0..b62bef3 100755
</span>
def main():
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git llvm_master/tools/clang/tools/clang-format/clang-format-sublime.py macports_master/tools/clang/tools/clang-format/clang-format-sublime.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git llvm_release_38/tools/clang/tools/clang-format/clang-format-sublime.py macports_release_38/tools/clang/tools/clang-format/clang-format-sublime.py
</span> index 16ff56e..4b68104 100644
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- llvm_master/tools/clang/tools/clang-format/clang-format-sublime.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ macports_master/tools/clang/tools/clang-format/clang-format-sublime.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- llvm_release_38/tools/clang/tools/clang-format/clang-format-sublime.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macports_release_38/tools/clang/tools/clang-format/clang-format-sublime.py
</span> @@ -18,7 +18,7 @@ import sublime_plugin
import subprocess
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,10 +52,10 @@ index 16ff56e..4b68104 100644
</span>
# Change this to format according to other formatting styles. See the output of
# 'clang-format --help' for a list of supported styles. The default looks for
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git llvm_master/tools/clang/tools/clang-format/clang-format.el macports_master/tools/clang/tools/clang-format/clang-format.el
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git llvm_release_38/tools/clang/tools/clang-format/clang-format.el macports_release_38/tools/clang/tools/clang-format/clang-format.el
</span> index ca46144..1c49835 100644
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- llvm_master/tools/clang/tools/clang-format/clang-format.el
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ macports_master/tools/clang/tools/clang-format/clang-format.el
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- llvm_release_38/tools/clang/tools/clang-format/clang-format.el
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macports_release_38/tools/clang/tools/clang-format/clang-format.el
</span> @@ -36,8 +36,7 @@
:group 'tools)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -66,10 +66,10 @@ index ca46144..1c49835 100644
</span> "Location of the clang-format executable.
A string containing the name or the full path of the executable."
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git llvm_master/tools/clang/tools/clang-format/clang-format.py macports_master/tools/clang/tools/clang-format/clang-format.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git llvm_release_38/tools/clang/tools/clang-format/clang-format.py macports_release_38/tools/clang/tools/clang-format/clang-format.py
</span> index 5cb41fc..e8a5904 100644
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- llvm_master/tools/clang/tools/clang-format/clang-format.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ macports_master/tools/clang/tools/clang-format/clang-format.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- llvm_release_38/tools/clang/tools/clang-format/clang-format.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macports_release_38/tools/clang/tools/clang-format/clang-format.py
</span> @@ -34,7 +34,7 @@ import vim
# set g:clang_format_path to the path to clang-format if it is not on the path
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -80,5 +80,5 @@ index 5cb41fc..e8a5904 100644
</span> binary = vim.eval('g:clang_format_path')
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.6.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.10.1
</span>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-3.8/files/1002-MacPorts-Only-Fall-back-on-xcodebuild-sdk-when-xcrun.patch b/lang/llvm-3.8/files/1002-MacPorts-Only-Fall-back-on-xcodebuild-sdk-when-xcrun.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 9ea6526..f8092c6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-3.8/files/1002-MacPorts-Only-Fall-back-on-xcodebuild-sdk-when-xcrun.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-3.8/files/1002-MacPorts-Only-Fall-back-on-xcodebuild-sdk-when-xcrun.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 6327a2a1206a17c82391beb82a528e685b2d7cac Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 18e3e2062b7e6f57e50114c2e072a5a7481c63fb Mon Sep 17 00:00:00 2001
</span> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sat, 17 Jan 2015 17:51:10 -0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1002/1007] MacPorts Only: Fall back on xcodebuild -sdk when
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1002/1008] MacPorts Only: Fall back on xcodebuild -sdk when
</span> xcrun --sdk is not supported
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,10 +9,10 @@ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span> runtime/compiler-rt/Makefile | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git llvm_master/tools/clang/runtime/compiler-rt/Makefile macports_master/tools/clang/runtime/compiler-rt/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git llvm_release_38/tools/clang/runtime/compiler-rt/Makefile macports_release_38/tools/clang/runtime/compiler-rt/Makefile
</span> index 55642a6..b6106d1 100644
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- llvm_master/tools/clang/runtime/compiler-rt/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ macports_master/tools/clang/runtime/compiler-rt/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- llvm_release_38/tools/clang/runtime/compiler-rt/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macports_release_38/tools/clang/runtime/compiler-rt/Makefile
</span> @@ -81,8 +81,18 @@ RuntimeLibrary.darwin.Configs := \
profile_osx.a \
ubsan_osx_dynamic.dylib
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,5 +35,5 @@ index 55642a6..b6106d1 100644
</span> ifneq ($(IOS_SDK)$(IOSSIM_SDK),)
RuntimeLibrary.darwin.Configs += ios.a profile_ios.a
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.6.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.10.1
</span>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-3.8/files/1003-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch b/lang/llvm-3.8/files/1003-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index f4fa642..16ba367 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-3.8/files/1003-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-3.8/files/1003-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 2a763d1dca2bf4967aef146bf75f3fea72820b0d Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 65b2b01f52eb96a7a52058c6549059d004ad2c1b Mon Sep 17 00:00:00 2001
</span> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sat, 17 Jan 2015 17:55:27 -0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1003/1007] MacPorts Only: Fix name of scan-view executable
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1003/1008] MacPorts Only: Fix name of scan-view executable
</span> inside scan-build
http://trac.macports.org/ticket/35006
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,10 +11,10 @@ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span> tools/scan-build/bin/scan-build | 2 ++
1 file changed, 2 insertions(+)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git llvm_master/tools/clang/tools/scan-build/bin/scan-build macports_master/tools/clang/tools/scan-build/bin/scan-build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git llvm_release_38/tools/clang/tools/scan-build/bin/scan-build macports_release_38/tools/clang/tools/scan-build/bin/scan-build
</span> index 6a14484..319305f 100755
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- llvm_master/tools/clang/tools/scan-build/bin/scan-build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ macports_master/tools/clang/tools/scan-build/bin/scan-build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- llvm_release_38/tools/clang/tools/scan-build/bin/scan-build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macports_release_38/tools/clang/tools/scan-build/bin/scan-build
</span> @@ -1817,6 +1817,8 @@ if (defined $Options{OutputFormat}) {
Diag "Analysis run complete.\n";
Diag "Viewing analysis results in '$Options{OutputDir}' using scan-view.\n";
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,5 +25,5 @@ index 6a14484..319305f 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.6.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.10.1
</span>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-3.8/files/1004-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch b/lang/llvm-3.8/files/1004-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index f2785b4..00402b4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-3.8/files/1004-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-3.8/files/1004-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.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 0584af98c60ffbf7f9495d5e917647407b3bcd5d Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 81a73ca5b6c907a1bdf8f59a8530cff360c55392 Mon Sep 17 00:00:00 2001
</span> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sat, 17 Jan 2015 17:58:25 -0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1004/1007] MacPorts Only: Relocate clang resources using llvm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1004/1008] MacPorts Only: Relocate clang resources using llvm
</span> version
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,10 +10,10 @@ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span> runtime/compiler-rt/Makefile | 15 ++++++++++++++-
2 files changed, 16 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git llvm_master/tools/clang/lib/Headers/Makefile macports_master/tools/clang/lib/Headers/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git llvm_release_38/tools/clang/lib/Headers/Makefile macports_release_38/tools/clang/lib/Headers/Makefile
</span> index 903acac..7c37992 100644
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- llvm_master/tools/clang/lib/Headers/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ macports_master/tools/clang/lib/Headers/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- llvm_release_38/tools/clang/lib/Headers/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macports_release_38/tools/clang/lib/Headers/Makefile
</span> @@ -16,6 +16,7 @@ include $(CLANG_LEVEL)/Makefile
CLANG_VERSION := $(word 3,$(shell grep "CLANG_VERSION " \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,10 +31,10 @@ index 903acac..7c37992 100644
</span>
INSTHEADERS := $(addprefix $(PROJ_headers)/, $(HEADERS))
INSTHEADERS += $(PROJ_headers)/arm_neon.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git llvm_master/tools/clang/runtime/compiler-rt/Makefile macports_master/tools/clang/runtime/compiler-rt/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git llvm_release_38/tools/clang/runtime/compiler-rt/Makefile macports_release_38/tools/clang/runtime/compiler-rt/Makefile
</span> index b6106d1..2ce50d9 100644
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- llvm_master/tools/clang/runtime/compiler-rt/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ macports_master/tools/clang/runtime/compiler-rt/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- llvm_release_38/tools/clang/runtime/compiler-rt/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macports_release_38/tools/clang/runtime/compiler-rt/Makefile
</span> @@ -18,9 +18,10 @@ include $(CLANG_LEVEL)/Makefile
CLANG_VERSION := $(word 3,$(shell grep "CLANG_VERSION " \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,5 +70,5 @@ index b6106d1..2ce50d9 100644
</span>
endif
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.6.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.10.1
</span>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-3.8/files/1005-Default-to-ppc7400-for-OSX-10.5.patch b/lang/llvm-3.8/files/1005-Default-to-ppc7400-for-OSX-10.5.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 34cda4a..abec12e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-3.8/files/1005-Default-to-ppc7400-for-OSX-10.5.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-3.8/files/1005-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 f787fe18be52154ebf95db36df01192f2f779733 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From e3afd910d3a02abe9d87911464a16bd67a8fdbbd Mon Sep 17 00:00:00 2001
</span> From: Iain Sandoe <iain@codesourcery.com>
Date: Sun, 27 Jul 2014 20:35:16 +0100
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1005/1007] Default to ppc7400 for OSX 10.5+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1005/1008] Default to ppc7400 for OSX 10.5+
</span>
---
lib/Driver/Tools.cpp | 3 +++
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 3bd2ffb..76cc5a0 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;'>-@@ -1700,6 +1700,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_release_38/tools/clang/lib/Driver/Tools.cpp macports_release_38/tools/clang/lib/Driver/Tools.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index b39d117..9e8e58e 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- llvm_release_38/tools/clang/lib/Driver/Tools.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macports_release_38/tools/clang/lib/Driver/Tools.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1750,6 +1750,9 @@ static std::string 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 3bd2ffb..76cc5a0 100644
</span> TargetCPUName = "ppc";
}
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.6.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.10.1
</span>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-3.8/files/1006-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch b/lang/llvm-3.8/files/1006-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index f860a70..8cd4dff 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-3.8/files/1006-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-3.8/files/1006-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.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 dd396124cc450c06fb7a34df4184375a7785ef98 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 94b5f22d15cdc9c343f46a7447cfaddb9b2bcb26 Mon Sep 17 00:00:00 2001
</span> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sat, 17 Jan 2015 19:08:57 -0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1006/1007] Only call setpriority(PRIO_DARWIN_THREAD, 0,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1006/1008] Only call setpriority(PRIO_DARWIN_THREAD, 0,
</span> PRIO_DARWIN_BG) if it is available
Tiger and earlier versions of darwin do not support this.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,11 +11,11 @@ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span> tools/libclang/CIndex.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git llvm_master/tools/clang/tools/libclang/CIndex.cpp macports_master/tools/clang/tools/libclang/CIndex.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 589e39e..c10ce43 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- llvm_master/tools/clang/tools/libclang/CIndex.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ macports_master/tools/clang/tools/libclang/CIndex.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7321,7 +7321,7 @@ void clang::setThreadBackgroundPriority() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git llvm_release_38/tools/clang/tools/libclang/CIndex.cpp macports_release_38/tools/clang/tools/libclang/CIndex.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 9086c60..eac0e0b 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- llvm_release_38/tools/clang/tools/libclang/CIndex.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macports_release_38/tools/clang/tools/libclang/CIndex.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7387,7 +7387,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 589e39e..c10ce43 100644
</span> #endif
}
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.6.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.10.1
</span>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-3.8/files/1007-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch b/lang/llvm-3.8/files/1007-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index a92383c..0617da7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-3.8/files/1007-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-3.8/files/1007-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 6ebfe70568d76cf4bb4c42cca2d22d66c04a310b Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From aa61959d209057e08a9e64a71e5635cc589ab3bf Mon Sep 17 00:00:00 2001
</span> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Tue, 20 Jan 2015 00:09:16 -0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1007/1007] Default to fragile ObjC runtime when targeting
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1007/1008] Default to fragile ObjC runtime when targeting
</span> darwin/ppc
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,10 +9,10 @@ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span> lib/Driver/ToolChains.h | 6 ++++--
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 fc656af..f9ac275 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:#e0ffe0;'>+diff --git llvm_release_38/tools/clang/lib/Driver/ToolChains.h macports_release_38/tools/clang/lib/Driver/ToolChains.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index f940e58..24823f0 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- llvm_release_38/tools/clang/lib/Driver/ToolChains.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macports_release_38/tools/clang/lib/Driver/ToolChains.h
</span> @@ -321,8 +321,10 @@ public:
bool IsEncodeExtendedBlockSignatureDefault() const override { return true; }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,5 +27,5 @@ index fc656af..f9ac275 100644
</span>
bool UseObjCMixedDispatch() const override { return true; }
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.6.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.10.1
</span>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-3.8/files/1008-Fixup-libstdc-header-search-paths-for-older-versions.patch b/lang/llvm-3.8/files/1008-Fixup-libstdc-header-search-paths-for-older-versions.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..56b1640
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-3.8/files/1008-Fixup-libstdc-header-search-paths-for-older-versions.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,42 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From d228d741f56c95fb0b7d65df814c7b520faaf3aa Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Mon, 31 Oct 2016 15:06:36 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1008/1008] Fixup libstdc++ header search paths for older
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ versions of Mac OS X
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+The subpaths were removed in Lion. Leopard and Snow Leopard had darwin8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+symlinks for compatibility.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://llvm.org/bugs/show_bug.cgi?id=30858
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+(cherry picked from commit e23e3e73fd7bc8e841725813d54df1ff5c0db88d)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lib/Frontend/InitHeaderSearch.cpp | 4 ++--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 2 insertions(+), 2 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git llvm_release_38/tools/clang/lib/Frontend/InitHeaderSearch.cpp macports_release_38/tools/clang/lib/Frontend/InitHeaderSearch.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 26bab0d..e49e058 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- llvm_release_38/tools/clang/lib/Frontend/InitHeaderSearch.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macports_release_38/tools/clang/lib/Frontend/InitHeaderSearch.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -365,7 +365,7 @@ AddDefaultCPlusPlusIncludePaths(const llvm::Triple &triple, const HeaderSearchOp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "powerpc-apple-darwin10", "", "ppc64",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ triple);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.0.0",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "powerpc-apple-darwin10", "", "ppc64",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "powerpc-apple-darwin8", "", "ppc64",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ triple);
</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;'>+@@ -374,7 +374,7 @@ AddDefaultCPlusPlusIncludePaths(const llvm::Triple &triple, const HeaderSearchOp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.2.1",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "i686-apple-darwin10", "", "x86_64", triple);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.0.0",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "i686-apple-darwin8", "", "", triple);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case llvm::Triple::arm:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.10.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-3.9/Portfile b/lang/llvm-3.9/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7e2b238..08720cd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-3.9/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-3.9/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,7 +13,7 @@ set llvm_version 3.9
</span> set llvm_version_no_dot 39
name llvm-${llvm_version}
revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-subport clang-${llvm_version} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport clang-${llvm_version} { revision 1 }
</span> set suffix mp-${llvm_version}
set sub_prefix ${prefix}/libexec/llvm-${llvm_version}
dist_subdir llvm
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -125,6 +125,7 @@ if {${subport} eq "clang-${llvm_version}"} {
</span> 1003-Default-to-ppc7400-for-OSX-10.5.patch \
1004-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch \
1005-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1006-Fixup-libstdc-header-search-paths-for-older-versions.patch \
</span> 2001-MacPorts-Only-Comment-out-SL-cctools-workaround.patch \
2002-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch \
2003-Fall-back-on-xcodebuild-sdk-when-xcrun-sdk-is-not-su.patch \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-3.9/files/1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch b/lang/llvm-3.9/files/1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 168a7b3..d449e24 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-3.9/files/1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-3.9/files/1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +1,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From ab5dbc40e2dc4220e0ba1e88a106266e9ba10f8b Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From c179b9e70f848f59e3d627295217b2c5757bc0fe Mon Sep 17 00:00:00 2001
</span> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sat, 17 Jan 2015 17:50:24 -0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1001/1005] MacPorts Only: Prepare clang-format for replacement
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1001/1006] MacPorts Only: Prepare clang-format for replacement
</span> with absolute path
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+(cherry picked from commit c2e4c94075b60482bb43eedbbef6e26238dec9c8)
</span> ---
tools/clang-format/clang-format-bbedit.applescript | 2 +-
tools/clang-format/clang-format-diff.py | 2 +-
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,10 +14,10 @@ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span> tools/clang-format/clang-format.py | 2 +-
5 files changed, 5 insertions(+), 6 deletions(-)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git llvm_master/tools/clang/tools/clang-format/clang-format-bbedit.applescript macports_master/tools/clang/tools/clang-format/clang-format-bbedit.applescript
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git llvm_release_39/tools/clang/tools/clang-format/clang-format-bbedit.applescript macports_release_39/tools/clang/tools/clang-format/clang-format-bbedit.applescript
</span> index fa88fe9..eb09448 100644
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- llvm_master/tools/clang/tools/clang-format/clang-format-bbedit.applescript
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ macports_master/tools/clang/tools/clang-format/clang-format-bbedit.applescript
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- llvm_release_39/tools/clang/tools/clang-format/clang-format-bbedit.applescript
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macports_release_39/tools/clang/tools/clang-format/clang-format-bbedit.applescript
</span> @@ -15,7 +15,7 @@ tell application "BBEdit"
end tell
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,10 +27,10 @@ index fa88fe9..eb09448 100644
</span>
tell application "BBEdit"
-- "set contents of text document 1 to newContents" scrolls to the bottom while
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git llvm_master/tools/clang/tools/clang-format/clang-format-diff.py macports_master/tools/clang/tools/clang-format/clang-format-diff.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git llvm_release_39/tools/clang/tools/clang-format/clang-format-diff.py macports_release_39/tools/clang/tools/clang-format/clang-format-diff.py
</span> index 5e728f5..b23c3c8 100755
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- llvm_master/tools/clang/tools/clang-format/clang-format-diff.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ macports_master/tools/clang/tools/clang-format/clang-format-diff.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- llvm_release_39/tools/clang/tools/clang-format/clang-format-diff.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macports_release_39/tools/clang/tools/clang-format/clang-format-diff.py
</span> @@ -55,7 +55,7 @@ def main():
parser.add_argument('-style',
help='formatting style to apply (LLVM, Google, Chromium, '
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,10 +40,10 @@ index 5e728f5..b23c3c8 100755
</span> help='location of binary to use for clang-format')
args = parser.parse_args()
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git llvm_master/tools/clang/tools/clang-format/clang-format-sublime.py macports_master/tools/clang/tools/clang-format/clang-format-sublime.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git llvm_release_39/tools/clang/tools/clang-format/clang-format-sublime.py macports_release_39/tools/clang/tools/clang-format/clang-format-sublime.py
</span> index 16ff56e..4b68104 100644
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- llvm_master/tools/clang/tools/clang-format/clang-format-sublime.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ macports_master/tools/clang/tools/clang-format/clang-format-sublime.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- llvm_release_39/tools/clang/tools/clang-format/clang-format-sublime.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macports_release_39/tools/clang/tools/clang-format/clang-format-sublime.py
</span> @@ -18,7 +18,7 @@ import sublime_plugin
import subprocess
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,10 +53,10 @@ index 16ff56e..4b68104 100644
</span>
# Change this to format according to other formatting styles. See the output of
# 'clang-format --help' for a list of supported styles. The default looks for
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git llvm_master/tools/clang/tools/clang-format/clang-format.el macports_master/tools/clang/tools/clang-format/clang-format.el
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git llvm_release_39/tools/clang/tools/clang-format/clang-format.el macports_release_39/tools/clang/tools/clang-format/clang-format.el
</span> index ca46144..1c49835 100644
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- llvm_master/tools/clang/tools/clang-format/clang-format.el
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ macports_master/tools/clang/tools/clang-format/clang-format.el
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- llvm_release_39/tools/clang/tools/clang-format/clang-format.el
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macports_release_39/tools/clang/tools/clang-format/clang-format.el
</span> @@ -36,8 +36,7 @@
:group 'tools)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -66,10 +67,10 @@ index ca46144..1c49835 100644
</span> "Location of the clang-format executable.
A string containing the name or the full path of the executable."
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git llvm_master/tools/clang/tools/clang-format/clang-format.py macports_master/tools/clang/tools/clang-format/clang-format.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git llvm_release_39/tools/clang/tools/clang-format/clang-format.py macports_release_39/tools/clang/tools/clang-format/clang-format.py
</span> index 5cb41fc..e8a5904 100644
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- llvm_master/tools/clang/tools/clang-format/clang-format.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ macports_master/tools/clang/tools/clang-format/clang-format.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- llvm_release_39/tools/clang/tools/clang-format/clang-format.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macports_release_39/tools/clang/tools/clang-format/clang-format.py
</span> @@ -34,7 +34,7 @@ import vim
# set g:clang_format_path to the path to clang-format if it is not on the path
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -80,5 +81,5 @@ index 5cb41fc..e8a5904 100644
</span> binary = vim.eval('g:clang_format_path')
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.7.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.10.1
</span>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-3.9/files/1002-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch b/lang/llvm-3.9/files/1002-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index c476353..301a02a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-3.9/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-3.9/files/1002-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,21 +1,22 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From f251a1bd711d637013a19dddb23bc0e7ab6ef685 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From cbbcd15cd28f9ee512b5d3ac646ee46861fb8888 Mon Sep 17 00:00:00 2001
</span> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sat, 17 Jan 2015 17:55:27 -0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1002/1005] MacPorts Only: Fix name of scan-view executable
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1002/1006] MacPorts Only: Fix name of scan-view executable
</span> inside scan-build
http://trac.macports.org/ticket/35006
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+(cherry picked from commit 57af0aa8eb9a943b15475f7c71127f20dd7f6fa6)
</span> ---
tools/scan-build/bin/scan-build | 2 ++
1 file changed, 2 insertions(+)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git llvm_master/tools/clang/tools/scan-build/bin/scan-build macports_master/tools/clang/tools/scan-build/bin/scan-build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 6a14484..319305f 100755
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- llvm_master/tools/clang/tools/scan-build/bin/scan-build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ macports_master/tools/clang/tools/scan-build/bin/scan-build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1817,6 +1817,8 @@ if (defined $Options{OutputFormat}) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git llvm_release_39/tools/clang/tools/scan-build/bin/scan-build macports_release_39/tools/clang/tools/scan-build/bin/scan-build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 3182a29..ad951fe 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- llvm_release_39/tools/clang/tools/scan-build/bin/scan-build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macports_release_39/tools/clang/tools/scan-build/bin/scan-build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1831,6 +1831,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 +26,5 @@ index 6a14484..319305f 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.7.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.10.1
</span>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-3.9/files/1003-Default-to-ppc7400-for-OSX-10.5.patch b/lang/llvm-3.9/files/1003-Default-to-ppc7400-for-OSX-10.5.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 55423cd..610e1eb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-3.9/files/1003-Default-to-ppc7400-for-OSX-10.5.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-3.9/files/1003-Default-to-ppc7400-for-OSX-10.5.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,17 +1,18 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 2bf8502dda4a3ec979b15644513b31c0547959b7 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From a973788a3d76a03feffc8c3e3432b8cb1e331bb7 Mon Sep 17 00:00:00 2001
</span> From: Iain Sandoe <iain@codesourcery.com>
Date: Sun, 27 Jul 2014 20:35:16 +0100
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1003/1005] Default to ppc7400 for OSX 10.5+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1003/1006] Default to ppc7400 for OSX 10.5+
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+(cherry picked from commit 5662f0184c9e491e7df297feff4de37a678a0a4e)
</span> ---
lib/Driver/Tools.cpp | 3 +++
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 2819ab3..e7d5a0c 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;'>-@@ -1751,6 +1751,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_release_39/tools/clang/lib/Driver/Tools.cpp macports_release_39/tools/clang/lib/Driver/Tools.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 31d4360..95f24e7 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- llvm_release_39/tools/clang/lib/Driver/Tools.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macports_release_39/tools/clang/lib/Driver/Tools.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1970,6 +1970,9 @@ static std::string 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 +23,5 @@ index 2819ab3..e7d5a0c 100644
</span> TargetCPUName = "ppc";
}
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.7.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.10.1
</span>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-3.9/files/1004-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch b/lang/llvm-3.9/files/1004-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 136b084..77582e5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-3.9/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-3.9/files/1004-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,21 +1,22 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From b81b30b857fbd33e4788688e4a157b37b0538947 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From e8a5464b0f767cfd2d0f5b8c8dae0d874d0c591d Mon Sep 17 00:00:00 2001
</span> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sat, 17 Jan 2015 19:08:57 -0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1004/1005] Only call setpriority(PRIO_DARWIN_THREAD, 0,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1004/1006] Only call setpriority(PRIO_DARWIN_THREAD, 0,
</span> PRIO_DARWIN_BG) if it is available
Tiger and earlier versions of darwin do not support this.
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+(cherry picked from commit a186e40307ffb706d39353bfc285c12d242e26ee)
</span> ---
tools/libclang/CIndex.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git llvm_master/tools/clang/tools/libclang/CIndex.cpp macports_master/tools/clang/tools/libclang/CIndex.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index b2a9ab8..98b50ce 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- llvm_master/tools/clang/tools/libclang/CIndex.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ macports_master/tools/clang/tools/libclang/CIndex.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7744,7 +7744,7 @@ void clang::setThreadBackgroundPriority() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git llvm_release_39/tools/clang/tools/libclang/CIndex.cpp macports_release_39/tools/clang/tools/libclang/CIndex.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 027bf95..8081753 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- llvm_release_39/tools/clang/tools/libclang/CIndex.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macports_release_39/tools/clang/tools/libclang/CIndex.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7806,7 +7806,7 @@ void clang::setThreadBackgroundPriority() {
</span> if (getenv("LIBCLANG_BGPRIO_DISABLE"))
return;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,5 +26,5 @@ index b2a9ab8..98b50ce 100644
</span> #endif
}
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.7.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.10.1
</span>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-3.9/files/1005-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch b/lang/llvm-3.9/files/1005-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index c90334e..5da29f9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-3.9/files/1005-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-3.9/files/1005-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,19 +1,20 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From e0bb397409adb1a6146dd5c1e044e0614070920e Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From f57523fb1a06989ef52d0eb4b96a4d724cb826ae Mon Sep 17 00:00:00 2001
</span> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Tue, 20 Jan 2015 00:09:16 -0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1005/1005] Default to fragile ObjC runtime when targeting
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1005/1006] Default to fragile ObjC runtime when targeting
</span> darwin/ppc
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+(cherry picked from commit 064b0fdeac73b72471b56cde85381356032d5d92)
</span> ---
lib/Driver/ToolChains.h | 6 ++++--
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 a5f5473..4f53d95 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;'>-@@ -324,8 +324,10 @@ public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git llvm_release_39/tools/clang/lib/Driver/ToolChains.h macports_release_39/tools/clang/lib/Driver/ToolChains.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 369712f..99d82ee 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- llvm_release_39/tools/clang/lib/Driver/ToolChains.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macports_release_39/tools/clang/lib/Driver/ToolChains.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -339,8 +339,10 @@ public:
</span> bool IsEncodeExtendedBlockSignatureDefault() const override { return true; }
bool IsObjCNonFragileABIDefault() const override {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,5 +28,5 @@ index a5f5473..4f53d95 100644
</span>
bool UseObjCMixedDispatch() const override { return true; }
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.7.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.10.1
</span>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-3.9/files/1006-Fixup-libstdc-header-search-paths-for-older-versions.patch b/lang/llvm-3.9/files/1006-Fixup-libstdc-header-search-paths-for-older-versions.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..1653d16
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-3.9/files/1006-Fixup-libstdc-header-search-paths-for-older-versions.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,42 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 3a1da1f9c088e6fffc792cb073b7046ae6d646d0 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Mon, 31 Oct 2016 15:06:36 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1006/1006] Fixup libstdc++ header search paths for older
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ versions of Mac OS X
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+The subpaths were removed in Lion. Leopard and Snow Leopard had darwin8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+symlinks for compatibility.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://llvm.org/bugs/show_bug.cgi?id=30858
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+(cherry picked from commit e23e3e73fd7bc8e841725813d54df1ff5c0db88d)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lib/Frontend/InitHeaderSearch.cpp | 4 ++--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 2 insertions(+), 2 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git llvm_release_39/tools/clang/lib/Frontend/InitHeaderSearch.cpp macports_release_39/tools/clang/lib/Frontend/InitHeaderSearch.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 1b5c760..28c21dd 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- llvm_release_39/tools/clang/lib/Frontend/InitHeaderSearch.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macports_release_39/tools/clang/lib/Frontend/InitHeaderSearch.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -366,7 +366,7 @@ AddDefaultCPlusPlusIncludePaths(const llvm::Triple &triple, const HeaderSearchOp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "powerpc-apple-darwin10", "", "ppc64",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ triple);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.0.0",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "powerpc-apple-darwin10", "", "ppc64",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "powerpc-apple-darwin8", "", "ppc64",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ triple);
</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;'>+@@ -375,7 +375,7 @@ AddDefaultCPlusPlusIncludePaths(const llvm::Triple &triple, const HeaderSearchOp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.2.1",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "i686-apple-darwin10", "", "x86_64", triple);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.0.0",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "i686-apple-darwin8", "", "", triple);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case llvm::Triple::arm:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.10.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-devel/Portfile b/lang/llvm-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b8e71c6..b040f43 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;'>@@ -79,7 +79,7 @@ if {${subport} eq "llvm-${llvm_version}"} {
</span> }
fetch.type svn
<span style='display:block; white-space:pre;background:#ffe0e0;'>-svn.revision 284098
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+svn.revision 285644
</span>
depends_extract-append port:subversion
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -156,6 +156,7 @@ if {${subport} eq "lldb-${llvm_version}"} {
</span> 1003-Default-to-ppc7400-for-OSX-10.5.patch \
1004-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch \
1005-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1006-Fixup-libstdc-header-search-paths-for-older-versions.patch \
</span> openmp-locations.patch
# https://llvm.org/bugs/show_bug.cgi?id=25681
<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 168a7b3..b26a2af 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-devel/files/1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-devel/files/1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From ab5dbc40e2dc4220e0ba1e88a106266e9ba10f8b Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From c2e4c94075b60482bb43eedbbef6e26238dec9c8 Mon Sep 17 00:00:00 2001
</span> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sat, 17 Jan 2015 17:50:24 -0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1001/1005] MacPorts Only: Prepare clang-format for replacement
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1001/1006] MacPorts Only: Prepare clang-format for replacement
</span> with absolute path
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,7 +53,7 @@ index 16ff56e..4b68104 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 ca46144..1c49835 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 0ac2da3..dba5110 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,10 +67,10 @@ index ca46144..1c49835 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 5cb41fc..e8a5904 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 37d970b..f74abbf 100644
</span> --- 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;'>-@@ -34,7 +34,7 @@ import vim
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -35,7 +35,7 @@ import vim
</span>
# set g:clang_format_path to the path to clang-format if it is not on the path
# Change this to the full path if clang-format is not on the path.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -80,5 +80,5 @@ index 5cb41fc..e8a5904 100644
</span> binary = vim.eval('g:clang_format_path')
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.7.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.10.1
</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 c476353..d42cbd2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-devel/files/1002-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-devel/files/1002-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From f251a1bd711d637013a19dddb23bc0e7ab6ef685 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 57af0aa8eb9a943b15475f7c71127f20dd7f6fa6 Mon Sep 17 00:00:00 2001
</span> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sat, 17 Jan 2015 17:55:27 -0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1002/1005] MacPorts Only: Fix name of scan-view executable
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1002/1006] MacPorts Only: Fix name of scan-view executable
</span> inside scan-build
http://trac.macports.org/ticket/35006
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -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 6a14484..319305f 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index cbf3bf3..f7fad16 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;'>-@@ -1817,6 +1817,8 @@ if (defined $Options{OutputFormat}) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1855,6 +1855,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 6a14484..319305f 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.7.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.10.1
</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 55423cd..0630c4d 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 2bf8502dda4a3ec979b15644513b31c0547959b7 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 5662f0184c9e491e7df297feff4de37a678a0a4e Mon Sep 17 00:00:00 2001
</span> From: Iain Sandoe <iain@codesourcery.com>
Date: Sun, 27 Jul 2014 20:35:16 +0100
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1003/1005] Default to ppc7400 for OSX 10.5+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1003/1006] Default to ppc7400 for OSX 10.5+
</span>
---
lib/Driver/Tools.cpp | 3 +++
1 file changed, 3 insertions(+)
diff --git llvm_master/tools/clang/lib/Driver/Tools.cpp macports_master/tools/clang/lib/Driver/Tools.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 2819ab3..e7d5a0c 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 6c07b9b..cd1e9f7 100644
</span> --- llvm_master/tools/clang/lib/Driver/Tools.cpp
+++ macports_master/tools/clang/lib/Driver/Tools.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1751,6 +1751,9 @@ static std::string getCPUName(const ArgList &Args, const llvm::Triple &T,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1955,6 +1955,9 @@ static std::string 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 2819ab3..e7d5a0c 100644
</span> TargetCPUName = "ppc";
}
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.7.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.10.1
</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 136b084..2319c6c 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,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From b81b30b857fbd33e4788688e4a157b37b0538947 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From a186e40307ffb706d39353bfc285c12d242e26ee Mon Sep 17 00:00:00 2001
</span> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sat, 17 Jan 2015 19:08:57 -0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1004/1005] Only call setpriority(PRIO_DARWIN_THREAD, 0,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1004/1006] Only call setpriority(PRIO_DARWIN_THREAD, 0,
</span> PRIO_DARWIN_BG) if it is available
Tiger and earlier versions of darwin do not support this.
<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 b2a9ab8..98b50ce 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 14eac44..778c3d1 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;'>-@@ -7744,7 +7744,7 @@ void clang::setThreadBackgroundPriority() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7865,7 +7865,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 b2a9ab8..98b50ce 100644
</span> #endif
}
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.7.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.10.1
</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 c90334e..55814e0 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,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From e0bb397409adb1a6146dd5c1e044e0614070920e Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 064b0fdeac73b72471b56cde85381356032d5d92 Mon Sep 17 00:00:00 2001
</span> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Tue, 20 Jan 2015 00:09:16 -0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1005/1005] Default to fragile ObjC runtime when targeting
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1005/1006] Default to fragile ObjC runtime when targeting
</span> darwin/ppc
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -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.h macports_master/tools/clang/lib/Driver/ToolChains.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index a5f5473..4f53d95 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 36773b2..8abfdcc 100644
</span> --- llvm_master/tools/clang/lib/Driver/ToolChains.h
+++ macports_master/tools/clang/lib/Driver/ToolChains.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -324,8 +324,10 @@ public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -335,8 +335,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 a5f5473..4f53d95 100644
</span>
bool UseObjCMixedDispatch() const override { return true; }
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.7.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.10.1
</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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..68fa40c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-devel/files/1006-Fixup-libstdc-header-search-paths-for-older-versions.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,41 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From e23e3e73fd7bc8e841725813d54df1ff5c0db88d Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Mon, 31 Oct 2016 15:06:36 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1006/1006] Fixup libstdc++ header search paths for older
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ versions of Mac OS X
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+The subpaths were removed in Lion. Leopard and Snow Leopard had darwin8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+symlinks for compatibility.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://llvm.org/bugs/show_bug.cgi?id=30858
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lib/Frontend/InitHeaderSearch.cpp | 4 ++--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 2 insertions(+), 2 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git llvm_master/tools/clang/lib/Frontend/InitHeaderSearch.cpp macports_master/tools/clang/lib/Frontend/InitHeaderSearch.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index c76ccea..5a0840d 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- llvm_master/tools/clang/lib/Frontend/InitHeaderSearch.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macports_master/tools/clang/lib/Frontend/InitHeaderSearch.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -365,7 +365,7 @@ AddDefaultCPlusPlusIncludePaths(const llvm::Triple &triple, const HeaderSearchOp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "powerpc-apple-darwin10", "", "ppc64",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ triple);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.0.0",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "powerpc-apple-darwin10", "", "ppc64",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "powerpc-apple-darwin8", "", "ppc64",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ triple);
</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;'>+@@ -374,7 +374,7 @@ AddDefaultCPlusPlusIncludePaths(const llvm::Triple &triple, const HeaderSearchOp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.2.1",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "i686-apple-darwin10", "", "x86_64", triple);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.0.0",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "i686-apple-darwin8", "", "", triple);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case llvm::Triple::arm:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.10.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-devel/files/openmp-locations.patch b/lang/llvm-devel/files/openmp-locations.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index dafbdca..1b0f419 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,53 +1,53 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- orig/tools/clang/lib/Driver/Tools.cpp 2015-09-03 11:39:15.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ fixed/tools/clang/lib/Driver/Tools.cpp 2015-09-03 11:44:09.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2534,12 +2534,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- 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:#e0ffe0;'>++++ fixed/tools/clang/lib/Driver/Tools.cpp 2016-10-31 22:31:55.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3154,12 +3154,18 @@ static void addOpenMPRuntime(ArgStringLi
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- switch (getOpenMPRuntime(getToolChain(), Args)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case OMPRT_OMP:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ switch (TC.getDriver().getOpenMPRuntime(Args)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case Driver::OMPRT_OMP:
</span> + // Automatically find MacPorts' libomp
+ CmdArgs.push_back("-L@@PREFIX@@/lib/libomp");
CmdArgs.push_back("-lomp");
break;
<span style='display:block; white-space:pre;background:#ffe0e0;'>- case OMPRT_GOMP:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // Automatically find MacPorts' libgomp (libomp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case Driver::OMPRT_GOMP:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // Automatically find MacPorts' libomp
</span> + CmdArgs.push_back("-L@@PREFIX@@/lib/libomp");
CmdArgs.push_back("-lgomp");
break;
<span style='display:block; white-space:pre;background:#ffe0e0;'>- case OMPRT_IOMP5:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // Automatically find MacPorts' libiomp5 (libomp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case Driver::OMPRT_IOMP5:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // Automatically find MacPorts' libomp
</span> + CmdArgs.push_back("-L@@PREFIX@@/lib/libomp");
CmdArgs.push_back("-liomp5");
break;
<span style='display:block; white-space:pre;background:#ffe0e0;'>- case OMPRT_Unknown:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4285,6 +4291,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case OMPRT_OMP:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case OMPRT_IOMP5:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case Driver::OMPRT_Unknown:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5283,6 +5289,8 @@ void Clang::ConstructJob(Compilation &C,
</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> // Clang can generate useful OpenMP code for these two runtime libraries.
+ // Automatically find MacPorts' omp.h
+ CmdArgs.push_back("-I@@PREFIX@@/include/libomp");
CmdArgs.push_back("-fopenmp");
// If no option regarding the use of TLS in OpenMP codegeneration is
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -8527,9 +8535,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -10119,9 +10127,13 @@ void gnutools::Linker::ConstructJob(Comp
</span> // Also link the particular OpenMP runtimes.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- switch (getOpenMPRuntime(ToolChain, Args)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case OMPRT_OMP:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ switch (ToolChain.getDriver().getOpenMPRuntime(Args)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case Driver::OMPRT_OMP:
</span> + // Automatically find MacPorts' libomp
+ CmdArgs.push_back("-L@@PREFIX@@/lib/libomp");
CmdArgs.push_back("-lomp");
break;
<span style='display:block; white-space:pre;background:#ffe0e0;'>- case OMPRT_GOMP:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // Automatically find MacPorts' libgomp (libomp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case Driver::OMPRT_GOMP:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // Automatically find MacPorts' libomp
</span> + CmdArgs.push_back("-L@@PREFIX@@/lib/libomp");
CmdArgs.push_back("-lgomp");
// FIXME: Exclude this for platforms with libgomp that don't require
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -8537,6 +8549,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -10129,6 +10141,8 @@ void gnutools::Linker::ConstructJob(Comp
</span> CmdArgs.push_back("-lrt");
break;
<span style='display:block; white-space:pre;background:#ffe0e0;'>- case OMPRT_IOMP5:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // Automatically find MacPorts' libiomp5 (libomp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case Driver::OMPRT_IOMP5:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // Automatically find MacPorts' libomp
</span> + CmdArgs.push_back("-L@@PREFIX@@/lib/libomp");
CmdArgs.push_back("-liomp5");
break;
<span style='display:block; white-space:pre;background:#ffe0e0;'>- case OMPRT_Unknown:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case Driver::OMPRT_Unknown:
</span></pre><pre style='margin:0'>
</pre>