<!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>[144733] 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/144733">144733</a></dd>
<dt>Author</dt> <dd>jeremyhu@macports.org</dd>
<dt>Date</dt> <dd>2016-01-16 12:27:08 -0800 (Sat, 16 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>llvm-3.8: Bump to current master and remove raise(), abort(), and __assert_rtn() overrides</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportslangllvm38Portfile">trunk/dports/lang/llvm-3.8/Portfile</a></li>
<li><a href="#trunkdportslangllvm38files0001SettheMachOCPUSubtypetoppc7400whentargetingpatch">trunk/dports/lang/llvm-3.8/files/0001-Set-the-Mach-O-CPU-Subtype-to-ppc7400-when-targeting.patch</a></li>
<li><a href="#trunkdportslangllvm38files0002DefineEXC_MASK_CRASHandMACH_EXCEPTION_CODESifthpatch">trunk/dports/lang/llvm-3.8/files/0002-Define-EXC_MASK_CRASH-and-MACH_EXCEPTION_CODES-if-th.patch</a></li>
<li><a href="#trunkdportslangllvm38files0003MacPortsOnlyUpdateinstalltargetsforclangsubpopatch">trunk/dports/lang/llvm-3.8/files/0003-MacPorts-Only-Update-install-targets-for-clang-subpo.patch</a></li>
<li><a href="#trunkdportslangllvm38files0004MacPortsOnlyUsefullpathforthedylibidinsteadpatch">trunk/dports/lang/llvm-3.8/files/0004-MacPorts-Only-Use-full-path-for-the-dylib-id-instead.patch</a></li>
<li><a href="#trunkdportslangllvm38files0005MacPortsOnlyDontembedthedeploymenttargetintpatch">trunk/dports/lang/llvm-3.8/files/0005-MacPorts-Only-Don-t-embed-the-deployment-target-in-t.patch</a></li>
<li><a href="#trunkdportslangllvm38files0006MacPortsOnlySkipcheckingforpythoninconfigurepatch">trunk/dports/lang/llvm-3.8/files/0006-MacPorts-Only-Skip-checking-for-python-in-configure.patch</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportslangllvm38files0007Removeoverrideofraiseabortand__assert_rtnpatch">trunk/dports/lang/llvm-3.8/files/0007-Remove-override-of-raise-abort-and-__assert_rtn.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 (144732 => 144733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.8/Portfile 2016-01-16 20:26:53 UTC (rev 144732)
+++ trunk/dports/lang/llvm-3.8/Portfile 2016-01-16 20:27:08 UTC (rev 144733)
</span><span class="lines">@@ -69,17 +69,17 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> fetch.type svn
</span><del>-svn.revision 257459
</del><ins>+svn.revision 257997
</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="cx"> set clang-modernize_rev ${svn.revision}
</span><span class="cx"> version ${llvm_version}-r${svn.revision}
</span><span class="cx"> revision 1
</span><del>-worksrcdir trunk
-svn.url https://llvm.org/svn/llvm-project/llvm/trunk
-#worksrcdir release_${llvm_version_no_dot}
-#svn.url https://llvm.org/svn/llvm-project/llvm/branches/release_${llvm_version_no_dot}
</del><ins>+#worksrcdir trunk
+#svn.url https://llvm.org/svn/llvm-project/llvm/trunk
+worksrcdir release_${llvm_version_no_dot}
+svn.url https://llvm.org/svn/llvm-project/llvm/branches/release_${llvm_version_no_dot}
</ins><span class="cx"> default_variants-append +assertions
</span><span class="cx"> default_variants-append +debug
</span><span class="cx">
</span><span class="lines">@@ -109,6 +109,7 @@
</span><span class="cx"> 0004-MacPorts-Only-Use-full-path-for-the-dylib-id-instead.patch \
</span><span class="cx"> 0005-MacPorts-Only-Don-t-embed-the-deployment-target-in-t.patch \
</span><span class="cx"> 0006-MacPorts-Only-Skip-checking-for-python-in-configure.patch \
</span><ins>+ 0007-Remove-override-of-raise-abort-and-__assert_rtn.patch \
</ins><span class="cx"> llvm-skip-unittests.patch
</span><span class="cx">
</span><span class="cx"> if {${subport} eq "clang-${llvm_version}"} {
</span></span></pre></div>
<a id="trunkdportslangllvm38files0001SettheMachOCPUSubtypetoppc7400whentargetingpatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/llvm-3.8/files/0001-Set-the-Mach-O-CPU-Subtype-to-ppc7400-when-targeting.patch (144732 => 144733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.8/files/0001-Set-the-Mach-O-CPU-Subtype-to-ppc7400-when-targeting.patch 2016-01-16 20:26:53 UTC (rev 144732)
+++ trunk/dports/lang/llvm-3.8/files/0001-Set-the-Mach-O-CPU-Subtype-to-ppc7400-when-targeting.patch 2016-01-16 20:27:08 UTC (rev 144733)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><del>-From f16c7c7c57b0c1c0c319dcfd2fc75b6f74754d77 Mon Sep 17 00:00:00 2001
</del><ins>+From 6bba00c71e59ac9cd2db1e630fe4a94b7451a220 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 09:03:43 -0800
</span><del>-Subject: [PATCH 1/6] Set the Mach-O CPU Subtype to ppc7400 when targeting
</del><ins>+Subject: [PATCH 1/7] Set the Mach-O CPU Subtype to ppc7400 when targeting
</ins><span class="cx"> Leopard
</span><span class="cx">
</span><span class="cx"> http://llvm.org/bugs/show_bug.cgi?id=18463
</span><span class="lines">@@ -11,10 +11,10 @@
</span><span class="cx"> lib/Target/PowerPC/MCTargetDesc/PPCAsmBackend.cpp | 13 ++++++++++---
</span><span class="cx"> 1 file changed, 10 insertions(+), 3 deletions(-)
</span><span class="cx">
</span><del>-diff --git llvm_master/lib/Target/PowerPC/MCTargetDesc/PPCAsmBackend.cpp macports_master/lib/Target/PowerPC/MCTargetDesc/PPCAsmBackend.cpp
</del><ins>+diff --git llvm_release_38/lib/Target/PowerPC/MCTargetDesc/PPCAsmBackend.cpp macports_release_38/lib/Target/PowerPC/MCTargetDesc/PPCAsmBackend.cpp
</ins><span class="cx"> index b6dd595..11a7953 100644
</span><del>---- llvm_master/lib/Target/PowerPC/MCTargetDesc/PPCAsmBackend.cpp
-+++ macports_master/lib/Target/PowerPC/MCTargetDesc/PPCAsmBackend.cpp
</del><ins>+--- llvm_release_38/lib/Target/PowerPC/MCTargetDesc/PPCAsmBackend.cpp
++++ macports_release_38/lib/Target/PowerPC/MCTargetDesc/PPCAsmBackend.cpp
</ins><span class="cx"> @@ -201,16 +201,23 @@ public:
</span><span class="cx"> // FIXME: This should be in a separate file.
</span><span class="cx"> namespace {
</span><span class="lines">@@ -51,5 +51,5 @@
</span><span class="cx"> uint8_t OSABI = MCELFObjectTargetWriter::getOSABI(TT.getOS());
</span><span class="cx"> bool IsLittleEndian = TT.getArch() == Triple::ppc64le;
</span><span class="cx"> --
</span><del>-2.4.5
</del><ins>+2.7.0
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkdportslangllvm38files0002DefineEXC_MASK_CRASHandMACH_EXCEPTION_CODESifthpatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/llvm-3.8/files/0002-Define-EXC_MASK_CRASH-and-MACH_EXCEPTION_CODES-if-th.patch (144732 => 144733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.8/files/0002-Define-EXC_MASK_CRASH-and-MACH_EXCEPTION_CODES-if-th.patch 2016-01-16 20:26:53 UTC (rev 144732)
+++ trunk/dports/lang/llvm-3.8/files/0002-Define-EXC_MASK_CRASH-and-MACH_EXCEPTION_CODES-if-th.patch 2016-01-16 20:27:08 UTC (rev 144733)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><del>-From 926188bfdadd442ec13728899368293231fd94d7 Mon Sep 17 00:00:00 2001
</del><ins>+From 1c7867cfc6dd0ebf1450001d634a7e7e0a313e6a Mon Sep 17 00:00:00 2001
</ins><span class="cx"> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span class="cx"> Date: Sun, 18 Jan 2015 11:18:13 -0800
</span><del>-Subject: [PATCH 2/6] Define EXC_MASK_CRASH and MACH_EXCEPTION_CODES if they're
</del><ins>+Subject: [PATCH 2/7] Define EXC_MASK_CRASH and MACH_EXCEPTION_CODES if they're
</ins><span class="cx"> not defined in the SDK
</span><span class="cx">
</span><span class="cx"> The 10.4 SDK does not define these macros
</span><span class="lines">@@ -11,11 +11,11 @@
</span><span class="cx"> lib/Support/Unix/Signals.inc | 9 +++++++++
</span><span class="cx"> 1 file changed, 9 insertions(+)
</span><span class="cx">
</span><del>-diff --git llvm_master/lib/Support/Unix/Signals.inc macports_master/lib/Support/Unix/Signals.inc
-index bfe2a3a..adcec0c 100644
---- llvm_master/lib/Support/Unix/Signals.inc
-+++ macports_master/lib/Support/Unix/Signals.inc
-@@ -502,6 +502,15 @@ void llvm::sys::PrintStackTraceOnErrorSignal(bool DisableCrashReporting) {
</del><ins>+diff --git llvm_release_38/lib/Support/Unix/Signals.inc macports_release_38/lib/Support/Unix/Signals.inc
+index 061cdb3..4d687b3 100644
+--- llvm_release_38/lib/Support/Unix/Signals.inc
++++ macports_release_38/lib/Support/Unix/Signals.inc
+@@ -387,6 +387,15 @@ void llvm::sys::PrintStackTraceOnErrorSignal(bool DisableCrashReporting) {
</ins><span class="cx"> AddSignalHandler(PrintStackTraceSignalHandler, nullptr);
</span><span class="cx">
</span><span class="cx"> #if defined(__APPLE__) && defined(ENABLE_CRASH_OVERRIDES)
</span><span class="lines">@@ -32,5 +32,5 @@
</span><span class="cx"> if (DisableCrashReporting || getenv("LLVM_DISABLE_CRASH_REPORT")) {
</span><span class="cx"> mach_port_t self = mach_task_self();
</span><span class="cx"> --
</span><del>-2.4.5
</del><ins>+2.7.0
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkdportslangllvm38files0003MacPortsOnlyUpdateinstalltargetsforclangsubpopatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/llvm-3.8/files/0003-MacPorts-Only-Update-install-targets-for-clang-subpo.patch (144732 => 144733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.8/files/0003-MacPorts-Only-Update-install-targets-for-clang-subpo.patch 2016-01-16 20:26:53 UTC (rev 144732)
+++ trunk/dports/lang/llvm-3.8/files/0003-MacPorts-Only-Update-install-targets-for-clang-subpo.patch 2016-01-16 20:27:08 UTC (rev 144733)
</span><span class="lines">@@ -1,17 +1,17 @@
</span><del>-From f6ed98762356a8013899b2b4deee7584c2e1c396 Mon Sep 17 00:00:00 2001
</del><ins>+From 6719d80f133381ed543e73ef853ab326e0445657 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 16:33:09 -0800
</span><del>-Subject: [PATCH 3/6] MacPorts Only: Update install targets for clang subport
</del><ins>+Subject: [PATCH 3/7] MacPorts Only: Update install targets for clang subport
</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"> Makefile | 6 ++++--
</span><span class="cx"> 1 file changed, 4 insertions(+), 2 deletions(-)
</span><span class="cx">
</span><del>-diff --git llvm_master/Makefile macports_master/Makefile
</del><ins>+diff --git llvm_release_38/Makefile macports_release_38/Makefile
</ins><span class="cx"> index 2b9468a..19fbfdc 100644
</span><del>---- llvm_master/Makefile
-+++ macports_master/Makefile
</del><ins>+--- llvm_release_38/Makefile
++++ macports_release_38/Makefile
</ins><span class="cx"> @@ -70,9 +70,11 @@ ifeq ($(MAKECMDGOALS),install-clang)
</span><span class="cx"> DIRS := tools/clang/tools/driver tools/clang/lib/Headers \
</span><span class="cx"> tools/clang/tools/libclang \
</span><span class="lines">@@ -27,5 +27,5 @@
</span><span class="cx"> NO_INSTALL = 1
</span><span class="cx"> endif
</span><span class="cx"> --
</span><del>-2.4.5
</del><ins>+2.7.0
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkdportslangllvm38files0004MacPortsOnlyUsefullpathforthedylibidinsteadpatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/llvm-3.8/files/0004-MacPorts-Only-Use-full-path-for-the-dylib-id-instead.patch (144732 => 144733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.8/files/0004-MacPorts-Only-Use-full-path-for-the-dylib-id-instead.patch 2016-01-16 20:26:53 UTC (rev 144732)
+++ trunk/dports/lang/llvm-3.8/files/0004-MacPorts-Only-Use-full-path-for-the-dylib-id-instead.patch 2016-01-16 20:27:08 UTC (rev 144733)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><del>-From 9e8b2808ef169b554819db23add3acc5ae33e984 Mon Sep 17 00:00:00 2001
</del><ins>+From 23339e9b32d7456ec6a964f9cda01dac78f1128d 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 16:34:41 -0800
</span><del>-Subject: [PATCH 4/6] MacPorts Only: Use full path for the dylib id instead of
</del><ins>+Subject: [PATCH 4/7] MacPorts Only: Use full path for the dylib id instead of
</ins><span class="cx"> @rpath
</span><span class="cx">
</span><span class="cx"> Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span class="lines">@@ -9,11 +9,11 @@
</span><span class="cx"> Makefile.rules | 7 ++++++-
</span><span class="cx"> 1 file changed, 6 insertions(+), 1 deletion(-)
</span><span class="cx">
</span><del>-diff --git llvm_master/Makefile.rules macports_master/Makefile.rules
-index 24cac3b..8775589 100644
---- llvm_master/Makefile.rules
-+++ macports_master/Makefile.rules
-@@ -598,7 +598,12 @@ ifneq ($(HOST_OS), $(filter $(HOST_OS), Cygwin MingW))
</del><ins>+diff --git llvm_release_38/Makefile.rules macports_release_38/Makefile.rules
+index a67aef7..def94c0 100644
+--- llvm_release_38/Makefile.rules
++++ macports_release_38/Makefile.rules
+@@ -600,7 +600,12 @@ ifneq ($(HOST_OS), $(filter $(HOST_OS), Cygwin MingW))
</ins><span class="cx"> ifneq ($(HOST_OS),Darwin)
</span><span class="cx"> LD.Flags += $(RPATH) -Wl,'$$ORIGIN'
</span><span class="cx"> else
</span><span class="lines">@@ -28,5 +28,5 @@
</span><span class="cx"> endif
</span><span class="cx"> endif
</span><span class="cx"> --
</span><del>-2.4.5
</del><ins>+2.7.0
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkdportslangllvm38files0005MacPortsOnlyDontembedthedeploymenttargetintpatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/llvm-3.8/files/0005-MacPorts-Only-Don-t-embed-the-deployment-target-in-t.patch (144732 => 144733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.8/files/0005-MacPorts-Only-Don-t-embed-the-deployment-target-in-t.patch 2016-01-16 20:26:53 UTC (rev 144732)
+++ trunk/dports/lang/llvm-3.8/files/0005-MacPorts-Only-Don-t-embed-the-deployment-target-in-t.patch 2016-01-16 20:27:08 UTC (rev 144733)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><del>-From a735f95fdb9839db8c70a836998c591773b28cba Mon Sep 17 00:00:00 2001
</del><ins>+From 25522bcea0e4f092f32ed4ab05d34d37618623a8 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 16:41:30 -0800
</span><del>-Subject: [PATCH 5/6] MacPorts Only: Don't embed the deployment target in the
</del><ins>+Subject: [PATCH 5/7] MacPorts Only: Don't embed the deployment target in the
</ins><span class="cx"> asm when using -fno-integrated-as
</span><span class="cx">
</span><span class="cx"> http://llvm.org/bugs/show_bug.cgi?id=21636
</span><span class="lines">@@ -11,19 +11,19 @@
</span><span class="cx"> lib/CodeGen/AsmPrinter/AsmPrinter.cpp | 2 +-
</span><span class="cx"> 1 file changed, 1 insertion(+), 1 deletion(-)
</span><span class="cx">
</span><del>-diff --git llvm_master/lib/CodeGen/AsmPrinter/AsmPrinter.cpp macports_master/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
-index b574a51..f821a9f 100644
---- llvm_master/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
-+++ macports_master/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
-@@ -189,7 +189,7 @@ bool AsmPrinter::doInitialization(Module &M) {
- // use the directive, where it would need the same conditionalization
</del><ins>+diff --git llvm_release_38/lib/CodeGen/AsmPrinter/AsmPrinter.cpp macports_release_38/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
+index 5f67d3d..8824bd3 100644
+--- llvm_release_38/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
++++ macports_release_38/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
+@@ -193,7 +193,7 @@ bool AsmPrinter::doInitialization(Module &M) {
</ins><span class="cx"> // anyway.
</span><span class="cx"> Triple TT(getTargetTriple());
</span><del>-- if (TT.isOSDarwin()) {
-+ if (TT.isOSDarwin() && MAI->useIntegratedAssembler()) {
</del><ins>+ // If there is a version specified, Major will be non-zero.
+- if (TT.isOSDarwin() && TT.getOSMajorVersion() != 0) {
++ if (TT.isOSDarwin() && TT.getOSMajorVersion() != 0 && MAI->useIntegratedAssembler()) {
</ins><span class="cx"> unsigned Major, Minor, Update;
</span><del>- TT.getOSVersion(Major, Minor, Update);
- // If there is a version specified, Major will be non-zero.
</del><ins>+ MCVersionMinType VersionType;
+ if (TT.isWatchOS()) {
</ins><span class="cx"> --
</span><del>-2.4.5
</del><ins>+2.7.0
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkdportslangllvm38files0006MacPortsOnlySkipcheckingforpythoninconfigurepatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/llvm-3.8/files/0006-MacPorts-Only-Skip-checking-for-python-in-configure.patch (144732 => 144733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.8/files/0006-MacPorts-Only-Skip-checking-for-python-in-configure.patch 2016-01-16 20:26:53 UTC (rev 144732)
+++ trunk/dports/lang/llvm-3.8/files/0006-MacPorts-Only-Skip-checking-for-python-in-configure.patch 2016-01-16 20:27:08 UTC (rev 144733)
</span><span class="lines">@@ -1,19 +1,19 @@
</span><del>-From fd3f7b3caf4f4334352860052adf8f22c76ed9a4 Mon Sep 17 00:00:00 2001
</del><ins>+From bda46b8c958c6ad05fdfdb8baed181ac3d4a138f 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 16:43:00 -0800
</span><del>-Subject: [PATCH 6/6] MacPorts Only: Skip checking for python in configure
</del><ins>+Subject: [PATCH 6/7] MacPorts Only: Skip checking for python in configure
</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"> configure | 87 ---------------------------------------------------------------
</span><span class="cx"> 1 file changed, 87 deletions(-)
</span><span class="cx">
</span><del>-diff --git llvm_master/configure macports_master/configure
-index a5acfde..c5a3f61 100755
---- llvm_master/configure
-+++ macports_master/configure
-@@ -8468,93 +8468,6 @@ CXXFLAGS="$llvm_cv_old_cxxflags"
- echo "${ECHO_T}$NO_VARIADIC_MACROS $NO_MISSING_FIELD_INITIALIZERS $COVERED_SWITCH_DEFAULT $NO_UNINITIALIZED $NO_MAYBE_UNINITIALIZED $NO_COMMENT" >&6; }
</del><ins>+diff --git llvm_release_38/configure macports_release_38/configure
+index c94fb13..0d01ba1 100755
+--- llvm_release_38/configure
++++ macports_release_38/configure
+@@ -8483,93 +8483,6 @@ CXXFLAGS="$llvm_cv_old_cxxflags"
+ echo "${ECHO_T}$NO_VARIADIC_MACROS $MISSING_FIELD_INITIALIZERS $COVERED_SWITCH_DEFAULT $NO_UNINITIALIZED $NO_MAYBE_UNINITIALIZED $NO_COMMENT" >&6; }
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> -# Check whether --with-python was given.
</span><span class="lines">@@ -107,5 +107,5 @@
</span><span class="cx"> echo $ECHO_N "checking for sin in -lm... $ECHO_C" >&6; }
</span><span class="cx"> if test "${ac_cv_lib_m_sin+set}" = set; then
</span><span class="cx"> --
</span><del>-2.4.5
</del><ins>+2.7.0
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkdportslangllvm38files0007Removeoverrideofraiseabortand__assert_rtnpatch"></a>
<div class="addfile"><h4>Added: trunk/dports/lang/llvm-3.8/files/0007-Remove-override-of-raise-abort-and-__assert_rtn.patch (0 => 144733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.8/files/0007-Remove-override-of-raise-abort-and-__assert_rtn.patch (rev 0)
+++ trunk/dports/lang/llvm-3.8/files/0007-Remove-override-of-raise-abort-and-__assert_rtn.patch 2016-01-16 20:27:08 UTC (rev 144733)
</span><span class="lines">@@ -0,0 +1,62 @@
</span><ins>+From 51958b26c17d9d51ca5f7bb1ee52af34ef5f444b Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+Date: Sat, 16 Jan 2016 10:19:07 -0800
+Subject: [PATCH 7/7] Remove override of raise(), abort(), and __assert_rtn()
+
+Lion (10.7) and newer versions of OS X implement abort() using pthread_kill().
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+---
+ lib/Support/Unix/Signals.inc | 39 ---------------------------------------
+ 1 file changed, 39 deletions(-)
+
+diff --git llvm_release_38/lib/Support/Unix/Signals.inc macports_release_38/lib/Support/Unix/Signals.inc
+index 4d687b3..f2797a0 100644
+--- llvm_release_38/lib/Support/Unix/Signals.inc
++++ macports_release_38/lib/Support/Unix/Signals.inc
+@@ -411,42 +411,3 @@ void llvm::sys::PrintStackTraceOnErrorSignal(bool DisableCrashReporting) {
+ }
+ #endif
+ }
+-
+-
+-/***/
+-
+-// On Darwin, raise sends a signal to the main thread instead of the current
+-// thread. This has the unfortunate effect that assert() and abort() will end up
+-// bypassing our crash recovery attempts. We work around this for anything in
+-// the same linkage unit by just defining our own versions of the assert handler
+-// and abort.
+-
+-#if defined(__APPLE__) && defined(ENABLE_CRASH_OVERRIDES)
+-
+-#include <signal.h>
+-#include <pthread.h>
+-
+-int raise(int sig) {
+- return pthread_kill(pthread_self(), sig);
+-}
+-
+-void __assert_rtn(const char *func,
+- const char *file,
+- int line,
+- const char *expr) {
+- if (func)
+- fprintf(stderr, "Assertion failed: (%s), function %s, file %s, line %d.\n",
+- expr, func, file, line);
+- else
+- fprintf(stderr, "Assertion failed: (%s), file %s, line %d.\n",
+- expr, file, line);
+- abort();
+-}
+-
+-void abort() {
+- raise(SIGABRT);
+- usleep(1000);
+- __builtin_trap();
+-}
+-
+-#endif
+--
+2.7.0
+
</ins></span></pre>
</div>
</div>
</body>
</html>