<!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>[142276] 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/142276">142276</a></dd>
<dt>Author</dt> <dd>jeremyhu@macports.org</dd>
<dt>Date</dt> <dd>2015-11-08 20:40:58 -0800 (Sun, 08 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>llvm-3.8: Revbump to <a href="https://trac.macports.org/changeset/252441">r252441</a> for more polly fixes</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportslangllvm38Portfile">trunk/dports/lang/llvm-3.8/Portfile</a></li>
<li><a href="#trunkdportslangllvm38files1001MacPortsOnlyPrepareclangformatforreplacementwpatch">trunk/dports/lang/llvm-3.8/files/1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch</a></li>
<li><a href="#trunkdportslangllvm38files1002MacPortsOnlyFallbackonxcodebuildsdkwhenxcrunpatch">trunk/dports/lang/llvm-3.8/files/1002-MacPorts-Only-Fall-back-on-xcodebuild-sdk-when-xcrun.patch</a></li>
<li><a href="#trunkdportslangllvm38files1003MacPortsOnlyFixnameofscanviewexecutableinsidpatch">trunk/dports/lang/llvm-3.8/files/1003-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch</a></li>
<li><a href="#trunkdportslangllvm38files1004MacPortsOnlyRelocateclangresourcesusingllvmvepatch">trunk/dports/lang/llvm-3.8/files/1004-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch</a></li>
<li><a href="#trunkdportslangllvm38files1005Defaulttoppc7400forOSX105patch">trunk/dports/lang/llvm-3.8/files/1005-Default-to-ppc7400-for-OSX-10.5.patch</a></li>
<li><a href="#trunkdportslangllvm38files1006OnlycallsetpriorityPRIO_DARWIN_THREAD0PRIO_DARWpatch">trunk/dports/lang/llvm-3.8/files/1006-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch</a></li>
<li><a href="#trunkdportslangllvm38files1007DefaulttofragileObjCruntimewhentargetingdarwipatch">trunk/dports/lang/llvm-3.8/files/1007-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch</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>
<li><a href="#trunkdportslangllvm38files2007Addinternal_strlcatandinternal_strlcpypatch">trunk/dports/lang/llvm-3.8/files/2007-Add-internal_strlcat-and-internal_strlcpy.patch</a></li>
<li><a href="#trunkdportslangllvm38files2009SavetheASanreportintheOSXcrashlogpatch">trunk/dports/lang/llvm-3.8/files/2009-Save-the-ASan-report-in-the-OS-X-crash-log.patch</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportslangllvm38files2008cherrypickRemoveANSIEscapeSequencesFromStringfrompatch">trunk/dports/lang/llvm-3.8/files/2008-cherry-pick-RemoveANSIEscapeSequencesFromString-from.patch</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportslangllvm38files1008RevertSupportwatchOSandtvOSincompilerrtbuildpatch">trunk/dports/lang/llvm-3.8/files/1008-Revert-Support-watchOS-and-tvOS-in-compiler-rt-build.patch</a></li>
<li><a href="#trunkdportslangllvm38files2008ASanbuildfixforolderOSversionswithoutostracpatch">trunk/dports/lang/llvm-3.8/files/2008-ASan-build-fix-for-older-OS-versions-without-os-trac.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 (142275 => 142276)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.8/Portfile 2015-11-09 03:19:33 UTC (rev 142275)
+++ trunk/dports/lang/llvm-3.8/Portfile 2015-11-09 04:40:58 UTC (rev 142276)
</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 251899
</del><ins>+svn.revision 252441
</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">@@ -113,7 +113,6 @@
</span><span class="cx"> 1005-Default-to-ppc7400-for-OSX-10.5.patch \
</span><span class="cx"> 1006-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch \
</span><span class="cx"> 1007-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch \
</span><del>- 1008-Revert-Support-watchOS-and-tvOS-in-compiler-rt-build.patch \
</del><span class="cx"> 2001-MacPorts-Only-Comment-out-SL-cctools-workaround.patch \
</span><span class="cx"> 2002-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch \
</span><span class="cx"> 2003-Fall-back-on-xcodebuild-sdk-when-xcrun-sdk-is-not-su.patch \
</span><span class="lines">@@ -121,7 +120,7 @@
</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><span class="cx"> 2007-Add-internal_strlcat-and-internal_strlcpy.patch \
</span><del>- 2008-ASan-build-fix-for-older-OS-versions-without-os-trac.patch \
</del><ins>+ 2008-cherry-pick-RemoveANSIEscapeSequencesFromString-from.patch \
</ins><span class="cx"> 2009-Save-the-ASan-report-in-the-OS-X-crash-log.patch \
</span><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></pre></div>
<a id="trunkdportslangllvm38files1001MacPortsOnlyPrepareclangformatforreplacementwpatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/llvm-3.8/files/1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch (142275 => 142276)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.8/files/1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch 2015-11-09 03:19:33 UTC (rev 142275)
+++ trunk/dports/lang/llvm-3.8/files/1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch 2015-11-09 04:40:58 UTC (rev 142276)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><del>-From 3f6f89cbbbbb7868fc2c223391853732007a80d5 Mon Sep 17 00:00:00 2001
</del><ins>+From aaeb3eaf62090252c79e3c28ac2a7265cda1322a 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:50:24 -0800
</span><del>-Subject: [PATCH 1001/1008] MacPorts Only: Prepare clang-format for replacement
</del><ins>+Subject: [PATCH 1001/1007] MacPorts Only: Prepare clang-format for replacement
</ins><span class="cx"> with absolute path
</span><span class="cx">
</span><span class="cx"> Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span></span></pre></div>
<a id="trunkdportslangllvm38files1002MacPortsOnlyFallbackonxcodebuildsdkwhenxcrunpatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/llvm-3.8/files/1002-MacPorts-Only-Fall-back-on-xcodebuild-sdk-when-xcrun.patch (142275 => 142276)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.8/files/1002-MacPorts-Only-Fall-back-on-xcodebuild-sdk-when-xcrun.patch 2015-11-09 03:19:33 UTC (rev 142275)
+++ trunk/dports/lang/llvm-3.8/files/1002-MacPorts-Only-Fall-back-on-xcodebuild-sdk-when-xcrun.patch 2015-11-09 04:40:58 UTC (rev 142276)
</span><span class="lines">@@ -1,28 +1,24 @@
</span><del>-From 2d58a5970d53a83631adafb6decb9563f0623ab0 Mon Sep 17 00:00:00 2001
</del><ins>+From 0c55d7ac5fa11a79d49490fc67161a4045365a79 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:51:10 -0800
</span><del>-Subject: [PATCH 1002/1008] MacPorts Only: Fall back on xcodebuild -sdk when
</del><ins>+Subject: [PATCH 1002/1007] MacPorts Only: Fall back on xcodebuild -sdk when
</ins><span class="cx"> xcrun --sdk is not supported
</span><span class="cx">
</span><span class="cx"> Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span class="cx"> ---
</span><del>- runtime/compiler-rt/Makefile | 22 ++++++++++++++++------
- 1 file changed, 16 insertions(+), 6 deletions(-)
</del><ins>+ runtime/compiler-rt/Makefile | 14 ++++++++++++--
+ 1 file changed, 12 insertions(+), 2 deletions(-)
</ins><span class="cx">
</span><span class="cx"> diff --git llvm_master/tools/clang/runtime/compiler-rt/Makefile macports_master/tools/clang/runtime/compiler-rt/Makefile
</span><del>-index 029fe1e..33d21cc 100644
</del><ins>+index 55642a6..b6106d1 100644
</ins><span class="cx"> --- llvm_master/tools/clang/runtime/compiler-rt/Makefile
</span><span class="cx"> +++ macports_master/tools/clang/runtime/compiler-rt/Makefile
</span><del>-@@ -81,12 +81,22 @@ RuntimeLibrary.darwin.Configs := \
</del><ins>+@@ -81,8 +81,18 @@ RuntimeLibrary.darwin.Configs := \
</ins><span class="cx"> profile_osx.a \
</span><span class="cx"> ubsan_osx_dynamic.dylib
</span><span class="cx">
</span><span class="cx"> -IOS_SDK := $(shell xcrun --show-sdk-path -sdk iphoneos 2> /dev/null)
</span><span class="cx"> -IOSSIM_SDK := $(shell xcrun --show-sdk-path -sdk iphonesimulator 2> /dev/null)
</span><del>--TVOS_SDK := $(shell xcrun --show-sdk-path -sdk appletvos 2> /dev/null)
--TVOSSIM_SDK := $(shell xcrun --show-sdk-path -sdk appletvsimulator 2> /dev/null)
--WATCHOS_SDK := $(shell xcrun --show-sdk-path -sdk watchos 2> /dev/null)
--WATCHOSSIM_SDK := $(shell xcrun --show-sdk-path -sdk watchsimulator 2> /dev/null)
</del><span class="cx"> +XCRunSdkPath = \
</span><span class="cx"> + $(shell \
</span><span class="cx"> + result=`xcrun --sdk $(1) --show-sdk-path 2> /dev/null`; \
</span><span class="lines">@@ -35,13 +31,9 @@
</span><span class="cx"> +
</span><span class="cx"> +IOS_SDK := $(call XCRunSdkPath,iphoneos)
</span><span class="cx"> +IOSSIM_SDK := $(call XCRunSdkPath,iphonesimulator)
</span><del>-+TVOS_SDK := $(call XCRunSdkPath,appletvos)
-+TVOSSIM_SDK := $(call XCRunSdkPath,appletvsimulator)
-+WATCHOS_SDK := $(call XCRunSdkPath,watchos)
-+WATCHOSSIM_SDK := $(call XCRunSdkPath,watchsimulator)
</del><span class="cx">
</span><del>- LinkerSupportedArches = \
- $(shell \
</del><ins>+ ifneq ($(IOS_SDK)$(IOSSIM_SDK),)
+ RuntimeLibrary.darwin.Configs += ios.a profile_ios.a
</ins><span class="cx"> --
</span><span class="cx"> 2.6.2
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportslangllvm38files1003MacPortsOnlyFixnameofscanviewexecutableinsidpatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/llvm-3.8/files/1003-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch (142275 => 142276)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.8/files/1003-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch 2015-11-09 03:19:33 UTC (rev 142275)
+++ trunk/dports/lang/llvm-3.8/files/1003-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch 2015-11-09 04:40:58 UTC (rev 142276)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><del>-From bb9925177655401f9d6e1d13adbc39984c9cd507 Mon Sep 17 00:00:00 2001
</del><ins>+From 989de293fb54402977057d1b25672e6b2b588b98 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:55:27 -0800
</span><del>-Subject: [PATCH 1003/1008] MacPorts Only: Fix name of scan-view executable
</del><ins>+Subject: [PATCH 1003/1007] MacPorts Only: Fix name of scan-view executable
</ins><span class="cx"> inside scan-build
</span><span class="cx">
</span><span class="cx"> http://trac.macports.org/ticket/35006
</span></span></pre></div>
<a id="trunkdportslangllvm38files1004MacPortsOnlyRelocateclangresourcesusingllvmvepatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/llvm-3.8/files/1004-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch (142275 => 142276)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.8/files/1004-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch 2015-11-09 03:19:33 UTC (rev 142275)
+++ trunk/dports/lang/llvm-3.8/files/1004-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch 2015-11-09 04:40:58 UTC (rev 142276)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><del>-From 878d166ba7b512d22f78d23e51c7aa43f1506535 Mon Sep 17 00:00:00 2001
</del><ins>+From cf0f7ad6f095dce9c179dbac78d638e3c95ce206 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:58:25 -0800
</span><del>-Subject: [PATCH 1004/1008] MacPorts Only: Relocate clang resources using llvm
</del><ins>+Subject: [PATCH 1004/1007] MacPorts Only: Relocate clang resources using llvm
</ins><span class="cx"> version
</span><span class="cx">
</span><span class="cx"> Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> INSTHEADERS := $(addprefix $(PROJ_headers)/, $(HEADERS))
</span><span class="cx"> INSTHEADERS += $(PROJ_headers)/arm_neon.h
</span><span class="cx"> diff --git llvm_master/tools/clang/runtime/compiler-rt/Makefile macports_master/tools/clang/runtime/compiler-rt/Makefile
</span><del>-index 33d21cc..5d459f6 100644
</del><ins>+index b6106d1..2ce50d9 100644
</ins><span class="cx"> --- llvm_master/tools/clang/runtime/compiler-rt/Makefile
</span><span class="cx"> +++ macports_master/tools/clang/runtime/compiler-rt/Makefile
</span><span class="cx"> @@ -18,9 +18,10 @@ include $(CLANG_LEVEL)/Makefile
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx">
</span><span class="cx"> ResourceLibDir := $(ResourceDir)/lib
</span><span class="cx"> ResourceIncludeDir := $(ResourceDir)/include
</span><del>-@@ -292,9 +293,21 @@ $(PROJ_resources_include)/sanitizer: $(ResourceIncludeDir)/sanitizer $(PROJ_reso
</del><ins>+@@ -259,9 +260,21 @@ $(PROJ_resources_include)/sanitizer: $(ResourceIncludeDir)/sanitizer $(PROJ_reso
</ins><span class="cx"> RuntimeHeaderInstall: $(PROJ_resources_include)/sanitizer
</span><span class="cx"> .PHONY: RuntimeHeaderInstall
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportslangllvm38files1005Defaulttoppc7400forOSX105patch"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/llvm-3.8/files/1005-Default-to-ppc7400-for-OSX-10.5.patch (142275 => 142276)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.8/files/1005-Default-to-ppc7400-for-OSX-10.5.patch 2015-11-09 03:19:33 UTC (rev 142275)
+++ trunk/dports/lang/llvm-3.8/files/1005-Default-to-ppc7400-for-OSX-10.5.patch 2015-11-09 04:40:58 UTC (rev 142276)
</span><span class="lines">@@ -1,14 +1,14 @@
</span><del>-From c916bf99b3046a70bcf58ee01d73a9de90a04be2 Mon Sep 17 00:00:00 2001
</del><ins>+From d2106a67550412ec070e8b6470848fcffb6fde08 Mon Sep 17 00:00:00 2001
</ins><span class="cx"> From: Iain Sandoe <iain@codesourcery.com>
</span><span class="cx"> Date: Sun, 27 Jul 2014 20:35:16 +0100
</span><del>-Subject: [PATCH 1005/1008] Default to ppc7400 for OSX 10.5+
</del><ins>+Subject: [PATCH 1005/1007] Default to ppc7400 for OSX 10.5+
</ins><span class="cx">
</span><span class="cx"> ---
</span><span class="cx"> lib/Driver/Tools.cpp | 3 +++
</span><span class="cx"> 1 file changed, 3 insertions(+)
</span><span class="cx">
</span><span class="cx"> diff --git llvm_master/tools/clang/lib/Driver/Tools.cpp macports_master/tools/clang/lib/Driver/Tools.cpp
</span><del>-index 34dfa4f..6114cd2 100644
</del><ins>+index 03d4c6b..d3ba38d 100644
</ins><span class="cx"> --- llvm_master/tools/clang/lib/Driver/Tools.cpp
</span><span class="cx"> +++ macports_master/tools/clang/lib/Driver/Tools.cpp
</span><span class="cx"> @@ -1621,6 +1621,9 @@ static std::string getCPUName(const ArgList &Args, const llvm::Triple &T,
</span></span></pre></div>
<a id="trunkdportslangllvm38files1006OnlycallsetpriorityPRIO_DARWIN_THREAD0PRIO_DARWpatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/llvm-3.8/files/1006-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch (142275 => 142276)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.8/files/1006-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch 2015-11-09 03:19:33 UTC (rev 142275)
+++ trunk/dports/lang/llvm-3.8/files/1006-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch 2015-11-09 04:40:58 UTC (rev 142276)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><del>-From 21e7142c81b7a131e456637a78442f2f22b9d766 Mon Sep 17 00:00:00 2001
</del><ins>+From 598808c8e95f6b4ec744dbc01678bb06067635e3 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:08:57 -0800
</span><del>-Subject: [PATCH 1006/1008] Only call setpriority(PRIO_DARWIN_THREAD, 0,
</del><ins>+Subject: [PATCH 1006/1007] Only call setpriority(PRIO_DARWIN_THREAD, 0,
</ins><span class="cx"> PRIO_DARWIN_BG) if it is available
</span><span class="cx">
</span><span class="cx"> Tiger and earlier versions of darwin do not support this.
</span><span class="lines">@@ -12,10 +12,10 @@
</span><span class="cx"> 1 file changed, 1 insertion(+), 1 deletion(-)
</span><span class="cx">
</span><span class="cx"> diff --git llvm_master/tools/clang/tools/libclang/CIndex.cpp macports_master/tools/clang/tools/libclang/CIndex.cpp
</span><del>-index be53b82..a697342 100644
</del><ins>+index ac6f98d..c068f3b 100644
</ins><span class="cx"> --- llvm_master/tools/clang/tools/libclang/CIndex.cpp
</span><span class="cx"> +++ macports_master/tools/clang/tools/libclang/CIndex.cpp
</span><del>-@@ -7207,7 +7207,7 @@ void clang::setThreadBackgroundPriority() {
</del><ins>+@@ -7208,7 +7208,7 @@ void clang::setThreadBackgroundPriority() {
</ins><span class="cx"> if (getenv("LIBCLANG_BGPRIO_DISABLE"))
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportslangllvm38files1007DefaulttofragileObjCruntimewhentargetingdarwipatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/llvm-3.8/files/1007-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch (142275 => 142276)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.8/files/1007-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch 2015-11-09 03:19:33 UTC (rev 142275)
+++ trunk/dports/lang/llvm-3.8/files/1007-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch 2015-11-09 04:40:58 UTC (rev 142276)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><del>-From 214d8b5ca74db21030bfb3a2b280d3ca7f57e068 Mon Sep 17 00:00:00 2001
</del><ins>+From 59eb83d2f52133802905ff87cedcd7d10a864e1f Mon Sep 17 00:00:00 2001
</ins><span class="cx"> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span class="cx"> Date: Tue, 20 Jan 2015 00:09:16 -0800
</span><del>-Subject: [PATCH 1007/1008] Default to fragile ObjC runtime when targeting
</del><ins>+Subject: [PATCH 1007/1007] Default to fragile ObjC runtime when targeting
</ins><span class="cx"> darwin/ppc
</span><span class="cx">
</span><span class="cx"> Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span></span></pre></div>
<a id="trunkdportslangllvm38files1008RevertSupportwatchOSandtvOSincompilerrtbuildpatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/lang/llvm-3.8/files/1008-Revert-Support-watchOS-and-tvOS-in-compiler-rt-build.patch (142275 => 142276)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.8/files/1008-Revert-Support-watchOS-and-tvOS-in-compiler-rt-build.patch 2015-11-09 03:19:33 UTC (rev 142275)
+++ trunk/dports/lang/llvm-3.8/files/1008-Revert-Support-watchOS-and-tvOS-in-compiler-rt-build.patch 2015-11-09 04:40:58 UTC (rev 142276)
</span><span class="lines">@@ -1,53 +0,0 @@
</span><del>-From c769dd559b92afb9cc8ffc7fc31d4194ad3f01d0 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-Date: Tue, 3 Nov 2015 00:36:29 -0800
-Subject: [PATCH 1008/1008] Revert "Support watchOS and tvOS in compiler-rt
- builds"
-
-This reverts commit 6218f42f568f3dd1f31a25572eb865a704c512aa.
----
- runtime/compiler-rt/Makefile | 21 ---------------------
- 1 file changed, 21 deletions(-)
-
-diff --git llvm_master/tools/clang/runtime/compiler-rt/Makefile macports_master/tools/clang/runtime/compiler-rt/Makefile
-index 5d459f6..47e5704 100644
---- llvm_master/tools/clang/runtime/compiler-rt/Makefile
-+++ macports_master/tools/clang/runtime/compiler-rt/Makefile
-@@ -94,10 +94,6 @@ XCRunSdkPath = \
-
- IOS_SDK := $(call XCRunSdkPath,iphoneos)
- IOSSIM_SDK := $(call XCRunSdkPath,iphonesimulator)
--TVOS_SDK := $(call XCRunSdkPath,appletvos)
--TVOSSIM_SDK := $(call XCRunSdkPath,appletvsimulator)
--WATCHOS_SDK := $(call XCRunSdkPath,watchos)
--WATCHOSSIM_SDK := $(call XCRunSdkPath,watchsimulator)
-
- LinkerSupportedArches = \
- $(shell \
-@@ -129,23 +125,6 @@ RuntimeLibrary.darwin.Configs += asan_iossim_dynamic.dylib \
- ubsan_iossim_dynamic.dylib
- endif
-
--
--ifneq ($(TVOS_SDK)$(TVOSSIM_SDK),)
--RuntimeLibrary.darwin.Configs += tvos.a profile_tvos.a
--endif
--
--ifneq ($(TVOS_SDK),)
--RuntimeLibrary.darwin.Configs += cc_kext_tvos.a
--endif
--
--ifneq ($(WATCHOS_SDK)$(WATCHOSSIM_SDK),)
--RuntimeLibrary.darwin.Configs += watchos.a profile_watchos.a
--endif
--
--ifneq ($(WATCHOS_SDK),)
--RuntimeLibrary.darwin.Configs += cc_kext_watchos.a
--endif
--
- RuntimeLibrary.macho_embedded.Configs += \
- soft_static.a soft_pic.a
- endif
---
-2.6.2
-
</del></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 (142275 => 142276)</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-11-09 03:19:33 UTC (rev 142275)
+++ trunk/dports/lang/llvm-3.8/files/2001-MacPorts-Only-Comment-out-SL-cctools-workaround.patch 2015-11-09 04:40:58 UTC (rev 142276)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-From d2b296ccf11795a4285193428d24792fe3cb56ad Mon Sep 17 00:00:00 2001
</del><ins>+From 12bfbb3d727b327eae4537e58630b3b315ac9ad1 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><span class="cx"> Subject: [PATCH 2001/2009] MacPorts Only: Comment out SL cctools workaround
</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 (142275 => 142276)</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-11-09 03:19:33 UTC (rev 142275)
+++ trunk/dports/lang/llvm-3.8/files/2002-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch 2015-11-09 04:40:58 UTC (rev 142276)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-From cbe667aa54b998d43aa7e7a3cd29ca8f27453abd Mon Sep 17 00:00:00 2001
</del><ins>+From 2def671886c29b75b57706f1b5219d4369415d58 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><span class="cx"> Subject: [PATCH 2002/2009] Update CheckArches to fallback on Intel/ppc if ld
</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 (142275 => 142276)</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-11-09 03:19:33 UTC (rev 142275)
+++ trunk/dports/lang/llvm-3.8/files/2003-Fall-back-on-xcodebuild-sdk-when-xcrun-sdk-is-not-su.patch 2015-11-09 04:40:58 UTC (rev 142276)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-From e13a535302239c487d3bb5ce5b34bb1b6695f091 Mon Sep 17 00:00:00 2001
</del><ins>+From 963da700c153dacb5427731f237b8a0cef293d32 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><span class="cx"> Subject: [PATCH 2003/2009] Fall back on xcodebuild -sdk when xcrun --sdk is
</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 (142275 => 142276)</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-11-09 03:19:33 UTC (rev 142275)
+++ trunk/dports/lang/llvm-3.8/files/2004-On-darwin-build-ppc-slices-of-the-compiler-runtime-i.patch 2015-11-09 04:40:58 UTC (rev 142276)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-From 77a697e1fc15f2120b41fd44e62886624f15a47e Mon Sep 17 00:00:00 2001
</del><ins>+From 8ce0328a4f41b9441500b743f567c583a93c7afc 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><span class="cx"> Subject: [PATCH 2004/2009] On darwin, build ppc slices of the compiler runtime
</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 (142275 => 142276)</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-11-09 03:19:33 UTC (rev 142275)
+++ trunk/dports/lang/llvm-3.8/files/2005-MacPorts-Only-Don-t-build-x86_64h-slice-of-compiler-.patch 2015-11-09 04:40:58 UTC (rev 142276)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-From ea53b2fabf499870a51c8a8ec0de22a33193613a Mon Sep 17 00:00:00 2001
</del><ins>+From 967c9eb2c1c2653e407b4f23cc28897abdd90a17 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><span class="cx"> Subject: [PATCH 2005/2009] MacPorts Only: Don't build x86_64h slice of
</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 (142275 => 142276)</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-11-09 03:19:33 UTC (rev 142275)
+++ trunk/dports/lang/llvm-3.8/files/2006-MacPorts-Only-Fix-regression-introduced-when-fixing-.patch 2015-11-09 04:40:58 UTC (rev 142276)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-From 4ed7840e485af03baffb9a983f613ac76fad66d3 Mon Sep 17 00:00:00 2001
</del><ins>+From bf448eb9a3c7393463bbafc7d31ae841feae9473 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><span class="cx"> Subject: [PATCH 2006/2009] MacPorts Only: Fix regression introduced when
</span></span></pre></div>
<a id="trunkdportslangllvm38files2007Addinternal_strlcatandinternal_strlcpypatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/llvm-3.8/files/2007-Add-internal_strlcat-and-internal_strlcpy.patch (142275 => 142276)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.8/files/2007-Add-internal_strlcat-and-internal_strlcpy.patch 2015-11-09 03:19:33 UTC (rev 142275)
+++ trunk/dports/lang/llvm-3.8/files/2007-Add-internal_strlcat-and-internal_strlcpy.patch 2015-11-09 04:40:58 UTC (rev 142276)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-From 96bd13f1607e5ef51453571ab235d25441c3c67e Mon Sep 17 00:00:00 2001
</del><ins>+From a794fa173577559a2c307b3637042729b38a496b Mon Sep 17 00:00:00 2001
</ins><span class="cx"> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span class="cx"> Date: Thu, 29 Oct 2015 09:36:42 -0700
</span><span class="cx"> Subject: [PATCH 2007/2009] Add internal_strlcat and internal_strlcpy
</span></span></pre></div>
<a id="trunkdportslangllvm38files2008ASanbuildfixforolderOSversionswithoutostracpatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/lang/llvm-3.8/files/2008-ASan-build-fix-for-older-OS-versions-without-os-trac.patch (142275 => 142276)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.8/files/2008-ASan-build-fix-for-older-OS-versions-without-os-trac.patch 2015-11-09 03:19:33 UTC (rev 142275)
+++ trunk/dports/lang/llvm-3.8/files/2008-ASan-build-fix-for-older-OS-versions-without-os-trac.patch 2015-11-09 04:40:58 UTC (rev 142276)
</span><span class="lines">@@ -1,49 +0,0 @@
</span><del>-From 0720aa9563fff6d8439938443575733adc28e40a 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 2008/2009] 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
-
</del></span></pre></div>
<a id="trunkdportslangllvm38files2008cherrypickRemoveANSIEscapeSequencesFromStringfrompatch"></a>
<div class="addfile"><h4>Added: trunk/dports/lang/llvm-3.8/files/2008-cherry-pick-RemoveANSIEscapeSequencesFromString-from.patch (0 => 142276)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.8/files/2008-cherry-pick-RemoveANSIEscapeSequencesFromString-from.patch (rev 0)
+++ trunk/dports/lang/llvm-3.8/files/2008-cherry-pick-RemoveANSIEscapeSequencesFromString-from.patch 2015-11-09 04:40:58 UTC (rev 142276)
</span><span class="lines">@@ -0,0 +1,73 @@
</span><ins>+From ea31f59f9ca1522479010f0cf62897a601b29a8a Mon Sep 17 00:00:00 2001
+From: Anna Zaks <ganna@apple.com>
+Date: Thu, 29 Oct 2015 09:56:12 -0700
+Subject: [PATCH 2008/2009] cherry-pick RemoveANSIEscapeSequencesFromString
+ from master
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+(cherry picked from commit 40a6da60a1a29ef72a2f89eb42ea9543b295bc81)
+---
+ lib/sanitizer_common/sanitizer_common.cc | 34 ++++++++++++++++++++++++++++++++
+ lib/sanitizer_common/sanitizer_common.h | 1 +
+ 2 files changed, 35 insertions(+)
+
+diff --git llvm_master/projects/compiler-rt/lib/sanitizer_common/sanitizer_common.cc macports_master/projects/compiler-rt/lib/sanitizer_common/sanitizer_common.cc
+index b40a457..ba9779b 100644
+--- llvm_master/projects/compiler-rt/lib/sanitizer_common/sanitizer_common.cc
++++ macports_master/projects/compiler-rt/lib/sanitizer_common/sanitizer_common.cc
+@@ -295,6 +295,40 @@ void ReportErrorSummary(const char *error_type, const AddressInfo &info) {
+ }
+ #endif
+
++// Removes the ANSI escape sequences from the input string (in-place).
++void RemoveANSIEscapeSequencesFromString(char *str) {
++ if (!str)
++ return;
++
++ // We are going to remove the escape sequences in place.
++ char *s = str;
++ char *z = str;
++ while (*s != '\0') {
++ CHECK_GE(s, z);
++ // Skip over ANSI escape sequences with pointer 's'.
++ if (*s == '\033' && *(s + 1) == '[') {
++ s = internal_strchrnul(s, 'm');
++ if (*s == '\0') {
++ break;
++ }
++ s++;
++ continue;
++ }
++ // 's' now points at a character we want to keep. Copy over the buffer
++ // content if the escape sequence has been perviously skipped andadvance
++ // both pointers.
++ if (s != z)
++ *z = *s;
++
++ // If we have not seen an escape sequence, just advance both pointers.
++ z++;
++ s++;
++ }
++
++ // Null terminate the string.
++ *z = '\0';
++}
++
+ void LoadedModule::set(const char *module_name, uptr base_address) {
+ clear();
+ full_name_ = internal_strdup(module_name);
+diff --git llvm_master/projects/compiler-rt/lib/sanitizer_common/sanitizer_common.h macports_master/projects/compiler-rt/lib/sanitizer_common/sanitizer_common.h
+index 43cd2d0..7cc7ac3 100644
+--- llvm_master/projects/compiler-rt/lib/sanitizer_common/sanitizer_common.h
++++ macports_master/projects/compiler-rt/lib/sanitizer_common/sanitizer_common.h
+@@ -162,6 +162,7 @@ void SetLowLevelAllocateCallback(LowLevelAllocateCallback callback);
+ // IO
+ void RawWrite(const char *buffer);
+ bool ColorizeReports();
++void RemoveANSIEscapeSequencesFromString(char *buffer);
+ void Printf(const char *format, ...);
+ void Report(const char *format, ...);
+ void SetPrintfAndReportCallback(void (*callback)(const char *));
+--
+2.6.2
+
</ins></span></pre></div>
<a id="trunkdportslangllvm38files2009SavetheASanreportintheOSXcrashlogpatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/llvm-3.8/files/2009-Save-the-ASan-report-in-the-OS-X-crash-log.patch (142275 => 142276)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.8/files/2009-Save-the-ASan-report-in-the-OS-X-crash-log.patch 2015-11-09 03:19:33 UTC (rev 142275)
+++ trunk/dports/lang/llvm-3.8/files/2009-Save-the-ASan-report-in-the-OS-X-crash-log.patch 2015-11-09 04:40:58 UTC (rev 142276)
</span><span class="lines">@@ -1,42 +1,65 @@
</span><del>-From cd722f6af128170af07c4a102c3621f4eb409884 Mon Sep 17 00:00:00 2001
</del><ins>+From bcad97029ddda936676a23f9376e3d4c0d096cca Mon Sep 17 00:00:00 2001
</ins><span class="cx"> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><del>-Date: Thu, 29 Oct 2015 00:26:24 -0700
</del><ins>+Date: Sun, 25 Oct 2015 16:03:00 -0700
</ins><span class="cx"> Subject: [PATCH 2009/2009] Save the ASan report in the OS X crash log
</span><span class="cx">
</span><span class="cx"> Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><ins>+(cherry picked from commit 2e0c223fc908606106fa5e87cb36d17d06663a4e)
</ins><span class="cx"> ---
</span><del>- lib/sanitizer_common/sanitizer_mac.cc | 11 +++++++++++
- 1 file changed, 11 insertions(+)
</del><ins>+ lib/asan/asan_report.cc | 26 ++++++++++++++++++++++++++
+ 1 file changed, 26 insertions(+)
</ins><span class="cx">
</span><del>-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..dd51813 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,11 @@ extern char **environ;
- #include <sys/types.h>
- #include <unistd.h>
</del><ins>+diff --git llvm_master/projects/compiler-rt/lib/asan/asan_report.cc macports_master/projects/compiler-rt/lib/asan/asan_report.cc
+index 957ac14..920fbc7 100644
+--- llvm_master/projects/compiler-rt/lib/asan/asan_report.cc
++++ macports_master/projects/compiler-rt/lib/asan/asan_report.cc
+@@ -24,6 +24,14 @@
+ #include "sanitizer_common/sanitizer_stackdepot.h"
+ #include "sanitizer_common/sanitizer_symbolizer.h"
</ins><span class="cx">
</span><ins>++// Apple CrashReporter support.
++#ifdef __APPLE__
</ins><span class="cx"> +extern "C" {
</span><del>-+static char *__crashreporter_info__ __attribute__((__used__)) = NULL;
</del><ins>++static char *__crashreporter_info__ __attribute__((__used__)) = 0;
</ins><span class="cx"> +asm (".desc ___crashreporter_info__, 0x10");
</span><span class="cx"> +}
</span><ins>++#endif
</ins><span class="cx"> +
</span><del>- namespace __sanitizer {
</del><ins>+ namespace __asan {
</ins><span class="cx">
</span><del>- #include "sanitizer_syscall_generic.inc"
-@@ -409,6 +414,12 @@ void LogFullErrorReport(const char *buffer) {
- }
- #endif
</del><ins>+ // -------------------- User-specified callbacks ----------------- {{{1
+@@ -46,6 +54,16 @@ static bool report_happened = false;
+ static ReportData report_data = {};
</ins><span class="cx">
</span><del>-+ // Save to CrashReporter if we're aborting
-+ if (common_flags()->abort_on_error) {
-+ __crashreporter_info__ = internal_strdup(buffer);
-+ RemoveANSIEscapeSequencesFromString(__crashreporter_info__);
</del><ins>+ 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;
</ins><span class="cx"> + }
</span><ins>++#endif
</ins><span class="cx"> +
</span><del>- // 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
</del><ins>+ if (error_message_buffer) {
+ uptr length = internal_strlen(buffer);
+ CHECK_GE(error_message_buffer_size, error_message_buffer_pos);
+@@ -664,6 +682,14 @@ class ScopedInErrorReport {
+ // Print memory stats.
+ if (flags()->print_stats)
+ __asan_print_accumulated_stats();
++
++#ifdef __APPLE__
++ if (common_flags()->abort_on_error) {
++ __crashreporter_info__ = internal_strdup(error_message_buffer);
++ RemoveANSIEscapeSequencesFromString(__crashreporter_info__);
++ }
++#endif
++
+ if (error_report_callback) {
+ error_report_callback(error_message_buffer);
+ }
</ins><span class="cx"> --
</span><span class="cx"> 2.6.2
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>