<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[141660] trunk/dports/lang/llvm-3.7</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/141660">141660</a></dd>
<dt>Author</dt> <dd>jeremyhu@macports.org</dd>
<dt>Date</dt> <dd>2015-10-25 17:20:47 -0700 (Sun, 25 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>clang-3.7: Include ASan reports in crash logs by default</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportslangllvm37Portfile">trunk/dports/lang/llvm-3.7/Portfile</a></li>
<li><a href="#trunkdportslangllvm37files2001MacPortsOnlyCommentoutSLcctoolsworkaroundpatch">trunk/dports/lang/llvm-3.7/files/2001-MacPorts-Only-Comment-out-SL-cctools-workaround.patch</a></li>
<li><a href="#trunkdportslangllvm37files2002UpdateCheckArchestofallbackonIntelppcifldvpatch">trunk/dports/lang/llvm-3.7/files/2002-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch</a></li>
<li><a href="#trunkdportslangllvm37files2003Fallbackonxcodebuildsdkwhenxcrunsdkisnotsupatch">trunk/dports/lang/llvm-3.7/files/2003-Fall-back-on-xcodebuild-sdk-when-xcrun-sdk-is-not-su.patch</a></li>
<li><a href="#trunkdportslangllvm37files2004Ondarwinbuildppcslicesofthecompilerruntimeipatch">trunk/dports/lang/llvm-3.7/files/2004-On-darwin-build-ppc-slices-of-the-compiler-runtime-i.patch</a></li>
<li><a href="#trunkdportslangllvm37files2005MacPortsOnlyDontbuildx86_64hsliceofcompilerpatch">trunk/dports/lang/llvm-3.7/files/2005-MacPorts-Only-Don-t-build-x86_64h-slice-of-compiler-.patch</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportslangllvm37files2006Setabort_on_errortotruebydefaultpatch">trunk/dports/lang/llvm-3.7/files/2006-Set-abort_on_error-to-true-by-default.patch</a></li>
<li><a href="#trunkdportslangllvm37files2007SavetheASanreportintheOSXcrashlogpatch">trunk/dports/lang/llvm-3.7/files/2007-Save-the-ASan-report-in-the-OS-X-crash-log.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportslangllvm37Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/llvm-3.7/Portfile (141659 => 141660)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.7/Portfile 2015-10-25 22:31:10 UTC (rev 141659)
+++ trunk/dports/lang/llvm-3.7/Portfile 2015-10-26 00:20:47 UTC (rev 141660)
</span><span class="lines">@@ -8,7 +8,7 @@
</span><span class="cx"> set llvm_version 3.7
</span><span class="cx"> set llvm_version_no_dot 37
</span><span class="cx"> name llvm-${llvm_version}
</span><del>-subport clang-${llvm_version} {}
</del><ins>+subport clang-${llvm_version} { revision 1 }
</ins><span class="cx"> set suffix mp-${llvm_version}
</span><span class="cx"> set sub_prefix ${prefix}/libexec/llvm-${llvm_version}
</span><span class="cx"> dist_subdir llvm
</span><span class="lines">@@ -138,6 +138,8 @@
</span><span class="cx"> 2003-Fall-back-on-xcodebuild-sdk-when-xcrun-sdk-is-not-su.patch \
</span><span class="cx"> 2004-On-darwin-build-ppc-slices-of-the-compiler-runtime-i.patch \
</span><span class="cx"> 2005-MacPorts-Only-Don-t-build-x86_64h-slice-of-compiler-.patch \
</span><ins>+ 2006-Set-abort_on_error-to-true-by-default.patch \
+ 2007-Save-the-ASan-report-in-the-OS-X-crash-log.patch \
</ins><span class="cx"> 3001-buildit-build-fix-for-Leopard.patch \
</span><span class="cx"> 3002-buildit-Set-compatibility-version-to-RC_ProjectSourc.patch \
</span><span class="cx"> 3003-Fix-local-and-iterator-when-building-with-Lion-and-n.patch \
</span><span class="lines">@@ -426,6 +428,11 @@
</span><span class="cx"> file delete -force ${destroot}${sub_prefix}/libexec/clang-format/Release+Debug+Asserts
</span><span class="cx"> file delete -force ${destroot}${sub_prefix}/libexec/clang-format/CMakeLists.txt
</span><span class="cx"> file delete -force ${destroot}${sub_prefix}/libexec/clang-format/ClangFormat.cpp
</span><ins>+
+ system "install_name_tool -id @rpath/libclang_rt.asan_iossim_dynamic.dylib ${destroot}${sub_prefix}/lib/clang/${llvm_version}/lib/darwin/libclang_rt.asan_iossim_dynamic.dylib"
+ system "install_name_tool -id @rpath/libclang_rt.asan_osx_dynamic.dylib ${destroot}${sub_prefix}/lib/clang/${llvm_version}/lib/darwin/libclang_rt.asan_osx_dynamic.dylib"
+ system "install_name_tool -id @rpath/libclang_rt.ubsan_iossim_dynamic.dylib ${destroot}${sub_prefix}/lib/clang/${llvm_version}/lib/darwin/libclang_rt.ubsan_iossim_dynamic.dylib"
+ system "install_name_tool -id @rpath/libclang_rt.ubsan_osx_dynamic.dylib ${destroot}${sub_prefix}/lib/clang/${llvm_version}/lib/darwin/libclang_rt.ubsan_osx_dynamic.dylib"
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportslangllvm37files2001MacPortsOnlyCommentoutSLcctoolsworkaroundpatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/llvm-3.7/files/2001-MacPorts-Only-Comment-out-SL-cctools-workaround.patch (141659 => 141660)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.7/files/2001-MacPorts-Only-Comment-out-SL-cctools-workaround.patch 2015-10-25 22:31:10 UTC (rev 141659)
+++ trunk/dports/lang/llvm-3.7/files/2001-MacPorts-Only-Comment-out-SL-cctools-workaround.patch 2015-10-26 00:20:47 UTC (rev 141660)
</span><span class="lines">@@ -1,18 +1,18 @@
</span><del>-From 6f543c369c868da8eabc97b27b64ddaaf7fa7a00 Mon Sep 17 00:00:00 2001
</del><ins>+From e2677a51632b1d9e4e100f6e39f320f29811544e Mon Sep 17 00:00:00 2001
</ins><span class="cx"> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span class="cx"> Date: Mon, 15 Apr 2013 22:38:18 -0700
</span><del>-Subject: [PATCH 2001/2004] MacPorts Only: Comment out SL cctools workaround
</del><ins>+Subject: [PATCH 2001/2007] MacPorts Only: Comment out SL cctools workaround
</ins><span class="cx">
</span><span class="cx"> Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span class="cx"> ---
</span><span class="cx"> make/platform/clang_darwin.mk | 12 ++++++------
</span><span class="cx"> 1 file changed, 6 insertions(+), 6 deletions(-)
</span><span class="cx">
</span><del>-diff --git llvm_master/projects/compiler-rt/make/platform/clang_darwin.mk macports_master/projects/compiler-rt/make/platform/clang_darwin.mk
-index 4f71c0b..cc553ae 100644
---- llvm_master/projects/compiler-rt/make/platform/clang_darwin.mk
-+++ macports_master/projects/compiler-rt/make/platform/clang_darwin.mk
-@@ -126,12 +126,12 @@ UniversalArchs.ubsan_osx := $(call CheckArches,i386 x86_64 x86_64h,ubsan_osx,$(O
</del><ins>+diff --git llvm_release_37/projects/compiler-rt/make/platform/clang_darwin.mk macports_release_37/projects/compiler-rt/make/platform/clang_darwin.mk
+index 79925bc..4e869d6 100644
+--- llvm_release_37/projects/compiler-rt/make/platform/clang_darwin.mk
++++ macports_release_37/projects/compiler-rt/make/platform/clang_darwin.mk
+@@ -129,12 +129,12 @@ UniversalArchs.ubsan_iossim_dynamic := $(call CheckArches,i386 x86_64,ubsan_ioss
</ins><span class="cx"> # object files. If we are on that platform, strip out all ARM archs. We still
</span><span class="cx"> # build the libraries themselves so that Clang can find them where it expects
</span><span class="cx"> # them, even though they might not have an expected slice.
</span><span class="lines">@@ -32,5 +32,5 @@
</span><span class="cx"> # If RC_SUPPORTED_ARCHS is defined, treat it as a list of the architectures we
</span><span class="cx"> # are intended to support and limit what we try to build to that.
</span><span class="cx"> --
</span><del>-2.3.0
</del><ins>+2.6.2
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkdportslangllvm37files2002UpdateCheckArchestofallbackonIntelppcifldvpatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/llvm-3.7/files/2002-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch (141659 => 141660)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.7/files/2002-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch 2015-10-25 22:31:10 UTC (rev 141659)
+++ trunk/dports/lang/llvm-3.7/files/2002-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch 2015-10-26 00:20:47 UTC (rev 141660)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><del>-From 23ae20f935fb745104ff31cc280ed4bdd059b655 Mon Sep 17 00:00:00 2001
</del><ins>+From e9dbcc3e88810caf3e303e3f1b106574bb68b8d3 Mon Sep 17 00:00:00 2001
</ins><span class="cx"> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span class="cx"> Date: Sat, 10 Jan 2015 03:34:51 -0800
</span><del>-Subject: [PATCH 2002/2004] Update CheckArches to fallback on Intel/ppc if ld
</del><ins>+Subject: [PATCH 2002/2007] Update CheckArches to fallback on Intel/ppc if ld
</ins><span class="cx"> -v doesn't report supported architectures
</span><span class="cx">
</span><span class="cx"> Older versions of ld64 (eg: Xcode 3.x) do not report this.
</span><span class="lines">@@ -13,10 +13,10 @@
</span><span class="cx"> make/platform/clang_darwin.mk | 2 ++
</span><span class="cx"> 1 file changed, 2 insertions(+)
</span><span class="cx">
</span><del>-diff --git llvm_master/projects/compiler-rt/make/platform/clang_darwin.mk macports_master/projects/compiler-rt/make/platform/clang_darwin.mk
-index cc553ae..08e97f5 100644
---- llvm_master/projects/compiler-rt/make/platform/clang_darwin.mk
-+++ macports_master/projects/compiler-rt/make/platform/clang_darwin.mk
</del><ins>+diff --git llvm_release_37/projects/compiler-rt/make/platform/clang_darwin.mk macports_release_37/projects/compiler-rt/make/platform/clang_darwin.mk
+index 4e869d6..1893ad4 100644
+--- llvm_release_37/projects/compiler-rt/make/platform/clang_darwin.mk
++++ macports_release_37/projects/compiler-rt/make/platform/clang_darwin.mk
</ins><span class="cx"> @@ -25,6 +25,8 @@ CheckArches = \
</span><span class="cx"> if $(LD) -v 2>&1 | grep "configured to support" \
</span><span class="cx"> | tr ' ' '\n' | grep "^$$arch$$" >/dev/null 2>/dev/null; then \
</span><span class="lines">@@ -27,5 +27,5 @@
</span><span class="cx"> printf 1>&2 \
</span><span class="cx"> "warning: clang_darwin.mk: dropping arch '$$arch' from lib '$(2)'";\
</span><span class="cx"> --
</span><del>-2.3.0
</del><ins>+2.6.2
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkdportslangllvm37files2003Fallbackonxcodebuildsdkwhenxcrunsdkisnotsupatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/llvm-3.7/files/2003-Fall-back-on-xcodebuild-sdk-when-xcrun-sdk-is-not-su.patch (141659 => 141660)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.7/files/2003-Fall-back-on-xcodebuild-sdk-when-xcrun-sdk-is-not-su.patch 2015-10-25 22:31:10 UTC (rev 141659)
+++ trunk/dports/lang/llvm-3.7/files/2003-Fall-back-on-xcodebuild-sdk-when-xcrun-sdk-is-not-su.patch 2015-10-26 00:20:47 UTC (rev 141660)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><del>-From 0d87693a90dbd828868f125bbc6f496659e4ce14 Mon Sep 17 00:00:00 2001
</del><ins>+From cd109000abbab497df2ee32a2a33035713009175 Mon Sep 17 00:00:00 2001
</ins><span class="cx"> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span class="cx"> Date: Sat, 17 Jan 2015 17:45:27 -0800
</span><del>-Subject: [PATCH 2003/2004] Fall back on xcodebuild -sdk when xcrun --sdk is
</del><ins>+Subject: [PATCH 2003/2007] Fall back on xcodebuild -sdk when xcrun --sdk is
</ins><span class="cx"> not supported
</span><span class="cx">
</span><span class="cx"> Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span class="lines">@@ -9,10 +9,10 @@
</span><span class="cx"> make/platform/clang_darwin.mk | 4 ++++
</span><span class="cx"> 1 file changed, 4 insertions(+)
</span><span class="cx">
</span><del>-diff --git llvm_master/projects/compiler-rt/make/platform/clang_darwin.mk macports_master/projects/compiler-rt/make/platform/clang_darwin.mk
-index 08e97f5..d99081b 100644
---- llvm_master/projects/compiler-rt/make/platform/clang_darwin.mk
-+++ macports_master/projects/compiler-rt/make/platform/clang_darwin.mk
</del><ins>+diff --git llvm_release_37/projects/compiler-rt/make/platform/clang_darwin.mk macports_release_37/projects/compiler-rt/make/platform/clang_darwin.mk
+index 1893ad4..974ae1c 100644
+--- llvm_release_37/projects/compiler-rt/make/platform/clang_darwin.mk
++++ macports_release_37/projects/compiler-rt/make/platform/clang_darwin.mk
</ins><span class="cx"> @@ -52,6 +52,10 @@ XCRunSdkPath = \
</span><span class="cx"> result=`xcrun --sdk $(1).internal --show-sdk-path 2> /dev/null`; \
</span><span class="cx"> if [ "$$?" != "0" ]; then \
</span><span class="lines">@@ -25,5 +25,5 @@
</span><span class="cx"> fi; \
</span><span class="cx"> echo $$result)
</span><span class="cx"> --
</span><del>-2.3.0
</del><ins>+2.6.2
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkdportslangllvm37files2004Ondarwinbuildppcslicesofthecompilerruntimeipatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/llvm-3.7/files/2004-On-darwin-build-ppc-slices-of-the-compiler-runtime-i.patch (141659 => 141660)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.7/files/2004-On-darwin-build-ppc-slices-of-the-compiler-runtime-i.patch 2015-10-25 22:31:10 UTC (rev 141659)
+++ trunk/dports/lang/llvm-3.7/files/2004-On-darwin-build-ppc-slices-of-the-compiler-runtime-i.patch 2015-10-26 00:20:47 UTC (rev 141660)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><del>-From f0e6107c4e73d8da46ffe0ed530bfc0d48f69e06 Mon Sep 17 00:00:00 2001
</del><ins>+From ad7e458c5ee6caf2f08658aa06414516cc5551b9 Mon Sep 17 00:00:00 2001
</ins><span class="cx"> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span class="cx"> Date: Sat, 17 Jan 2015 19:55:19 -0800
</span><del>-Subject: [PATCH 2004/2004] On darwin, build ppc slices of the compiler runtime
</del><ins>+Subject: [PATCH 2004/2007] On darwin, build ppc slices of the compiler runtime
</ins><span class="cx"> if requested and supported by the SDK and toolchain
</span><span class="cx">
</span><span class="cx"> Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span class="lines">@@ -9,10 +9,10 @@
</span><span class="cx"> make/platform/clang_darwin.mk | 12 ++++++------
</span><span class="cx"> 1 file changed, 6 insertions(+), 6 deletions(-)
</span><span class="cx">
</span><del>-diff --git llvm_master/projects/compiler-rt/make/platform/clang_darwin.mk macports_master/projects/compiler-rt/make/platform/clang_darwin.mk
-index d99081b..09c9a86 100644
---- llvm_master/projects/compiler-rt/make/platform/clang_darwin.mk
-+++ macports_master/projects/compiler-rt/make/platform/clang_darwin.mk
</del><ins>+diff --git llvm_release_37/projects/compiler-rt/make/platform/clang_darwin.mk macports_release_37/projects/compiler-rt/make/platform/clang_darwin.mk
+index 974ae1c..c39e33c 100644
+--- llvm_release_37/projects/compiler-rt/make/platform/clang_darwin.mk
++++ macports_release_37/projects/compiler-rt/make/platform/clang_darwin.mk
</ins><span class="cx"> @@ -83,10 +83,10 @@ Configs += eprintf
</span><span class="cx"> UniversalArchs.eprintf := $(call CheckArches,i386,eprintf,$(OSX_SDK))
</span><span class="cx">
</span><span class="lines">@@ -51,5 +51,5 @@
</span><span class="cx"> UniversalArchs.profile_ios := $(call CheckArches,i386 x86_64,profile_ios,$(IOSSIM_SDK))
</span><span class="cx"> UniversalArchs.profile_ios += $(call CheckArches,armv7 arm64,profile_ios,$(IOS_SDK))
</span><span class="cx"> --
</span><del>-2.3.0
</del><ins>+2.6.2
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkdportslangllvm37files2005MacPortsOnlyDontbuildx86_64hsliceofcompilerpatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/llvm-3.7/files/2005-MacPorts-Only-Don-t-build-x86_64h-slice-of-compiler-.patch (141659 => 141660)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.7/files/2005-MacPorts-Only-Don-t-build-x86_64h-slice-of-compiler-.patch 2015-10-25 22:31:10 UTC (rev 141659)
+++ trunk/dports/lang/llvm-3.7/files/2005-MacPorts-Only-Don-t-build-x86_64h-slice-of-compiler-.patch 2015-10-26 00:20:47 UTC (rev 141660)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><del>-From 93765fa740dd35a58fef1ff80ff31f69918a57aa Mon Sep 17 00:00:00 2001
</del><ins>+From ed862ddb8c6511608592b4dc0a13f330385df233 Mon Sep 17 00:00:00 2001
</ins><span class="cx"> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><del>-Date: Fri, 14 Aug 2015 11:22:31 -0700
-Subject: [PATCH 2005/2005] MacPorts Only: Don't build x86_64h slice of
</del><ins>+Date: Wed, 14 Jan 2015 19:55:19 -0800
+Subject: [PATCH 2005/2007] MacPorts Only: Don't build x86_64h slice of
</ins><span class="cx"> compiler-rt
</span><span class="cx">
</span><span class="cx"> Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span class="lines">@@ -9,10 +9,10 @@
</span><span class="cx"> make/platform/clang_darwin.mk | 10 +++++-----
</span><span class="cx"> 1 file changed, 5 insertions(+), 5 deletions(-)
</span><span class="cx">
</span><del>-diff --git llvm_master/projects/compiler-rt/make/platform/clang_darwin.mk macports_master/projects/compiler-rt/make/platform/clang_darwin.mk
</del><ins>+diff --git llvm_release_37/projects/compiler-rt/make/platform/clang_darwin.mk macports_release_37/projects/compiler-rt/make/platform/clang_darwin.mk
</ins><span class="cx"> index c39e33c..2b7403a 100644
</span><del>---- llvm_master/projects/compiler-rt/make/platform/clang_darwin.mk
-+++ macports_master/projects/compiler-rt/make/platform/clang_darwin.mk
</del><ins>+--- llvm_release_37/projects/compiler-rt/make/platform/clang_darwin.mk
++++ macports_release_37/projects/compiler-rt/make/platform/clang_darwin.mk
</ins><span class="cx"> @@ -97,11 +97,11 @@ UniversalArchs.ios += $(call CheckArches,armv7 arm64,ios,$(IOS_SDK))
</span><span class="cx"> # Configuration for targeting OSX. These functions may not be in libSystem
</span><span class="cx"> # so we should provide our own.
</span><span class="lines">@@ -52,5 +52,5 @@
</span><span class="cx"> Configs += ubsan_iossim_dynamic
</span><span class="cx"> UniversalArchs.ubsan_iossim_dynamic := $(call CheckArches,i386 x86_64,ubsan_iossim_dynamic,$(IOSSIM_SDK))
</span><span class="cx"> --
</span><del>-2.5.0
</del><ins>+2.6.2
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkdportslangllvm37files2006Setabort_on_errortotruebydefaultpatch"></a>
<div class="addfile"><h4>Added: trunk/dports/lang/llvm-3.7/files/2006-Set-abort_on_error-to-true-by-default.patch (0 => 141660)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.7/files/2006-Set-abort_on_error-to-true-by-default.patch (rev 0)
+++ trunk/dports/lang/llvm-3.7/files/2006-Set-abort_on_error-to-true-by-default.patch 2015-10-26 00:20:47 UTC (rev 141660)
</span><span class="lines">@@ -0,0 +1,26 @@
</span><ins>+From 8046167ff764e7a500a406a970927bc24b688629 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+Date: Sun, 25 Oct 2015 16:47:47 -0700
+Subject: [PATCH 2006/2007] Set abort_on_error to true by default
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+---
+ lib/asan/asan_flags.inc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git llvm_release_37/projects/compiler-rt/lib/asan/asan_flags.inc macports_release_37/projects/compiler-rt/lib/asan/asan_flags.inc
+index 53a8a40..5cafe66 100644
+--- llvm_release_37/projects/compiler-rt/lib/asan/asan_flags.inc
++++ macports_release_37/projects/compiler-rt/lib/asan/asan_flags.inc
+@@ -78,7 +78,7 @@ ASAN_FLAG(bool, check_malloc_usable_size, true,
+ ASAN_FLAG(bool, unmap_shadow_on_exit, false,
+ "If set, explicitly unmaps the (huge) shadow at exit.")
+ ASAN_FLAG(
+- bool, abort_on_error, false,
++ bool, abort_on_error, true,
+ "If set, the tool calls abort() instead of _exit() after printing the "
+ "error report.")
+ ASAN_FLAG(bool, print_stats, false,
+--
+2.6.2
+
</ins></span></pre></div>
<a id="trunkdportslangllvm37files2007SavetheASanreportintheOSXcrashlogpatch"></a>
<div class="addfile"><h4>Added: trunk/dports/lang/llvm-3.7/files/2007-Save-the-ASan-report-in-the-OS-X-crash-log.patch (0 => 141660)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.7/files/2007-Save-the-ASan-report-in-the-OS-X-crash-log.patch (rev 0)
+++ trunk/dports/lang/llvm-3.7/files/2007-Save-the-ASan-report-in-the-OS-X-crash-log.patch 2015-10-26 00:20:47 UTC (rev 141660)
</span><span class="lines">@@ -0,0 +1,66 @@
</span><ins>+From b82505f69186c22d06ea81ac59b2fe5608f8c02c Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+Date: Sun, 25 Oct 2015 16:03:00 -0700
+Subject: [PATCH 2007/2007] Save the ASan report in the OS X crash log
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+(cherry picked from commit c00bd67ad0f1dd933d8f962b9e4be1de1446465c)
+---
+ lib/asan/asan_report.cc | 27 +++++++++++++++++++++++++++
+ 1 file changed, 27 insertions(+)
+
+diff --git llvm_release_37/projects/compiler-rt/lib/asan/asan_report.cc macports_release_37/projects/compiler-rt/lib/asan/asan_report.cc
+index c1681e6..b736df4 100644
+--- llvm_release_37/projects/compiler-rt/lib/asan/asan_report.cc
++++ macports_release_37/projects/compiler-rt/lib/asan/asan_report.cc
+@@ -23,6 +23,18 @@
+ #include "sanitizer_common/sanitizer_stackdepot.h"
+ #include "sanitizer_common/sanitizer_symbolizer.h"
+
++// Apple CrashReporter support.
++#ifdef __APPLE__
++extern "C" {
++static char __crashreporter_info_buff__[1 << 16] = { 0 };
++static const char *__crashreporter_info__ __attribute__((__used__)) = &__crashreporter_info_buff__[0];
++asm (".desc ___crashreporter_info__, 0x10");
++
++#include <string.h>
++#define CRSetCrashLogMessage(msg) strlcpy(__crashreporter_info_buff__, msg, sizeof(__crashreporter_info_buff__));
++}
++#endif
++
+ namespace __asan {
+
+ // -------------------- User-specified callbacks ----------------- {{{1
+@@ -45,6 +57,16 @@ static bool report_happened = false;
+ static ReportData report_data = {};
+
+ void AppendToErrorMessageBuffer(const char *buffer) {
++#if __APPLE__
++ // For the Apple CrashReporter support: Always store reports into buffer.
++ if (!error_message_buffer) {
++ error_message_buffer_size = 1 << 16;
++ error_message_buffer =
++ (char*)MmapOrDie(error_message_buffer_size, __func__);
++ error_message_buffer_pos = 0;
++ }
++#endif
++
+ if (error_message_buffer) {
+ uptr length = internal_strlen(buffer);
+ CHECK_GE(error_message_buffer_size, error_message_buffer_pos);
+@@ -663,6 +685,11 @@ class ScopedInErrorReport {
+ // Print memory stats.
+ if (flags()->print_stats)
+ __asan_print_accumulated_stats();
++
++#ifdef __APPLE__
++ CRSetCrashLogMessage(error_message_buffer);
++#endif
++
+ if (error_report_callback) {
+ error_report_callback(error_message_buffer);
+ }
+--
+2.6.2
+
</ins></span></pre>
</div>
</div>
</body>
</html>