<!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>[141828] trunk/dports/lang/llvm-3.8</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/141828">141828</a></dd>
<dt>Author</dt> <dd>jeremyhu@macports.org</dd>
<dt>Date</dt> <dd>2015-10-29 08:20:41 -0700 (Thu, 29 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>llvm-3.8: Bump to current master and fix build on older systems (#49477)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportslangllvm38Portfile">trunk/dports/lang/llvm-3.8/Portfile</a></li>
<li><a href="#trunkdportslangllvm38files2001MacPortsOnlyCommentoutSLcctoolsworkaroundpatch">trunk/dports/lang/llvm-3.8/files/2001-MacPorts-Only-Comment-out-SL-cctools-workaround.patch</a></li>
<li><a href="#trunkdportslangllvm38files2002UpdateCheckArchestofallbackonIntelppcifldvpatch">trunk/dports/lang/llvm-3.8/files/2002-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch</a></li>
<li><a href="#trunkdportslangllvm38files2003Fallbackonxcodebuildsdkwhenxcrunsdkisnotsupatch">trunk/dports/lang/llvm-3.8/files/2003-Fall-back-on-xcodebuild-sdk-when-xcrun-sdk-is-not-su.patch</a></li>
<li><a href="#trunkdportslangllvm38files2004Ondarwinbuildppcslicesofthecompilerruntimeipatch">trunk/dports/lang/llvm-3.8/files/2004-On-darwin-build-ppc-slices-of-the-compiler-runtime-i.patch</a></li>
<li><a href="#trunkdportslangllvm38files2005MacPortsOnlyDontbuildx86_64hsliceofcompilerpatch">trunk/dports/lang/llvm-3.8/files/2005-MacPorts-Only-Don-t-build-x86_64h-slice-of-compiler-.patch</a></li>
<li><a href="#trunkdportslangllvm38files2006MacPortsOnlyFixregressionintroducedwhenfixingpatch">trunk/dports/lang/llvm-3.8/files/2006-MacPorts-Only-Fix-regression-introduced-when-fixing-.patch</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportslangllvm38files2007ASanbuildfixforolderOSversionswithoutostracpatch">trunk/dports/lang/llvm-3.8/files/2007-ASan-build-fix-for-older-OS-versions-without-os-trac.patch</a></li>
<li><a href="#trunkdportslangllvm38files2008SavetheASanreportintheOSXcrashlogpatch">trunk/dports/lang/llvm-3.8/files/2008-Save-the-ASan-report-in-the-OS-X-crash-log.patch</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportslangllvm38files2007SavetheASanreportintheOSXcrashlogpatch">trunk/dports/lang/llvm-3.8/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="trunkdportslangllvm38Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/llvm-3.8/Portfile (141827 => 141828)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.8/Portfile 2015-10-29 15:12:48 UTC (rev 141827)
+++ trunk/dports/lang/llvm-3.8/Portfile 2015-10-29 15:20:41 UTC (rev 141828)
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> fetch.type svn
</span><del>-svn.revision 251269
</del><ins>+svn.revision 251619
</ins><span class="cx">
</span><span class="cx"> set compiler_rt_rev ${svn.revision}
</span><span class="cx"> set libcxx_rev ${svn.revision}
</span><span class="lines">@@ -120,7 +120,8 @@
</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><span class="cx"> 2006-MacPorts-Only-Fix-regression-introduced-when-fixing-.patch \
</span><del>- 2007-Save-the-ASan-report-in-the-OS-X-crash-log.patch \
</del><ins>+ 2007-ASan-build-fix-for-older-OS-versions-without-os-trac.patch \
+ 2008-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">@@ -410,10 +411,11 @@
</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><span class="cx">
</span><del>- 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"
</del><ins>+ set clangrtpath "${destroot}${sub_prefix}/lib/clang/${llvm_version}/lib/darwin"
+ foreach file [glob ${clangrtpath}/*.dylib] {
+ set basename [string map "${clangrtpath}/ {}" ${file}]
+ system "install_name_tool -id @rpath/${basename} ${file}"
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportslangllvm38files2001MacPortsOnlyCommentoutSLcctoolsworkaroundpatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/llvm-3.8/files/2001-MacPorts-Only-Comment-out-SL-cctools-workaround.patch (141827 => 141828)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.8/files/2001-MacPorts-Only-Comment-out-SL-cctools-workaround.patch 2015-10-29 15:12:48 UTC (rev 141827)
+++ trunk/dports/lang/llvm-3.8/files/2001-MacPorts-Only-Comment-out-SL-cctools-workaround.patch 2015-10-29 15:20:41 UTC (rev 141828)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><del>-From a321b5175583de50ac1239776a54ddf5b95cf651 Mon Sep 17 00:00:00 2001
</del><ins>+From d2b296ccf11795a4285193428d24792fe3cb56ad 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/2007] MacPorts Only: Comment out SL cctools workaround
</del><ins>+Subject: [PATCH 2001/2008] 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></pre></div>
<a id="trunkdportslangllvm38files2002UpdateCheckArchestofallbackonIntelppcifldvpatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/llvm-3.8/files/2002-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch (141827 => 141828)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.8/files/2002-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch 2015-10-29 15:12:48 UTC (rev 141827)
+++ trunk/dports/lang/llvm-3.8/files/2002-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch 2015-10-29 15:20:41 UTC (rev 141828)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><del>-From 2292a6f81d1f49f3fdfa9d325fa994f676252591 Mon Sep 17 00:00:00 2001
</del><ins>+From cbe667aa54b998d43aa7e7a3cd29ca8f27453abd 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/2007] Update CheckArches to fallback on Intel/ppc if ld
</del><ins>+Subject: [PATCH 2002/2008] 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></pre></div>
<a id="trunkdportslangllvm38files2003Fallbackonxcodebuildsdkwhenxcrunsdkisnotsupatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/llvm-3.8/files/2003-Fall-back-on-xcodebuild-sdk-when-xcrun-sdk-is-not-su.patch (141827 => 141828)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.8/files/2003-Fall-back-on-xcodebuild-sdk-when-xcrun-sdk-is-not-su.patch 2015-10-29 15:12:48 UTC (rev 141827)
+++ trunk/dports/lang/llvm-3.8/files/2003-Fall-back-on-xcodebuild-sdk-when-xcrun-sdk-is-not-su.patch 2015-10-29 15:20:41 UTC (rev 141828)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><del>-From 7d4590c76d48df29165a93704765922e514972e8 Mon Sep 17 00:00:00 2001
</del><ins>+From e13a535302239c487d3bb5ce5b34bb1b6695f091 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/2007] Fall back on xcodebuild -sdk when xcrun --sdk is
</del><ins>+Subject: [PATCH 2003/2008] 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></pre></div>
<a id="trunkdportslangllvm38files2004Ondarwinbuildppcslicesofthecompilerruntimeipatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/llvm-3.8/files/2004-On-darwin-build-ppc-slices-of-the-compiler-runtime-i.patch (141827 => 141828)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.8/files/2004-On-darwin-build-ppc-slices-of-the-compiler-runtime-i.patch 2015-10-29 15:12:48 UTC (rev 141827)
+++ trunk/dports/lang/llvm-3.8/files/2004-On-darwin-build-ppc-slices-of-the-compiler-runtime-i.patch 2015-10-29 15:20:41 UTC (rev 141828)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><del>-From e4b2ca3c0b7864503b69c6dd4ca8a08d82672ddc Mon Sep 17 00:00:00 2001
</del><ins>+From 77a697e1fc15f2120b41fd44e62886624f15a47e 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/2007] On darwin, build ppc slices of the compiler runtime
</del><ins>+Subject: [PATCH 2004/2008] 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></pre></div>
<a id="trunkdportslangllvm38files2005MacPortsOnlyDontbuildx86_64hsliceofcompilerpatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/llvm-3.8/files/2005-MacPorts-Only-Don-t-build-x86_64h-slice-of-compiler-.patch (141827 => 141828)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.8/files/2005-MacPorts-Only-Don-t-build-x86_64h-slice-of-compiler-.patch 2015-10-29 15:12:48 UTC (rev 141827)
+++ trunk/dports/lang/llvm-3.8/files/2005-MacPorts-Only-Don-t-build-x86_64h-slice-of-compiler-.patch 2015-10-29 15:20:41 UTC (rev 141828)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><del>-From 54d35960b799a78ead02b4288ee4de7e4a92d8c9 Mon Sep 17 00:00:00 2001
</del><ins>+From ea53b2fabf499870a51c8a8ec0de22a33193613a Mon Sep 17 00:00:00 2001
</ins><span class="cx"> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span class="cx"> Date: Wed, 14 Jan 2015 19:55:19 -0800
</span><del>-Subject: [PATCH 2005/2007] MacPorts Only: Don't build x86_64h slice of
</del><ins>+Subject: [PATCH 2005/2008] 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></pre></div>
<a id="trunkdportslangllvm38files2006MacPortsOnlyFixregressionintroducedwhenfixingpatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/llvm-3.8/files/2006-MacPorts-Only-Fix-regression-introduced-when-fixing-.patch (141827 => 141828)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.8/files/2006-MacPorts-Only-Fix-regression-introduced-when-fixing-.patch 2015-10-29 15:12:48 UTC (rev 141827)
+++ trunk/dports/lang/llvm-3.8/files/2006-MacPorts-Only-Fix-regression-introduced-when-fixing-.patch 2015-10-29 15:20:41 UTC (rev 141828)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><del>-From 960ad7a967a124a32360f15b7f33d1d1842d44ce Mon Sep 17 00:00:00 2001
</del><ins>+From 4ed7840e485af03baffb9a983f613ac76fad66d3 Mon Sep 17 00:00:00 2001
</ins><span class="cx"> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span class="cx"> Date: Sun, 11 Oct 2015 09:02:26 -0700
</span><del>-Subject: [PATCH 2006/2007] MacPorts Only: Fix regression introduced when
</del><ins>+Subject: [PATCH 2006/2008] MacPorts Only: Fix regression introduced when
</ins><span class="cx"> fixing PR24776
</span><span class="cx">
</span><span class="cx"> Partially reverts commit efecb2c285bd444b6def43ac62e5f0278df387eb
</span></span></pre></div>
<a id="trunkdportslangllvm38files2007ASanbuildfixforolderOSversionswithoutostracpatch"></a>
<div class="addfile"><h4>Added: trunk/dports/lang/llvm-3.8/files/2007-ASan-build-fix-for-older-OS-versions-without-os-trac.patch (0 => 141828)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.8/files/2007-ASan-build-fix-for-older-OS-versions-without-os-trac.patch (rev 0)
+++ trunk/dports/lang/llvm-3.8/files/2007-ASan-build-fix-for-older-OS-versions-without-os-trac.patch 2015-10-29 15:20:41 UTC (rev 141828)
</span><span class="lines">@@ -0,0 +1,49 @@
</span><ins>+From 7cd92c21dd373486584066fe4630b10c9bbb85b7 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+Date: Thu, 29 Oct 2015 00:06:52 -0700
+Subject: [PATCH 2007/2008] ASan build fix for older OS versions without
+ os/trace.h
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+---
+ lib/sanitizer_common/sanitizer_mac.cc | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git llvm_master/projects/compiler-rt/lib/sanitizer_common/sanitizer_mac.cc macports_master/projects/compiler-rt/lib/sanitizer_common/sanitizer_mac.cc
+index 951a48a..49e0c7c 100644
+--- llvm_master/projects/compiler-rt/lib/sanitizer_common/sanitizer_mac.cc
++++ macports_master/projects/compiler-rt/lib/sanitizer_common/sanitizer_mac.cc
+@@ -43,7 +43,14 @@ extern char **environ;
+ #include <mach-o/dyld.h>
+ #include <mach/mach.h>
+ #include <mach/vm_statistics.h>
++
++#if __has_include(<os/trace.h>)
++#define SANITIZER_OS_TRACE 1
+ #include <os/trace.h>
++#else
++#define SANITIZER_OS_TRACE 0
++#endif
++
+ #include <pthread.h>
+ #include <sched.h>
+ #include <signal.h>
+@@ -381,6 +388,7 @@ void WriteOneLineToSyslog(const char *s) {
+ }
+
+ void LogFullErrorReport(const char *buffer) {
++#if SANITIZER_OS_TRACE
+ // Log with os_trace. This will make it into the crash log.
+ if (GetMacosVersion() >= MACOS_VERSION_MAVERICKS) {
+ // os_trace requires the message (format parameter) to be a string literal.
+@@ -399,6 +407,7 @@ void LogFullErrorReport(const char *buffer) {
+ if (common_flags()->log_to_syslog)
+ os_trace("Consult syslog for more information.");
+ }
++#endif
+
+ // Log to syslog.
+ // The logging on OS X may call pthread_create so we need the threading
+--
+2.6.2
+
</ins></span></pre></div>
<a id="trunkdportslangllvm38files2007SavetheASanreportintheOSXcrashlogpatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/lang/llvm-3.8/files/2007-Save-the-ASan-report-in-the-OS-X-crash-log.patch (141827 => 141828)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.8/files/2007-Save-the-ASan-report-in-the-OS-X-crash-log.patch 2015-10-29 15:12:48 UTC (rev 141827)
+++ trunk/dports/lang/llvm-3.8/files/2007-Save-the-ASan-report-in-the-OS-X-crash-log.patch 2015-10-29 15:20:41 UTC (rev 141828)
</span><span class="lines">@@ -1,65 +0,0 @@
</span><del>-From a08e5cb1b4ca37e33ae8efa8d39a7f90931e8d7f 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>
----
- lib/asan/asan_report.cc | 27 +++++++++++++++++++++++++++
- 1 file changed, 27 insertions(+)
-
-diff --git llvm_master/projects/compiler-rt/lib/asan/asan_report.cc macports_master/projects/compiler-rt/lib/asan/asan_report.cc
-index 957ac14..0ee03b9 100644
---- llvm_master/projects/compiler-rt/lib/asan/asan_report.cc
-+++ macports_master/projects/compiler-rt/lib/asan/asan_report.cc
-@@ -24,6 +24,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
-@@ -46,6 +58,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);
-@@ -664,6 +686,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
-
</del></span></pre></div>
<a id="trunkdportslangllvm38files2008SavetheASanreportintheOSXcrashlogpatch"></a>
<div class="addfile"><h4>Added: trunk/dports/lang/llvm-3.8/files/2008-Save-the-ASan-report-in-the-OS-X-crash-log.patch (0 => 141828)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.8/files/2008-Save-the-ASan-report-in-the-OS-X-crash-log.patch (rev 0)
+++ trunk/dports/lang/llvm-3.8/files/2008-Save-the-ASan-report-in-the-OS-X-crash-log.patch 2015-10-29 15:20:41 UTC (rev 141828)
</span><span class="lines">@@ -0,0 +1,44 @@
</span><ins>+From 88dd2b10bcb87f6664a8e4784afe3876cd0c4cf4 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+Date: Thu, 29 Oct 2015 00:26:24 -0700
+Subject: [PATCH 2008/2008] Save the ASan report in the OS X crash log
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+---
+ lib/sanitizer_common/sanitizer_mac.cc | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+diff --git llvm_master/projects/compiler-rt/lib/sanitizer_common/sanitizer_mac.cc macports_master/projects/compiler-rt/lib/sanitizer_common/sanitizer_mac.cc
+index 49e0c7c..3f22d2f 100644
+--- llvm_master/projects/compiler-rt/lib/sanitizer_common/sanitizer_mac.cc
++++ macports_master/projects/compiler-rt/lib/sanitizer_common/sanitizer_mac.cc
+@@ -62,6 +62,12 @@ extern char **environ;
+ #include <sys/types.h>
+ #include <unistd.h>
+
++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");
++}
++
+ namespace __sanitizer {
+
+ #include "sanitizer_syscall_generic.inc"
+@@ -409,6 +415,13 @@ void LogFullErrorReport(const char *buffer) {
+ }
+ #endif
+
++ // Save to CrashReporter if we're aborting
++ if (common_flags()->abort_on_error) {
++ internal_strncpy(__crashreporter_info_buff__, buffer, sizeof(__crashreporter_info_buff__));
++ __crashreporter_info_buff__[sizeof(__crashreporter_info_buff__)-1] = '\0';
++ RemoveANSIEscapeSequencesFromString(__crashreporter_info_buff__);
++ }
++
+ // Log to syslog.
+ // The logging on OS X may call pthread_create so we need the threading
+ // environment to be fully initialized. Also, this should never be called when
+--
+2.6.2
+
</ins></span></pre>
</div>
</div>
</body>
</html>