<!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>[142777] trunk/dports/devel/libunwind</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/142777">142777</a></dd>
<dt>Author</dt> <dd>jeremyhu@macports.org</dd>
<dt>Date</dt> <dd>2015-11-22 20:53:39 -0800 (Sun, 22 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>libunwind: Update to 3.7.0</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdevellibunwindPortfile">trunk/dports/devel/libunwind/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsdevellibunwindfiles0001libunwindAddmissingincludeoflibunwind_exthtopatch">trunk/dports/devel/libunwind/files/0001-libunwind-Add-missing-include-of-libunwind_ext.h-to-.patch</a></li>
<li><a href="#trunkdportsdevellibunwindfiles0002libunwindUse__builtin_trapratherthan__builtin_upatch">trunk/dports/devel/libunwind/files/0002-libunwind-Use-__builtin_trap-rather-than-__builtin_u.patch</a></li>
<li><a href="#trunkdportsdevellibunwindfiles0003libunwindppcbuildfixpatch">trunk/dports/devel/libunwind/files/0003-libunwind-ppc-build-fix.patch</a></li>
<li><a href="#trunkdportsdevellibunwindfiles0004libunwindOnlyincludeAvailabilityhonLeopardandpatch">trunk/dports/devel/libunwind/files/0004-libunwind-Only-include-Availability.h-on-Leopard-and.patch</a></li>
<li><a href="#trunkdportsdevellibunwindfiles0005libunwindMacPortsavailabilitypatch">trunk/dports/devel/libunwind/files/0005-libunwind-MacPorts-availability.patch</a></li>
<li><a href="#trunkdportsdevellibunwindfiles0006MacPortsMakefilepatch">trunk/dports/devel/libunwind/files/0006-MacPorts-Makefile.patch</a></li>
<li><a href="#trunkdportsdevellibunwindfiles0007libunwindFixfallbackimplementationof_dyld_find_patch">trunk/dports/devel/libunwind/files/0007-libunwind-Fix-fallback-implementation-of-_dyld_find_.patch</a></li>
<li><a href="#trunkdportsdevellibunwindfiles0008Define__STDC_FORMAT_MACROStobringinformatmacropatch">trunk/dports/devel/libunwind/files/0008-Define-__STDC_FORMAT_MACROS-to-bring-in-format-macro.patch</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsdevellibunwindfiles0002libunwindFixfallbackimplementationof_dyld_find_patch">trunk/dports/devel/libunwind/files/0002-libunwind-Fix-fallback-implementation-of-_dyld_find_.patch</a></li>
<li><a href="#trunkdportsdevellibunwindfiles0003libunwindAddmissingincludeoflibunwind_exthtopatch">trunk/dports/devel/libunwind/files/0003-libunwind-Add-missing-include-of-libunwind_ext.h-to-.patch</a></li>
<li><a href="#trunkdportsdevellibunwindfiles0004libunwindUse__builtin_trapratherthan__builtin_upatch">trunk/dports/devel/libunwind/files/0004-libunwind-Use-__builtin_trap-rather-than-__builtin_u.patch</a></li>
<li><a href="#trunkdportsdevellibunwindfiles0005libunwindppcbuildfixpatch">trunk/dports/devel/libunwind/files/0005-libunwind-ppc-build-fix.patch</a></li>
<li><a href="#trunkdportsdevellibunwindfiles0006libunwindOnlyincludeAvailabilityhonLeopardandpatch">trunk/dports/devel/libunwind/files/0006-libunwind-Only-include-Availability.h-on-Leopard-and.patch</a></li>
<li><a href="#trunkdportsdevellibunwindfiles0008libunwindMacPortsavailabilitypatch">trunk/dports/devel/libunwind/files/0008-libunwind-MacPorts-availability.patch</a></li>
<li><a href="#trunkdportsdevellibunwindfiles1001Define__STDC_FORMAT_MACROStobringinformatmacropatch">trunk/dports/devel/libunwind/files/1001-Define-__STDC_FORMAT_MACROS-to-bring-in-format-macro.patch</a></li>
<li><a href="#trunkdportsdevellibunwindfilesMakefile">trunk/dports/devel/libunwind/files/Makefile</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdevellibunwindPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/libunwind/Portfile (142776 => 142777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/libunwind/Portfile 2015-11-23 02:21:45 UTC (rev 142776)
+++ trunk/dports/devel/libunwind/Portfile 2015-11-23 04:53:39 UTC (rev 142777)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> PortGroup compiler_blacklist_versions 1.0
</span><span class="cx">
</span><span class="cx"> name libunwind
</span><del>-version 3.6.0
</del><ins>+version 3.7.0
</ins><span class="cx"> subport ${name}-headers { }
</span><span class="cx"> epoch 1
</span><span class="cx"> categories devel
</span><span class="lines">@@ -23,26 +23,23 @@
</span><span class="cx"> dist_subdir llvm
</span><span class="cx">
</span><span class="cx"> use_xz yes
</span><del>-distname libcxxabi-${version}.src
</del><ins>+distname ${name}-${version}.src
</ins><span class="cx">
</span><del>-checksums rmd160 bdbc09554b5427fedcc66f72058da3d3618a7692 \
- sha256 f78bcfdb8015272f28d70f5546a544b5bdae5d92862711e8ecb9b24387d994f5
</del><ins>+checksums rmd160 56e622026b30102174f7dcd38a4cc391956e2bd1 \
+ sha256 6a600f30b9f3a54a1faf8c2dfd12522a0c90eb65f1aad63fec540aa27bcaca5b
</ins><span class="cx">
</span><span class="cx"> use_configure no
</span><span class="cx">
</span><del>-post-extract {
- file copy ${filespath}/Makefile ${build.dir}/Makefile
-}
-
</del><span class="cx"> patch.pre_args -p1
</span><span class="cx"> patchfiles \
</span><del>- 0002-libunwind-Fix-fallback-implementation-of-_dyld_find_.patch \
- 0003-libunwind-Add-missing-include-of-libunwind_ext.h-to-.patch \
- 0004-libunwind-Use-__builtin_trap-rather-than-__builtin_u.patch \
- 0005-libunwind-ppc-build-fix.patch \
- 0006-libunwind-Only-include-Availability.h-on-Leopard-and.patch \
- 0008-libunwind-MacPorts-availability.patch \
- 1001-Define-__STDC_FORMAT_MACROS-to-bring-in-format-macro.patch
</del><ins>+ 0001-libunwind-Add-missing-include-of-libunwind_ext.h-to-.patch \
+ 0002-libunwind-Use-__builtin_trap-rather-than-__builtin_u.patch \
+ 0003-libunwind-ppc-build-fix.patch \
+ 0004-libunwind-Only-include-Availability.h-on-Leopard-and.patch \
+ 0005-libunwind-MacPorts-availability.patch \
+ 0006-MacPorts-Makefile.patch \
+ 0007-libunwind-Fix-fallback-implementation-of-_dyld_find_.patch \
+ 0008-Define-__STDC_FORMAT_MACROS-to-bring-in-format-macro.patch
</ins><span class="cx">
</span><span class="cx"> post-patch {
</span><span class="cx"> if {${os.major} < 9} {
</span><span class="lines">@@ -57,7 +54,7 @@
</span><span class="cx"> set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
</span><span class="cx"> }
</span><span class="cx">
</span><del>-build.dir ${worksrcpath}/src/Unwind
</del><ins>+build.dir ${worksrcpath}/src
</ins><span class="cx"> destroot.dir ${build.dir}
</span><span class="cx">
</span><span class="cx"> if {${subport} == "${name}-headers"} {
</span><span class="lines">@@ -72,8 +69,12 @@
</span><span class="cx"> # Technically not needed, but subports will expect depending on libunwind to pull in the headers
</span><span class="cx"> depends_lib-append port:libunwind-headers
</span><span class="cx">
</span><del>- # 3.5 and 3.6 are blacklisted to prevent dependency cycles
- compiler.blacklist macports-clang-3.5 macports-clang-3.6
</del><ins>+ # clang 3.5 and newer are blacklisted to prevent dependency cycles
+ foreach ver {3.5 3.6 3.7 3.8} {
+ if {![file exists ${prefix}/bin/clang-mp-${ver}]} {
+ compiler.blacklist-append macports-clang-${ver}
+ }
+ }
</ins><span class="cx">
</span><span class="cx"> variant universal {}
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportsdevellibunwindfiles0001libunwindAddmissingincludeoflibunwind_exthtopatch"></a>
<div class="addfile"><h4>Added: trunk/dports/devel/libunwind/files/0001-libunwind-Add-missing-include-of-libunwind_ext.h-to-.patch (0 => 142777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/libunwind/files/0001-libunwind-Add-missing-include-of-libunwind_ext.h-to-.patch (rev 0)
+++ trunk/dports/devel/libunwind/files/0001-libunwind-Add-missing-include-of-libunwind_ext.h-to-.patch 2015-11-23 04:53:39 UTC (rev 142777)
</span><span class="lines">@@ -0,0 +1,56 @@
</span><ins>+From 54a1dd57e9f610addbe8b48ad3bce36b71fdeff6 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+Date: Sun, 11 Jan 2015 14:28:08 -0800
+Subject: [PATCH 1/8] libunwind: Add missing include of libunwind_ext.h to
+ CompactUnwinder.hpp, DwarfInstructions.hpp, and UnwindCursor.hpp
+
+http://www.llvm.org/bugs/show_bug.cgi?id=22202
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+(cherry picked from commit e80eb74721aab2cb6cea3bd24f3e6519741d211b)
+---
+ src/CompactUnwinder.hpp | 1 +
+ src/DwarfInstructions.hpp | 2 +-
+ src/UnwindCursor.hpp | 1 +
+ 3 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/CompactUnwinder.hpp b/src/CompactUnwinder.hpp
+index cd9ce3e..44de2c6 100644
+--- a/src/CompactUnwinder.hpp
++++ b/src/CompactUnwinder.hpp
+@@ -21,6 +21,7 @@
+
+ #include "AddressSpace.hpp"
+ #include "Registers.hpp"
++#include "libunwind_ext.h"
+
+ #define EXTRACT_BITS(value, mask) \
+ ((value >> __builtin_ctz(mask)) & (((1 << __builtin_popcount(mask))) - 1))
+diff --git a/src/DwarfInstructions.hpp b/src/DwarfInstructions.hpp
+index dfe45fb..c2d293f 100644
+--- a/src/DwarfInstructions.hpp
++++ b/src/DwarfInstructions.hpp
+@@ -22,7 +22,7 @@
+ #include "Registers.hpp"
+ #include "DwarfParser.hpp"
+ #include "config.h"
+-
++#include "libunwind_ext.h"
+
+ namespace libunwind {
+
+diff --git a/src/UnwindCursor.hpp b/src/UnwindCursor.hpp
+index 59924f0..ba04a4d 100644
+--- a/src/UnwindCursor.hpp
++++ b/src/UnwindCursor.hpp
+@@ -31,6 +31,7 @@
+ #include "DwarfInstructions.hpp"
+ #include "EHHeaderParser.hpp"
+ #include "libunwind.h"
++#include "libunwind_ext.h"
+ #include "Registers.hpp"
+ #include "Unwind-EHABI.h"
+
+--
+2.6.2
+
</ins></span></pre></div>
<a id="trunkdportsdevellibunwindfiles0002libunwindFixfallbackimplementationof_dyld_find_patch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/devel/libunwind/files/0002-libunwind-Fix-fallback-implementation-of-_dyld_find_.patch (142776 => 142777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/libunwind/files/0002-libunwind-Fix-fallback-implementation-of-_dyld_find_.patch 2015-11-23 02:21:45 UTC (rev 142776)
+++ trunk/dports/devel/libunwind/files/0002-libunwind-Fix-fallback-implementation-of-_dyld_find_.patch 2015-11-23 04:53:39 UTC (rev 142777)
</span><span class="lines">@@ -1,42 +0,0 @@
</span><del>-From 5e5525647e09e584475ba8f6d3f75c174a23e386 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-Date: Sun, 4 Jan 2015 13:30:53 -0800
-Subject: [PATCH 2/8] libunwind: Fix fallback implementation of
- _dyld_find_unwind_sections for x86_64 and document dependency on a newer
- libmacho
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
----
- src/Unwind/AddressSpace.hpp | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/src/Unwind/AddressSpace.hpp b/src/Unwind/AddressSpace.hpp
-index 4e94afc..b626b80 100644
---- a/src/Unwind/AddressSpace.hpp
-+++ b/src/Unwind/AddressSpace.hpp
-@@ -297,7 +297,9 @@ inline LocalAddressSpace::pint_t LocalAddressSpace::getEncodedP(pint_t &addr,
- // In 10.7.0 or later, libSystem.dylib implements this function.
- extern "C" bool _dyld_find_unwind_sections(void *, dyld_unwind_sections *);
- #else
-- // In 10.6.x and earlier, we need to implement this functionality.
-+ // In 10.6.x and earlier, we need to implement this functionality. Note
-+ // that this requires a newer version of libmacho (from cctools) than is
-+ // present in libSystem on 10.6.x (for getsectiondata).
- static inline bool _dyld_find_unwind_sections(void* addr,
- dyld_unwind_sections* info) {
- // Find mach-o image containing address.
-@@ -308,7 +310,11 @@ inline LocalAddressSpace::pint_t LocalAddressSpace::getEncodedP(pint_t &addr,
-
- // Find dwarf unwind section in that image.
- unsigned long size;
-+#ifndef __LP64__
- const uint8_t *p = getsectiondata(mh, "__TEXT", "__eh_frame", &size);
-+#else
-+ const uint8_t *p = getsectiondata((const struct mach_header_64 *)mh, "__TEXT", "__eh_frame", &size);
-+#endif
- if (!p)
- return false;
-
---
-2.2.1
-
</del></span></pre></div>
<a id="trunkdportsdevellibunwindfiles0002libunwindUse__builtin_trapratherthan__builtin_upatch"></a>
<div class="addfile"><h4>Added: trunk/dports/devel/libunwind/files/0002-libunwind-Use-__builtin_trap-rather-than-__builtin_u.patch (0 => 142777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/libunwind/files/0002-libunwind-Use-__builtin_trap-rather-than-__builtin_u.patch (rev 0)
+++ trunk/dports/devel/libunwind/files/0002-libunwind-Use-__builtin_trap-rather-than-__builtin_u.patch 2015-11-23 04:53:39 UTC (rev 142777)
</span><span class="lines">@@ -0,0 +1,32 @@
</span><ins>+From 22b584a1f23f02d79d041b3992f0a2d0ad4012c5 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+Date: Sun, 11 Jan 2015 14:34:13 -0800
+Subject: [PATCH 2/8] libunwind: Use __builtin_trap rather than
+ __builtin_unreachable for older toolchains
+
+http://www.llvm.org/bugs/show_bug.cgi?id=22198
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+(cherry picked from commit 9fca7c785d17c8028ba87e8eb16c4c30283554b2)
+---
+ src/DwarfInstructions.hpp | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/DwarfInstructions.hpp b/src/DwarfInstructions.hpp
+index c2d293f..ccc5f6c 100644
+--- a/src/DwarfInstructions.hpp
++++ b/src/DwarfInstructions.hpp
+@@ -72,7 +72,9 @@ private:
+ return evaluateExpression((pint_t)prolog.cfaExpression, addressSpace,
+ registers, 0);
+ assert(0 && "getCFA(): unknown location");
+- __builtin_unreachable();
++ // __builtin_unreachable() is more appropriate but is only available on gcc-4.5 and newer.
++ // __builtin_trap() is better than an ifdef mess for something that will never run anyways.
++ __builtin_trap();
+ }
+ };
+
+--
+2.6.2
+
</ins></span></pre></div>
<a id="trunkdportsdevellibunwindfiles0003libunwindAddmissingincludeoflibunwind_exthtopatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/devel/libunwind/files/0003-libunwind-Add-missing-include-of-libunwind_ext.h-to-.patch (142776 => 142777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/libunwind/files/0003-libunwind-Add-missing-include-of-libunwind_ext.h-to-.patch 2015-11-23 02:21:45 UTC (rev 142776)
+++ trunk/dports/devel/libunwind/files/0003-libunwind-Add-missing-include-of-libunwind_ext.h-to-.patch 2015-11-23 04:53:39 UTC (rev 142777)
</span><span class="lines">@@ -1,55 +0,0 @@
</span><del>-From 54e1764c41242c4a343edfdb92b0d8d88ddd5462 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-Date: Sun, 11 Jan 2015 14:28:08 -0800
-Subject: [PATCH 3/8] libunwind: Add missing include of libunwind_ext.h to
- CompactUnwinder.hpp, DwarfInstructions.hpp, and UnwindCursor.hpp
-
-http://www.llvm.org/bugs/show_bug.cgi?id=22202
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
----
- src/Unwind/CompactUnwinder.hpp | 1 +
- src/Unwind/DwarfInstructions.hpp | 2 +-
- src/Unwind/UnwindCursor.hpp | 1 +
- 3 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/Unwind/CompactUnwinder.hpp b/src/Unwind/CompactUnwinder.hpp
-index 0dc187f..e4a4327 100644
---- a/src/Unwind/CompactUnwinder.hpp
-+++ b/src/Unwind/CompactUnwinder.hpp
-@@ -21,6 +21,7 @@
-
- #include "AddressSpace.hpp"
- #include "Registers.hpp"
-+#include "libunwind_ext.h"
-
- #define EXTRACT_BITS(value, mask) \
- ((value >> __builtin_ctz(mask)) & (((1 << __builtin_popcount(mask))) - 1))
-diff --git a/src/Unwind/DwarfInstructions.hpp b/src/Unwind/DwarfInstructions.hpp
-index 4fbd53c..7a22283 100644
---- a/src/Unwind/DwarfInstructions.hpp
-+++ b/src/Unwind/DwarfInstructions.hpp
-@@ -22,7 +22,7 @@
- #include "Registers.hpp"
- #include "DwarfParser.hpp"
- #include "config.h"
--
-+#include "libunwind_ext.h"
-
- namespace libunwind {
-
-diff --git a/src/Unwind/UnwindCursor.hpp b/src/Unwind/UnwindCursor.hpp
-index 0350dfd..309c105 100644
---- a/src/Unwind/UnwindCursor.hpp
-+++ b/src/Unwind/UnwindCursor.hpp
-@@ -24,6 +24,7 @@
- #endif
-
- #include "libunwind.h"
-+#include "libunwind_ext.h"
-
- #include "AddressSpace.hpp"
- #include "Registers.hpp"
---
-2.2.1
-
</del></span></pre></div>
<a id="trunkdportsdevellibunwindfiles0003libunwindppcbuildfixpatch"></a>
<div class="addfile"><h4>Added: trunk/dports/devel/libunwind/files/0003-libunwind-ppc-build-fix.patch (0 => 142777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/libunwind/files/0003-libunwind-ppc-build-fix.patch (rev 0)
+++ trunk/dports/devel/libunwind/files/0003-libunwind-ppc-build-fix.patch 2015-11-23 04:53:39 UTC (rev 142777)
</span><span class="lines">@@ -0,0 +1,52 @@
</span><ins>+From 318ae788721a364c2da33562ceb18dc7038b8fc2 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+Date: Sun, 11 Jan 2015 14:35:08 -0800
+Subject: [PATCH 3/8] libunwind: ppc build fix
+
+http://www.llvm.org/bugs/show_bug.cgi?id=22200
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+(cherry picked from commit 04f8bc664c2ef42d9d7e31c917bc3d0e0a54578c)
+---
+ src/config.h | 12 ++++++++++--
+ 1 file changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/src/config.h b/src/config.h
+index c9ec087..123eef1 100644
+--- a/src/config.h
++++ b/src/config.h
+@@ -41,10 +41,14 @@
+
+ #define _LIBUNWIND_BUILD_ZERO_COST_APIS (defined(__i386__) || \
+ defined(__x86_64__) || \
++ defined(__ppc__) || \
++ defined(__ppc64__) || \
+ defined(__arm64__))
+ #define _LIBUNWIND_BUILD_SJLJ_APIS defined(__arm__)
+ #define _LIBUNWIND_SUPPORT_FRAME_APIS (defined(__i386__) || \
+- defined(__x86_64__))
++ defined(__x86_64__) || \
++ defined(__ppc__) || \
++ defined(__ppc64__))
+ #define _LIBUNWIND_EXPORT __attribute__((visibility("default")))
+ #define _LIBUNWIND_HIDDEN __attribute__((visibility("hidden")))
+ #define _LIBUNWIND_LOG(msg, ...) fprintf(stderr, "libuwind: " msg, __VA_ARGS__)
+@@ -72,10 +76,14 @@
+
+ #define _LIBUNWIND_BUILD_ZERO_COST_APIS (defined(__i386__) || \
+ defined(__x86_64__) || \
++ defined(__ppc__) || \
++ defined(__ppc64__) || \
+ defined(__arm__))
+ #define _LIBUNWIND_BUILD_SJLJ_APIS 0
+ #define _LIBUNWIND_SUPPORT_FRAME_APIS (defined(__i386__) || \
+- defined(__x86_64__))
++ defined(__x86_64__) || \
++ defined(__ppc__) || \
++ defined(__ppc64__))
+ #define _LIBUNWIND_EXPORT __attribute__((visibility("default")))
+ #define _LIBUNWIND_HIDDEN __attribute__((visibility("hidden")))
+ #define _LIBUNWIND_LOG(msg, ...) fprintf(stderr, "libuwind: " msg, __VA_ARGS__)
+--
+2.6.2
+
</ins></span></pre></div>
<a id="trunkdportsdevellibunwindfiles0004libunwindOnlyincludeAvailabilityhonLeopardandpatch"></a>
<div class="addfile"><h4>Added: trunk/dports/devel/libunwind/files/0004-libunwind-Only-include-Availability.h-on-Leopard-and.patch (0 => 142777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/libunwind/files/0004-libunwind-Only-include-Availability.h-on-Leopard-and.patch (rev 0)
+++ trunk/dports/devel/libunwind/files/0004-libunwind-Only-include-Availability.h-on-Leopard-and.patch 2015-11-23 04:53:39 UTC (rev 142777)
</span><span class="lines">@@ -0,0 +1,73 @@
</span><ins>+From 47c5147e57318333ea446f2cb568a992b23f082f Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+Date: Sun, 11 Jan 2015 19:24:43 -0800
+Subject: [PATCH 4/8] libunwind: Only include <Availability.h> on Leopard and
+ newer OS X versions
+
+http://www.llvm.org/bugs/show_bug.cgi?id=22203
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+(cherry picked from commit 15cc2c11afe656d450cfd6f80266491aaf096960)
+---
+ include/libunwind.h | 22 ++++++++++++++++++----
+ src/config.h | 9 ++++++++-
+ 2 files changed, 26 insertions(+), 5 deletions(-)
+
+diff --git a/include/libunwind.h b/include/libunwind.h
+index 4a75a7b..315a802 100644
+--- a/include/libunwind.h
++++ b/include/libunwind.h
+@@ -20,12 +20,26 @@
+ #include <stddef.h>
+
+ #ifdef __APPLE__
+- #include <Availability.h>
+- #ifdef __arm__
+- #define LIBUNWIND_AVAIL __attribute__((unavailable))
++ #if __clang__
++ #if __has_include(<Availability.h>)
++ #include <Availability.h>
++ #endif
++ #elif __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 1050
++ #include <Availability.h>
++ #endif
++
++ #if __arm__
++ #define LIBUNWIND_AVAIL __attribute__((unavailable))
++ #elif defined(__OSX_AVAILABLE_STARTING)
++ #define LIBUNWIND_AVAIL __OSX_AVAILABLE_STARTING(__MAC_10_6, __IPHONE_5_0)
++ #else
++ #include <AvailabilityMacros.h>
++ #ifdef AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER
++ #define LIBUNWIND_AVAIL AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER
+ #else
+- #define LIBUNWIND_AVAIL __OSX_AVAILABLE_STARTING(__MAC_10_6, __IPHONE_5_0)
++ #define LIBUNWIND_AVAIL __attribute__((unavailable))
+ #endif
++ #endif
+ #else
+ #define LIBUNWIND_AVAIL
+ #endif
+diff --git a/src/config.h b/src/config.h
+index 123eef1..1cbf057 100644
+--- a/src/config.h
++++ b/src/config.h
+@@ -29,7 +29,14 @@
+
+ // Platform specific configuration defines.
+ #ifdef __APPLE__
+- #include <Availability.h>
++ #if __clang__
++ #if __has_include(<Availability.h>)
++ #include <Availability.h>
++ #endif
++ #elif __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 1050
++ #include <Availability.h>
++ #endif
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+--
+2.6.2
+
</ins></span></pre></div>
<a id="trunkdportsdevellibunwindfiles0004libunwindUse__builtin_trapratherthan__builtin_upatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/devel/libunwind/files/0004-libunwind-Use-__builtin_trap-rather-than-__builtin_u.patch (142776 => 142777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/libunwind/files/0004-libunwind-Use-__builtin_trap-rather-than-__builtin_u.patch 2015-11-23 02:21:45 UTC (rev 142776)
+++ trunk/dports/devel/libunwind/files/0004-libunwind-Use-__builtin_trap-rather-than-__builtin_u.patch 2015-11-23 04:53:39 UTC (rev 142777)
</span><span class="lines">@@ -1,31 +0,0 @@
</span><del>-From f3daa24749c2b01d82172487a64cbc353b0d4424 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-Date: Sun, 11 Jan 2015 14:34:13 -0800
-Subject: [PATCH 4/8] libunwind: Use __builtin_trap rather than
- __builtin_unreachable for older toolchains
-
-http://www.llvm.org/bugs/show_bug.cgi?id=22198
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
----
- src/Unwind/DwarfInstructions.hpp | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/Unwind/DwarfInstructions.hpp b/src/Unwind/DwarfInstructions.hpp
-index 7a22283..8a6e375 100644
---- a/src/Unwind/DwarfInstructions.hpp
-+++ b/src/Unwind/DwarfInstructions.hpp
-@@ -72,7 +72,9 @@ private:
- return evaluateExpression((pint_t)prolog.cfaExpression, addressSpace,
- registers, 0);
- assert(0 && "getCFA(): unknown location");
-- __builtin_unreachable();
-+ // __builtin_unreachable() is more appropriate but is only available on gcc-4.5 and newer.
-+ // __builtin_trap() is better than an ifdef mess for something that will never run anyways.
-+ __builtin_trap();
- }
- };
-
---
-2.2.1
-
</del></span></pre></div>
<a id="trunkdportsdevellibunwindfiles0005libunwindMacPortsavailabilitypatch"></a>
<div class="addfile"><h4>Added: trunk/dports/devel/libunwind/files/0005-libunwind-MacPorts-availability.patch (0 => 142777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/libunwind/files/0005-libunwind-MacPorts-availability.patch (rev 0)
+++ trunk/dports/devel/libunwind/files/0005-libunwind-MacPorts-availability.patch 2015-11-23 04:53:39 UTC (rev 142777)
</span><span class="lines">@@ -0,0 +1,74 @@
</span><ins>+From b95b54d6cc96c0585d82a3787fbfbd8223400f73 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+Date: Sun, 4 Jan 2015 13:21:39 -0800
+Subject: [PATCH 5/8] libunwind: MacPorts availability
+
+(cherry picked from commit 7400dc78d11961f50fd3f4af7fc13a7ac5555776)
+---
+ include/libunwind.h | 2 +-
+ src/Unwind_AppleExtras.cpp | 36 ++----------------------------------
+ 2 files changed, 3 insertions(+), 35 deletions(-)
+
+diff --git a/include/libunwind.h b/include/libunwind.h
+index 315a802..0d6f584 100644
+--- a/include/libunwind.h
++++ b/include/libunwind.h
+@@ -19,7 +19,7 @@
+ #include <stdint.h>
+ #include <stddef.h>
+
+-#ifdef __APPLE__
++#if defined(__APPLE__) && !defined(USE_MACPORTS_LIBUNWIND)
+ #if __clang__
+ #if __has_include(<Availability.h>)
+ #include <Availability.h>
+diff --git a/src/Unwind_AppleExtras.cpp b/src/Unwind_AppleExtras.cpp
+index b8baef5..078aa86 100644
+--- a/src/Unwind_AppleExtras.cpp
++++ b/src/Unwind_AppleExtras.cpp
+@@ -41,40 +41,8 @@ struct libgcc_object_info {
+
+
+ // static linker symbols to prevent wrong two level namespace for _Unwind symbols
+-#if defined(__arm__)
+- #define NOT_HERE_BEFORE_5_0(sym) \
+- extern const char sym##_tmp30 __asm("$ld$hide$os3.0$_" #sym ); \
+- __attribute__((visibility("default"))) const char sym##_tmp30 = 0; \
+- extern const char sym##_tmp31 __asm("$ld$hide$os3.1$_" #sym ); \
+- __attribute__((visibility("default"))) const char sym##_tmp31 = 0; \
+- extern const char sym##_tmp32 __asm("$ld$hide$os3.2$_" #sym );\
+- __attribute__((visibility("default"))) const char sym##_tmp32 = 0; \
+- extern const char sym##_tmp40 __asm("$ld$hide$os4.0$_" #sym ); \
+- __attribute__((visibility("default"))) const char sym##_tmp40 = 0; \
+- extern const char sym##_tmp41 __asm("$ld$hide$os4.1$_" #sym ); \
+- __attribute__((visibility("default"))) const char sym##_tmp41 = 0; \
+- extern const char sym##_tmp42 __asm("$ld$hide$os4.2$_" #sym ); \
+- __attribute__((visibility("default"))) const char sym##_tmp42 = 0; \
+- extern const char sym##_tmp43 __asm("$ld$hide$os4.3$_" #sym ); \
+- __attribute__((visibility("default"))) const char sym##_tmp43 = 0;
+-#elif defined(__arm64__)
+- #define NOT_HERE_BEFORE_10_6(sym)
+- #define NEVER_HERE(sym)
+-#else
+- #define NOT_HERE_BEFORE_10_6(sym) \
+- extern const char sym##_tmp4 __asm("$ld$hide$os10.4$_" #sym ); \
+- __attribute__((visibility("default"))) const char sym##_tmp4 = 0; \
+- extern const char sym##_tmp5 __asm("$ld$hide$os10.5$_" #sym ); \
+- __attribute__((visibility("default"))) const char sym##_tmp5 = 0;
+- #define NEVER_HERE(sym) \
+- extern const char sym##_tmp4 __asm("$ld$hide$os10.4$_" #sym ); \
+- __attribute__((visibility("default"))) const char sym##_tmp4 = 0; \
+- extern const char sym##_tmp5 __asm("$ld$hide$os10.5$_" #sym ); \
+- __attribute__((visibility("default"))) const char sym##_tmp5 = 0; \
+- extern const char sym##_tmp6 __asm("$ld$hide$os10.6$_" #sym ); \
+- __attribute__((visibility("default"))) const char sym##_tmp6 = 0;
+-#endif
+-
++#define NOT_HERE_BEFORE_10_6(sym)
++#define NEVER_HERE(sym)
+
+ #if _LIBUNWIND_BUILD_ZERO_COST_APIS
+
+--
+2.6.2
+
</ins></span></pre></div>
<a id="trunkdportsdevellibunwindfiles0005libunwindppcbuildfixpatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/devel/libunwind/files/0005-libunwind-ppc-build-fix.patch (142776 => 142777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/libunwind/files/0005-libunwind-ppc-build-fix.patch 2015-11-23 02:21:45 UTC (rev 142776)
+++ trunk/dports/devel/libunwind/files/0005-libunwind-ppc-build-fix.patch 2015-11-23 04:53:39 UTC (rev 142777)
</span><span class="lines">@@ -1,43 +0,0 @@
</span><del>-From f9b3d797e4899e235142d1171f18796830cbcd49 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-Date: Sun, 11 Jan 2015 14:35:08 -0800
-Subject: [PATCH 5/8] libunwind: ppc build fix
-
-http://www.llvm.org/bugs/show_bug.cgi?id=22200
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
----
- src/Unwind/config.h | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/Unwind/config.h b/src/Unwind/config.h
-index 6b459ee..80c476c 100644
---- a/src/Unwind/config.h
-+++ b/src/Unwind/config.h
-@@ -39,9 +39,9 @@
- }
- #endif
-
-- #define _LIBUNWIND_BUILD_ZERO_COST_APIS (__i386__ || __x86_64__ || __arm64__)
-+ #define _LIBUNWIND_BUILD_ZERO_COST_APIS (__ppc__ || __ppc64__ || __i386__ || __x86_64__ || __arm64__)
- #define _LIBUNWIND_BUILD_SJLJ_APIS (__arm__)
-- #define _LIBUNWIND_SUPPORT_FRAME_APIS (__i386__ || __x86_64__)
-+ #define _LIBUNWIND_SUPPORT_FRAME_APIS (__ppc__ || __ppc64__ || __i386__ || __x86_64__)
- #define _LIBUNWIND_EXPORT __attribute__((visibility("default")))
- #define _LIBUNWIND_HIDDEN __attribute__((visibility("hidden")))
- #define _LIBUNWIND_LOG(msg, ...) fprintf(stderr, "libuwind: " msg, __VA_ARGS__)
-@@ -67,9 +67,9 @@
- abort();
- }
-
-- #define _LIBUNWIND_BUILD_ZERO_COST_APIS (__i386__ || __x86_64__ || __arm64__ || __arm__)
-+ #define _LIBUNWIND_BUILD_ZERO_COST_APIS (__ppc__ || __ppc64__ || __i386__ || __x86_64__ || __arm64__ || __arm__)
- #define _LIBUNWIND_BUILD_SJLJ_APIS 0
-- #define _LIBUNWIND_SUPPORT_FRAME_APIS (__i386__ || __x86_64__)
-+ #define _LIBUNWIND_SUPPORT_FRAME_APIS (__ppc__ || __ppc64__ || __i386__ || __x86_64__)
- #define _LIBUNWIND_EXPORT __attribute__((visibility("default")))
- #define _LIBUNWIND_HIDDEN __attribute__((visibility("hidden")))
- #define _LIBUNWIND_LOG(msg, ...) fprintf(stderr, "libuwind: " msg, __VA_ARGS__)
---
-2.2.1
-
</del></span></pre></div>
<a id="trunkdportsdevellibunwindfiles0006MacPortsMakefilepatch"></a>
<div class="addfile"><h4>Added: trunk/dports/devel/libunwind/files/0006-MacPorts-Makefile.patch (0 => 142777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/libunwind/files/0006-MacPorts-Makefile.patch (rev 0)
+++ trunk/dports/devel/libunwind/files/0006-MacPorts-Makefile.patch 2015-11-23 04:53:39 UTC (rev 142777)
</span><span class="lines">@@ -0,0 +1,153 @@
</span><ins>+From b39cdf54c1df4358d2883336c6926a0dd48d543d Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+Date: Tue, 20 Jan 2015 10:23:13 -0800
+Subject: [PATCH 6/8] MacPorts Makefile
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+(cherry picked from commit 4501b3591276ceb3e88099ad653d727eb83f4789)
+---
+ src/Makefile | 132 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 132 insertions(+)
+ create mode 100644 src/Makefile
+
+diff --git a/src/Makefile b/src/Makefile
+new file mode 100644
+index 0000000..8fa9bf6
+--- /dev/null
++++ b/src/Makefile
+@@ -0,0 +1,132 @@
++# Default locations for the build
++ifdef DESTDIR
++DSTROOT = $(DESTDIR)
++endif
++OBJROOT = .
++
++# Default install locations for the library
++PREFIX = /usr
++INCDIR = $(PREFIX)/include
++LIBDIR = $(PREFIX)/lib
++LIBUNWIND_INCDIR = $(INCDIR)/libunwind
++MACHO_INCDIR = $(INCDIR)/mach-o
++LIBUNWIND_FILENAME = libunwind.1.dylib
++LIBUNWIND_SYMLINKNAME = libunwind.dylib
++LIBUNWIND_FILENAME_STATIC = libunwind.a
++LIBUNWIND_COMPAT_VERSION = 1.0.0
++LIBUNWIND_CURRENT_VERSION = 1.0.0
++
++# Default toolchain
++AR = $(shell xcrun -find ar)
++RANLIB = $(shell xcrun -find ranlib)
++CC = $(shell xcrun -find cc)
++CXX = $(shell xcrun -find c++)
++STRIP = $(shell xcrun -find strip)
++STRIP_LIB_FLAGS = -S
++DSYMUTIL = $(shell xcrun -find dsymutil)
++INCLUDES = -I../include
++
++# Default archs
++RC_ARCHS = i386 x86_64
++ARCH_FLAGS := $(foreach arch,$(RC_ARCHS),-arch $(arch))
++
++# Use an SDK?
++ifdef SDKROOT
++SYSROOT_FLAGS = -isysroot $(SDKROOT)
++endif
++
++C_SRCS = \
++ UnwindLevel1.c \
++ UnwindLevel1-gcc-ext.c \
++ Unwind-sjlj.c
++
++CXX_SRCS = \
++ Unwind_AppleExtras.cpp \
++ libunwind.cpp \
++ Unwind-EHABI.cpp
++
++ASM_SRCS = \
++ UnwindRegistersRestore.S \
++ UnwindRegistersSave.S
++
++HEADERS = \
++ ../include/libunwind.h \
++ ../include/unwind.h
++
++LIBUNWIND_HEADERS = \
++ AddressSpace.hpp \
++ assembly.h \
++ CompactUnwinder.hpp \
++ config.h \
++ dwarf2.h \
++ DwarfInstructions.hpp \
++ DwarfParser.hpp \
++ libunwind_ext.h \
++ Registers.hpp \
++ UnwindCursor.hpp \
++ unwind_ext.h
++
++MACHO_HEADERS = \
++ ../include/mach-o/compact_unwind_encoding.h
++
++OBJS = $(C_SRCS:%.c=$(OBJROOT)/%.o) $(CXX_SRCS:%.cpp=$(OBJROOT)/%.o) $(ASM_SRCS:%.S=$(OBJROOT)/%.o)
++
++$(OBJROOT)/%.o : %.c
++ $(CC) $(ARCH_FLAGS) $(SYSROOT_FLAGS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
++
++$(OBJROOT)/%.o : %.cpp
++ $(CXX) $(ARCH_FLAGS) $(SYSROOT_FLAGS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $<
++
++$(OBJROOT)/%.o : %.S
++ $(CC) $(ARCH_FLAGS) -force_cpusubtype_ALL $(SYSROOT_FLAGS) $(INCLUDES) $(CPPFLAGS) $(ASFLAGS) -c -o $@ $<
++
++$(OBJROOT)/$(LIBUNWIND_FILENAME): $(OBJS)
++ $(CXX) -o $@ $(ARCH_FLAGS) $(SYSROOT_FLAGS) $(LDFLAGS) \
++ -dynamiclib -install_name $(LIBDIR)/$(LIBUNWIND_FILENAME) \
++ -compatibility_version $(LIBUNWIND_COMPAT_VERSION) -current_version $(LIBUNWIND_CURRENT_VERSION) \
++ $(OBJS)
++
++$(OBJROOT)/$(LIBUNWIND_FILENAME_STATIC): $(OBJS)
++ $(AR) cru $@ $(OBJS)
++ $(RANLIB) $@
++
++all: $(OBJROOT)/$(LIBUNWIND_FILENAME) $(OBJROOT)/$(LIBUNWIND_FILENAME_STATIC)
++
++installhdrs:
++ install -d -m 755 $(DSTROOT)$(INCDIR)
++ install -d -m 755 $(DSTROOT)$(LIBUNWIND_INCDIR)
++ install -d -m 755 $(DSTROOT)$(MACHO_INCDIR)
++
++ for f in $(HEADERS); do \
++ install -m 644 $$f $(DSTROOT)$(INCDIR); \
++ done
++
++ for f in $(LIBUNWIND_HEADERS); do \
++ install -m 644 $$f $(DSTROOT)$(LIBUNWIND_INCDIR); \
++ done
++
++ for f in $(MACHO_HEADERS); do \
++ install -m 644 $$f $(DSTROOT)$(MACHO_INCDIR); \
++ done
++
++installdylib: $(OBJROOT)/$(LIBUNWIND_FILENAME)
++ifdef SYMROOT
++ install -m 755 $(OBJROOT)/$(LIBUNWIND_FILENAME) $(SYMROOT)
++ $(DSYMUTIL) --out $(SYMROOT)/$(LIBUNWIND_FILENAME).dSYM $(OBJROOT)/$(LIBUNWIND_FILENAME)
++endif
++ install -d -m 755 $(DSTROOT)$(LIBDIR)
++ install -m 755 $(OBJROOT)/$(LIBUNWIND_FILENAME) $(DSTROOT)$(LIBDIR)
++ifneq "NO" "$(STRIP_ON_INSTALL)"
++ $(STRIP) $(STRIP_LIB_FLAGS) $(DSTROOT)$(LIBDIR)/$(LIBUNWIND_FILENAME)
++endif
++ ln -s $(LIBUNWIND_FILENAME) $(DSTROOT)$(LIBDIR)/$(LIBUNWIND_SYMLINKNAME)
++
++installstatic: $(OBJROOT)/$(LIBUNWIND_FILENAME_STATIC)
++ install -d -m 755 $(DSTROOT)$(LIBDIR)
++ install -m 644 $(OBJROOT)/$(LIBUNWIND_FILENAME_STATIC) $(DSTROOT)$(LIBDIR)
++
++installlibs: installdylib installstatic
++install: installhdrs installlibs
++
++clean:
++ rm -f $(OBJROOT)/*.o $(OBJROOT)/*.a $(OBJROOT)/*.dylib
+--
+2.6.2
+
</ins></span></pre></div>
<a id="trunkdportsdevellibunwindfiles0006libunwindOnlyincludeAvailabilityhonLeopardandpatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/devel/libunwind/files/0006-libunwind-Only-include-Availability.h-on-Leopard-and.patch (142776 => 142777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/libunwind/files/0006-libunwind-Only-include-Availability.h-on-Leopard-and.patch 2015-11-23 02:21:45 UTC (rev 142776)
+++ trunk/dports/devel/libunwind/files/0006-libunwind-Only-include-Availability.h-on-Leopard-and.patch 2015-11-23 04:53:39 UTC (rev 142777)
</span><span class="lines">@@ -1,72 +0,0 @@
</span><del>-From 297eec69dc89073213afdb29cccfa68ea63428dd Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-Date: Sun, 11 Jan 2015 19:24:43 -0800
-Subject: [PATCH 6/8] libunwind: Only include <Availability.h> on Leopard and
- newer OS X versions
-
-http://www.llvm.org/bugs/show_bug.cgi?id=22203
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
----
- include/libunwind.h | 22 ++++++++++++++++++----
- src/Unwind/config.h | 9 ++++++++-
- 2 files changed, 26 insertions(+), 5 deletions(-)
-
-diff --git a/include/libunwind.h b/include/libunwind.h
-index 448d86a..a5630a5 100644
---- a/include/libunwind.h
-+++ b/include/libunwind.h
-@@ -26,12 +26,26 @@
- #endif
-
- #if __APPLE__
-- #include <Availability.h>
-- #if __arm__
-- #define LIBUNWIND_AVAIL __attribute__((unavailable))
-+ #if __clang__
-+ #if __has_include(<Availability.h>)
-+ #include <Availability.h>
-+ #endif
-+ #elif __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 1050
-+ #include <Availability.h>
-+ #endif
-+
-+ #if __arm__
-+ #define LIBUNWIND_AVAIL __attribute__((unavailable))
-+ #elif defined(__OSX_AVAILABLE_STARTING)
-+ #define LIBUNWIND_AVAIL __OSX_AVAILABLE_STARTING(__MAC_10_6, __IPHONE_5_0)
-+ #else
-+ #include <AvailabilityMacros.h>
-+ #ifdef AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER
-+ #define LIBUNWIND_AVAIL AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER
- #else
-- #define LIBUNWIND_AVAIL __OSX_AVAILABLE_STARTING(__MAC_10_6, __IPHONE_5_0)
-+ #define LIBUNWIND_AVAIL __attribute__((unavailable))
- #endif
-+ #endif
- #else
- #define LIBUNWIND_AVAIL
- #endif
-diff --git a/src/Unwind/config.h b/src/Unwind/config.h
-index 80c476c..5f5c4fb 100644
---- a/src/Unwind/config.h
-+++ b/src/Unwind/config.h
-@@ -29,7 +29,14 @@
-
- // Platform specific configuration defines.
- #if __APPLE__
-- #include <Availability.h>
-+ #if __clang__
-+ #if __has_include(<Availability.h>)
-+ #include <Availability.h>
-+ #endif
-+ #elif __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 1050
-+ #include <Availability.h>
-+ #endif
-+
- #ifdef __cplusplus
- extern "C" {
- #endif
---
-2.2.1
-
</del></span></pre></div>
<a id="trunkdportsdevellibunwindfiles0007libunwindFixfallbackimplementationof_dyld_find_patch"></a>
<div class="addfile"><h4>Added: trunk/dports/devel/libunwind/files/0007-libunwind-Fix-fallback-implementation-of-_dyld_find_.patch (0 => 142777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/libunwind/files/0007-libunwind-Fix-fallback-implementation-of-_dyld_find_.patch (rev 0)
+++ trunk/dports/devel/libunwind/files/0007-libunwind-Fix-fallback-implementation-of-_dyld_find_.patch 2015-11-23 04:53:39 UTC (rev 142777)
</span><span class="lines">@@ -0,0 +1,54 @@
</span><ins>+From b5d128f0bd152254de0d357e938421ea51acdc13 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+Date: Sun, 4 Jan 2015 13:30:53 -0800
+Subject: [PATCH 7/8] libunwind: Fix fallback implementation of
+ _dyld_find_unwind_sections for x86_64 and document dependency on a newer
+ libmacho
+
+http://www.llvm.org/bugs/show_bug.cgi?id=22270
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+(cherry picked from commit 4d644e4bfc1b3b430cb5edec884f1a24a9b8de80)
+---
+ src/AddressSpace.hpp | 12 +++++++++---
+ 1 file changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/src/AddressSpace.hpp b/src/AddressSpace.hpp
+index 567cbda..2554e11 100644
+--- a/src/AddressSpace.hpp
++++ b/src/AddressSpace.hpp
+@@ -316,14 +316,20 @@ LocalAddressSpace::getEncodedP(pint_t &addr, pint_t end, uint8_t encoding,
+ // In 10.7.0 or later, libSystem.dylib implements this function.
+ extern "C" bool _dyld_find_unwind_sections(void *, dyld_unwind_sections *);
+ #else
+- // In 10.6.x and earlier, we need to implement this functionality.
++ // In 10.6.x and earlier, we need to implement this functionality. Note
++ // that this requires a newer version of libmacho (from cctools) than is
++ // present in libSystem on 10.6.x (for getsectiondata).
+ static inline bool _dyld_find_unwind_sections(void* addr,
+ dyld_unwind_sections* info) {
+ // Find mach-o image containing address.
+ Dl_info dlinfo;
+ if (!dladdr(addr, &dlinfo))
+ return false;
+- const mach_header *mh = (const mach_header *)dlinfo.dli_saddr;
++#if __LP64__
++ const struct mach_header_64 *mh = (const struct mach_header_64 *)dlinfo.dli_saddr;
++#else
++ const struct mach_header *mh = (const struct mach_header *)dlinfo.dli_saddr;
++#endif
+
+ // Find dwarf unwind section in that image.
+ unsigned long size;
+@@ -332,7 +338,7 @@ LocalAddressSpace::getEncodedP(pint_t &addr, pint_t end, uint8_t encoding,
+ return false;
+
+ // Fill in return struct.
+- info->mh = mh;
++ info->mh = (const struct mach_header *)mh;
+ info->dwarf_section = p;
+ info->dwarf_section_length = size;
+ info->compact_unwind_section = 0;
+--
+2.6.2
+
</ins></span></pre></div>
<a id="trunkdportsdevellibunwindfiles0008Define__STDC_FORMAT_MACROStobringinformatmacropatch"></a>
<div class="addfile"><h4>Added: trunk/dports/devel/libunwind/files/0008-Define-__STDC_FORMAT_MACROS-to-bring-in-format-macro.patch (0 => 142777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/libunwind/files/0008-Define-__STDC_FORMAT_MACROS-to-bring-in-format-macro.patch (rev 0)
+++ trunk/dports/devel/libunwind/files/0008-Define-__STDC_FORMAT_MACROS-to-bring-in-format-macro.patch 2015-11-23 04:53:39 UTC (rev 142777)
</span><span class="lines">@@ -0,0 +1,30 @@
</span><ins>+From fa6c5bb5bcf432c1839909365c7fc11dda172b15 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+Date: Sat, 7 Mar 2015 19:58:56 -0800
+Subject: [PATCH 8/8] Define __STDC_FORMAT_MACROS to bring in format macros
+ when including <inttypes.h> in C++ code
+
+Fixes regression from: 1f22bd54e8565959c1d2c3ed7384cb77e18d0807
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+CC: Dan Albert <danalbert@google.com>
+(cherry picked from commit e02479718191c6aa63a23b2a5029a69906ba3d76)
+---
+ src/DwarfParser.hpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/DwarfParser.hpp b/src/DwarfParser.hpp
+index f6ef738..0c24dc6 100644
+--- a/src/DwarfParser.hpp
++++ b/src/DwarfParser.hpp
+@@ -13,6 +13,7 @@
+ #ifndef __DWARF_PARSER_HPP__
+ #define __DWARF_PARSER_HPP__
+
++#define __STDC_FORMAT_MACROS 1
+ #include <inttypes.h>
+ #include <stdint.h>
+ #include <stdio.h>
+--
+2.6.2
+
</ins></span></pre></div>
<a id="trunkdportsdevellibunwindfiles0008libunwindMacPortsavailabilitypatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/devel/libunwind/files/0008-libunwind-MacPorts-availability.patch (142776 => 142777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/libunwind/files/0008-libunwind-MacPorts-availability.patch 2015-11-23 02:21:45 UTC (rev 142776)
+++ trunk/dports/devel/libunwind/files/0008-libunwind-MacPorts-availability.patch 2015-11-23 04:53:39 UTC (rev 142777)
</span><span class="lines">@@ -1,70 +0,0 @@
</span><del>-From 1691346de5361741a1b661d62da7e05e844e702f Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-Date: Sun, 4 Jan 2015 13:21:39 -0800
-Subject: [PATCH 8/8] libunwind: MacPorts availability
-
----
- include/libunwind.h | 2 +-
- src/Unwind/Unwind_AppleExtras.cpp | 31 -------------------------------
- 2 files changed, 1 insertion(+), 32 deletions(-)
-
-diff --git a/include/libunwind.h b/include/libunwind.h
-index fbfc19b..64029e0 100644
---- a/include/libunwind.h
-+++ b/include/libunwind.h
-@@ -25,7 +25,7 @@
- #define LIBCXXABI_ARM_EHABI 0
- #endif
-
--#if __APPLE__
-+#if defined(__APPLE__) && !defined(USE_MACPORTS_LIBUNWIND)
- #if __clang__
- #if __has_include(<Availability.h>)
- #include <Availability.h>
-diff --git a/src/Unwind/Unwind_AppleExtras.cpp b/src/Unwind/Unwind_AppleExtras.cpp
-index 6d02a66..8f1d4ef 100644
---- a/src/Unwind/Unwind_AppleExtras.cpp
-+++ b/src/Unwind/Unwind_AppleExtras.cpp
-@@ -41,39 +41,8 @@ struct libgcc_object_info {
-
-
- // static linker symbols to prevent wrong two level namespace for _Unwind symbols
--#if __arm__
-- #define NOT_HERE_BEFORE_5_0(sym) \
-- extern const char sym##_tmp30 __asm("$ld$hide$os3.0$_" #sym ); \
-- __attribute__((visibility("default"))) const char sym##_tmp30 = 0; \
-- extern const char sym##_tmp31 __asm("$ld$hide$os3.1$_" #sym ); \
-- __attribute__((visibility("default"))) const char sym##_tmp31 = 0; \
-- extern const char sym##_tmp32 __asm("$ld$hide$os3.2$_" #sym );\
-- __attribute__((visibility("default"))) const char sym##_tmp32 = 0; \
-- extern const char sym##_tmp40 __asm("$ld$hide$os4.0$_" #sym ); \
-- __attribute__((visibility("default"))) const char sym##_tmp40 = 0; \
-- extern const char sym##_tmp41 __asm("$ld$hide$os4.1$_" #sym ); \
-- __attribute__((visibility("default"))) const char sym##_tmp41 = 0; \
-- extern const char sym##_tmp42 __asm("$ld$hide$os4.2$_" #sym ); \
-- __attribute__((visibility("default"))) const char sym##_tmp42 = 0; \
-- extern const char sym##_tmp43 __asm("$ld$hide$os4.3$_" #sym ); \
-- __attribute__((visibility("default"))) const char sym##_tmp43 = 0;
--#elif __arm64__
- #define NOT_HERE_BEFORE_10_6(sym)
- #define NEVER_HERE(sym)
--#else
-- #define NOT_HERE_BEFORE_10_6(sym) \
-- extern const char sym##_tmp4 __asm("$ld$hide$os10.4$_" #sym ); \
-- __attribute__((visibility("default"))) const char sym##_tmp4 = 0; \
-- extern const char sym##_tmp5 __asm("$ld$hide$os10.5$_" #sym ); \
-- __attribute__((visibility("default"))) const char sym##_tmp5 = 0;
-- #define NEVER_HERE(sym) \
-- extern const char sym##_tmp4 __asm("$ld$hide$os10.4$_" #sym ); \
-- __attribute__((visibility("default"))) const char sym##_tmp4 = 0; \
-- extern const char sym##_tmp5 __asm("$ld$hide$os10.5$_" #sym ); \
-- __attribute__((visibility("default"))) const char sym##_tmp5 = 0; \
-- extern const char sym##_tmp6 __asm("$ld$hide$os10.6$_" #sym ); \
-- __attribute__((visibility("default"))) const char sym##_tmp6 = 0;
--#endif
-
-
- #if _LIBUNWIND_BUILD_ZERO_COST_APIS
---
-2.2.1
-
</del></span></pre></div>
<a id="trunkdportsdevellibunwindfiles1001Define__STDC_FORMAT_MACROStobringinformatmacropatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/devel/libunwind/files/1001-Define-__STDC_FORMAT_MACROS-to-bring-in-format-macro.patch (142776 => 142777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/libunwind/files/1001-Define-__STDC_FORMAT_MACROS-to-bring-in-format-macro.patch 2015-11-23 02:21:45 UTC (rev 142776)
+++ trunk/dports/devel/libunwind/files/1001-Define-__STDC_FORMAT_MACROS-to-bring-in-format-macro.patch 2015-11-23 04:53:39 UTC (rev 142777)
</span><span class="lines">@@ -1,29 +0,0 @@
</span><del>-From 60bbc7ef1f64c92c0a6819fd2c5558d266d5063d Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-Date: Sat, 7 Mar 2015 19:58:56 -0800
-Subject: [PATCH] Define __STDC_FORMAT_MACROS to bring in format macros when
- including <inttypes.h> in C++ code
-
-Fixes regression from: 1f22bd54e8565959c1d2c3ed7384cb77e18d0807
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-CC: Dan Albert <danalbert@google.com>
----
- src/Unwind/DwarfParser.hpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/Unwind/DwarfParser.hpp b/src/Unwind/DwarfParser.hpp
-index f6ef738..0c24dc6 100644
---- a/src/Unwind/DwarfParser.hpp
-+++ b/src/Unwind/DwarfParser.hpp
-@@ -13,6 +13,7 @@
- #ifndef __DWARF_PARSER_HPP__
- #define __DWARF_PARSER_HPP__
-
-+#define __STDC_FORMAT_MACROS 1
- #include <inttypes.h>
- #include <stdint.h>
- #include <stdio.h>
---
-2.3.1
-
</del></span></pre></div>
<a id="trunkdportsdevellibunwindfilesMakefile"></a>
<div class="delfile"><h4>Deleted: trunk/dports/devel/libunwind/files/Makefile (142776 => 142777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/libunwind/files/Makefile 2015-11-23 02:21:45 UTC (rev 142776)
+++ trunk/dports/devel/libunwind/files/Makefile 2015-11-23 04:53:39 UTC (rev 142777)
</span><span class="lines">@@ -1,129 +0,0 @@
</span><del>-# Default locations for the build
-ifdef DESTDIR
-DSTROOT = $(DESTDIR)
-endif
-OBJROOT = .
-
-# Default install locations for the library
-PREFIX = /usr
-INCDIR = $(PREFIX)/include
-LIBDIR = $(PREFIX)/lib
-LIBUNWIND_INCDIR = $(INCDIR)/libunwind
-MACHO_INCDIR = $(INCDIR)/mach-o
-LIBUNWIND_FILENAME = libunwind.1.dylib
-LIBUNWIND_SYMLINKNAME = libunwind.dylib
-LIBUNWIND_FILENAME_STATIC = libunwind.a
-LIBUNWIND_COMPAT_VERSION = 1.0.0
-LIBUNWIND_CURRENT_VERSION = 1.0.0
-
-# Default toolchain
-AR = $(shell xcrun -find ar)
-RANLIB = $(shell xcrun -find ranlib)
-CC = $(shell xcrun -find cc)
-CXX = $(shell xcrun -find c++)
-STRIP = $(shell xcrun -find strip)
-STRIP_LIB_FLAGS = -S
-DSYMUTIL = $(shell xcrun -find dsymutil)
-INCLUDES = -I../../include
-
-# Default archs
-RC_ARCHS = i386 x86_64
-ARCH_FLAGS := $(foreach arch,$(RC_ARCHS),-arch $(arch))
-
-# Use an SDK?
-ifdef SDKROOT
-SYSROOT_FLAGS = -isysroot $(SDKROOT)
-endif
-
-C_SRCS = \
- UnwindLevel1.c \
- UnwindLevel1-gcc-ext.c \
- Unwind-sjlj.c
-
-CXX_SRCS = \
- Unwind_AppleExtras.cpp \
- libunwind.cpp \
- Unwind-EHABI.cpp
-
-ASM_SRCS = \
- UnwindRegistersRestore.S \
- UnwindRegistersSave.S
-
-HEADERS = \
- ../../include/libunwind.h \
- ../../include/unwind.h
-
-LIBUNWIND_HEADERS = \
- AddressSpace.hpp \
- assembly.h \
- CompactUnwinder.hpp \
- config.h \
- dwarf2.h \
- DwarfInstructions.hpp \
- DwarfParser.hpp \
- libunwind_ext.h \
- Registers.hpp \
- UnwindCursor.hpp \
- unwind_ext.h
-
-MACHO_HEADERS = \
- ../../include/mach-o/compact_unwind_encoding.h
-
-OBJS = $(C_SRCS:%.c=$(OBJROOT)/%.o) $(CXX_SRCS:%.cpp=$(OBJROOT)/%.o) $(ASM_SRCS:%.S=$(OBJROOT)/%.o)
-
-$(OBJROOT)/%.o : %.c
- $(CC) $(ARCH_FLAGS) $(SYSROOT_FLAGS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
-
-$(OBJROOT)/%.o : %.cpp
- $(CXX) $(ARCH_FLAGS) $(SYSROOT_FLAGS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $<
-
-$(OBJROOT)/%.o : %.S
- $(CC) $(ARCH_FLAGS) -force_cpusubtype_ALL $(SYSROOT_FLAGS) $(INCLUDES) $(CPPFLAGS) $(ASFLAGS) -c -o $@ $<
-
-$(OBJROOT)/$(LIBUNWIND_FILENAME): $(OBJS)
- $(CXX) -o $@ $(ARC_FLAGS) $(SYSROOT_FLAGS) $(LDFLAGS) \
- -dynamiclib -install_name $(LIBDIR)/$(LIBUNWIND_FILENAME) \
- -compatibility_version $(LIBUNWIND_COMPAT_VERSION) -current_version $(LIBUNWIND_CURRENT_VERSION) \
- $(OBJS)
-
-$(OBJROOT)/$(LIBUNWIND_FILENAME_STATIC): $(OBJS)
- $(AR) cru $@ $(OBJS)
- $(RANLIB) $@
-
-all: $(OBJROOT)/$(LIBUNWIND_FILENAME) $(OBJROOT)/$(LIBUNWIND_FILENAME_STATIC)
-
-installhdrs:
- install -d -m 755 $(DSTROOT)$(INCDIR)
- install -d -m 755 $(DSTROOT)$(LIBUNWIND_INCDIR)
- install -d -m 755 $(DSTROOT)$(MACHO_INCDIR)
-
- for f in $(HEADERS); do \
- install -m 644 $$f $(DSTROOT)$(INCDIR); \
- done
-
- for f in $(LIBUNWIND_HEADERS); do \
- install -m 644 $$f $(DSTROOT)$(LIBUNWIND_INCDIR); \
- done
-
- for f in $(MACHO_HEADERS); do \
- install -m 644 $$f $(DSTROOT)$(MACHO_INCDIR); \
- done
-
-installdylib: $(OBJROOT)/$(LIBUNWIND_FILENAME)
-ifdef SYMROOT
- install -m 755 $(OBJROOT)/$(LIBUNWIND_FILENAME) $(SYMROOT)
- $(DSYMUTIL) --out $(SYMROOT)/$(LIBUNWIND_FILENAME).dSYM $(OBJROOT)/$(LIBUNWIND_FILENAME)
-endif
- install -d -m 755 $(DSTROOT)$(LIBDIR)
- install -m 755 $(OBJROOT)/$(LIBUNWIND_FILENAME) $(DSTROOT)$(LIBDIR)
-ifneq "NO" "$(STRIP_ON_INSTALL)"
- $(STRIP) $(STRIP_LIB_FLAGS) $(DSTROOT)$(LIBDIR)/$(LIBUNWIND_FILENAME)
-endif
- ln -s $(LIBUNWIND_FILENAME) $(DSTROOT)$(LIBDIR)/$(LIBUNWIND_SYMLINKNAME)
-
-installstatic: $(OBJROOT)/$(LIBUNWIND_FILENAME_STATIC)
- install -d -m 755 $(DSTROOT)$(LIBDIR)
- install -m 644 $(OBJROOT)/$(LIBUNWIND_FILENAME_STATIC) $(DSTROOT)$(LIBDIR)
-
-installlibs: installdylib installstatic
-install: installhdrs installlibs
</del></span></pre>
</div>
</div>
</body>
</html>