<pre style='margin:0'>
Jeremy Huddleston Sequoia (jeremyhu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/bbe784fb7023598984e9eadc4bf08d1752f2d19c">https://github.com/macports/macports-ports/commit/bbe784fb7023598984e9eadc4bf08d1752f2d19c</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit bbe784fb7023598984e9eadc4bf08d1752f2d19c
</span>Author: Jeremy Huddleston Sequoia <jeremyhu@macports.org>
AuthorDate: Mon Oct 31 23:53:33 2016 -0700
<span style='display:block; white-space:pre;color:#404040;'> libunwind: Fix i386 build
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@macports.org>
</span>---
devel/libunwind/Portfile | 19 ++++++------
...nd_unwind_sections-for-pre-10.7.-Patch-b.patch} | 22 +++++---------
...d-missing-include-of-libunwind_ext.h-to-.patch} | 13 +++++----
...e-__builtin_trap-rather-than-__builtin_u.patch} | 7 +++--
...ix.patch => 0004-libunwind-ppc-build-fix.patch} | 9 +++---
...ly-include-Availability.h-on-Leopard-and.patch} | 7 +++--
... => 0006-libunwind-MacPorts-availability.patch} | 9 +++---
...Makefile.patch => 0007-MacPorts-Makefile.patch} | 30 ++++++++++++-------
...DC_FORMAT_MACROS-to-bring-in-format-macro.patch | 29 ------------------
...ind-Silence-Wundef-warning-in-libunwind.h.patch | 34 ++++++++++++++++++++++
...d-missing-include-of-stdint.h-for-uint64_.patch | 29 ------------------
11 files changed, 96 insertions(+), 112 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libunwind/Portfile b/devel/libunwind/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2a3a0fc..d79db70 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libunwind/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libunwind/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup compiler_blacklist_versions 1.0
</span>
name libunwind
version 3.9.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> subport ${name}-headers { revision 0 }
epoch 1
categories devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,15 +33,14 @@ use_configure no
</span>
patch.pre_args -p1
patchfiles \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 0001-libunwind-Add-missing-include-of-libunwind_ext.h-to-.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0002-libunwind-Use-__builtin_trap-rather-than-__builtin_u.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0003-libunwind-ppc-build-fix.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0004-libunwind-Only-include-Availability.h-on-Leopard-and.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0005-libunwind-MacPorts-availability.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0006-MacPorts-Makefile.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0007-libunwind-Fix-fallback-implementation-of-_dyld_find_.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0008-Define-__STDC_FORMAT_MACROS-to-bring-in-format-macro.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0009-config.h-Add-missing-include-of-stdint.h-for-uint64_.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0001-fix-_dyld_find_unwind_sections-for-pre-10.7.-Patch-b.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0002-libunwind-Add-missing-include-of-libunwind_ext.h-to-.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0003-libunwind-Use-__builtin_trap-rather-than-__builtin_u.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0004-libunwind-ppc-build-fix.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0005-libunwind-Only-include-Availability.h-on-Leopard-and.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0006-libunwind-MacPorts-availability.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0007-MacPorts-Makefile.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0008-libunwind-Silence-Wundef-warning-in-libunwind.h.patch \
</span> clang-3.4-workaround.patch
post-patch {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libunwind/files/0007-libunwind-Fix-fallback-implementation-of-_dyld_find_.patch b/devel/libunwind/files/0001-fix-_dyld_find_unwind_sections-for-pre-10.7.-Patch-b.patch
</span>similarity index 79%
rename from devel/libunwind/files/0007-libunwind-Fix-fallback-implementation-of-_dyld_find_.patch
rename to devel/libunwind/files/0001-fix-_dyld_find_unwind_sections-for-pre-10.7.-Patch-b.patch
<span style='display:block; white-space:pre;color:#808080;'>index ecb6ba5..f92b5d1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libunwind/files/0007-libunwind-Fix-fallback-implementation-of-_dyld_find_.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libunwind/files/0001-fix-_dyld_find_unwind_sections-for-pre-10.7.-Patch-b.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,23 +1,17 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From a53ec30a5e250dc8bdb50a7a92b813c89da6d121 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Mon, 31 Oct 2016 12:17:52 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 7/8] libunwind: Fix fallback implementation of
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _dyld_find_unwind_sections for x86_64 and document dependency on a newer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libmacho
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 9762fdf72e81d7d5ec51ffd7d83a25f79f3d9fa3 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Nick Kledzik <kledzik@apple.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Mon, 31 Oct 2016 21:04:17 +0000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1/8] fix _dyld_find_unwind_sections() for pre-10.7. Patch by
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Jeremy Sequoia
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- * Use the correct Dl_info field for the mach header
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Use the correct type for the mach header
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Set compact_unwind_section and compact_unwind_section_length
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-http://www.llvm.org/bugs/show_bug.cgi?id=22270
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+git-svn-id: https://llvm.org/svn/llvm-project/libunwind/trunk@285636 91177308-0d34-0410-b5e6-96231b3b80d8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+(cherry picked from commit b109e9421d302bb7f2dff81a67536fcef234bd4b)
</span> ---
src/AddressSpace.hpp | 38 ++++++++++++++++++++++----------------
1 file changed, 22 insertions(+), 16 deletions(-)
diff --git a/src/AddressSpace.hpp b/src/AddressSpace.hpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 2792e0e..67aa664 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index da1b6a4..f00d05d 100644
</span> --- a/src/AddressSpace.hpp
+++ b/src/AddressSpace.hpp
@@ -321,28 +321,34 @@ LocalAddressSpace::getEncodedP(pint_t &addr, pint_t end, uint8_t encoding,
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libunwind/files/0001-libunwind-Add-missing-include-of-libunwind_ext.h-to-.patch b/devel/libunwind/files/0002-libunwind-Add-missing-include-of-libunwind_ext.h-to-.patch
</span>similarity index 82%
rename from devel/libunwind/files/0001-libunwind-Add-missing-include-of-libunwind_ext.h-to-.patch
rename to devel/libunwind/files/0002-libunwind-Add-missing-include-of-libunwind_ext.h-to-.patch
<span style='display:block; white-space:pre;color:#808080;'>index 384b6f1..7255ae3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libunwind/files/0001-libunwind-Add-missing-include-of-libunwind_ext.h-to-.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libunwind/files/0002-libunwind-Add-missing-include-of-libunwind_ext.h-to-.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +1,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 0ba13649aec552887c48213cbd8812c1a6c9035b Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From c24e87f9f088a7ba1b82ab408464bcaaea6b6139 Mon Sep 17 00:00:00 2001
</span> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sun, 11 Jan 2015 14:28:08 -0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1/8] libunwind: Add missing include of libunwind_ext.h to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 2/8] libunwind: Add missing include of libunwind_ext.h to
</span> 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>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+(cherry picked from commit 1ee53ed4b4340671492702f3e6f478f40bb169c1)
</span> ---
src/CompactUnwinder.hpp | 1 +
src/DwarfInstructions.hpp | 2 +-
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,7 +15,7 @@ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span> 3 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/CompactUnwinder.hpp b/src/CompactUnwinder.hpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 1be1b0b..5e0060f 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index f528fba..0c4a866 100644
</span> --- a/src/CompactUnwinder.hpp
+++ b/src/CompactUnwinder.hpp
@@ -21,6 +21,7 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,7 +27,7 @@ index 1be1b0b..5e0060f 100644
</span> #define EXTRACT_BITS(value, mask) \
((value >> __builtin_ctz(mask)) & (((1 << __builtin_popcount(mask))) - 1))
diff --git a/src/DwarfInstructions.hpp b/src/DwarfInstructions.hpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 9494bb8..9acb3be 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index ce90aa0..19910a9 100644
</span> --- a/src/DwarfInstructions.hpp
+++ b/src/DwarfInstructions.hpp
@@ -22,7 +22,7 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,10 +40,10 @@ index 9494bb8..9acb3be 100644
</span> namespace libunwind {
diff --git a/src/UnwindCursor.hpp b/src/UnwindCursor.hpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 4ed5a6e..25f0ca4 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 18a7809..59ca4d7 100644
</span> --- a/src/UnwindCursor.hpp
+++ b/src/UnwindCursor.hpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -33,6 +33,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -31,6 +31,7 @@
</span> #include "DwarfInstructions.hpp"
#include "EHHeaderParser.hpp"
#include "libunwind.h"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libunwind/files/0002-libunwind-Use-__builtin_trap-rather-than-__builtin_u.patch b/devel/libunwind/files/0003-libunwind-Use-__builtin_trap-rather-than-__builtin_u.patch
</span>similarity index 80%
rename from devel/libunwind/files/0002-libunwind-Use-__builtin_trap-rather-than-__builtin_u.patch
rename to devel/libunwind/files/0003-libunwind-Use-__builtin_trap-rather-than-__builtin_u.patch
<span style='display:block; white-space:pre;color:#808080;'>index 002ee28..d258200 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libunwind/files/0002-libunwind-Use-__builtin_trap-rather-than-__builtin_u.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libunwind/files/0003-libunwind-Use-__builtin_trap-rather-than-__builtin_u.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,18 +1,19 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From bc1fe4f07ed78992bb49f43531dad62563ff88f5 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From dd8d4f3cf72e653e61ab57627d19a1a856fcee65 Mon Sep 17 00:00:00 2001
</span> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sun, 11 Jan 2015 14:34:13 -0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 2/8] libunwind: Use __builtin_trap rather than
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 3/8] libunwind: Use __builtin_trap rather than
</span> __builtin_unreachable for older toolchains
http://www.llvm.org/bugs/show_bug.cgi?id=22198
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+(cherry picked from commit dca5b01ae385a7ba9f6d53c7a2e52a337e4b8e9c)
</span> ---
src/DwarfInstructions.hpp | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/DwarfInstructions.hpp b/src/DwarfInstructions.hpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 9acb3be..712a0ec 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 19910a9..160fd47 100644
</span> --- a/src/DwarfInstructions.hpp
+++ b/src/DwarfInstructions.hpp
@@ -72,7 +72,9 @@ private:
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libunwind/files/0003-libunwind-ppc-build-fix.patch b/devel/libunwind/files/0004-libunwind-ppc-build-fix.patch
</span>similarity index 81%
rename from devel/libunwind/files/0003-libunwind-ppc-build-fix.patch
rename to devel/libunwind/files/0004-libunwind-ppc-build-fix.patch
<span style='display:block; white-space:pre;color:#808080;'>index 8f62ae0..4a0f681 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libunwind/files/0003-libunwind-ppc-build-fix.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libunwind/files/0004-libunwind-ppc-build-fix.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,20 +1,21 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From fd489b193fb600714ccf51091057bb4d4f3dbe5f Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 255cfde0eda63fa5c71262be47988099b116917c Mon Sep 17 00:00:00 2001
</span> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sun, 11 Jan 2015 14:35:08 -0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 3/8] libunwind: ppc build fix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 4/8] libunwind: ppc build fix
</span>
http://www.llvm.org/bugs/show_bug.cgi?id=22200
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+(cherry picked from commit 3e3b71e79f9aa90985eff91c008fe911326f4df3)
</span> ---
src/config.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/config.h b/src/config.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index f61ded8..4e4dd99 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index a50222f..1f48163 100644
</span> --- a/src/config.h
+++ b/src/config.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -62,13 +62,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -61,13 +61,14 @@
</span> #define _LIBUNWIND_BUILD_SJLJ_APIS 0
#endif
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libunwind/files/0004-libunwind-Only-include-Availability.h-on-Leopard-and.patch b/devel/libunwind/files/0005-libunwind-Only-include-Availability.h-on-Leopard-and.patch
</span>similarity index 86%
rename from devel/libunwind/files/0004-libunwind-Only-include-Availability.h-on-Leopard-and.patch
rename to devel/libunwind/files/0005-libunwind-Only-include-Availability.h-on-Leopard-and.patch
<span style='display:block; white-space:pre;color:#808080;'>index 2fec5f9..3078560 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libunwind/files/0004-libunwind-Only-include-Availability.h-on-Leopard-and.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libunwind/files/0005-libunwind-Only-include-Availability.h-on-Leopard-and.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,18 +1,19 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From c07e542adc45ee5246a7e1afba35ec2b44dfc183 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From a3b73507baf6d6dfada76671f0cd7f9c69d73e92 Mon Sep 17 00:00:00 2001
</span> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sun, 11 Jan 2015 19:24:43 -0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 4/8] libunwind: Only include <Availability.h> on Leopard and
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 5/8] libunwind: Only include <Availability.h> on Leopard and
</span> newer OS X versions
http://www.llvm.org/bugs/show_bug.cgi?id=22203
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+(cherry picked from commit ec8a6a84e4969885ee235761611e891a433f274d)
</span> ---
include/libunwind.h | 22 ++++++++++++++++++----
1 file changed, 18 insertions(+), 4 deletions(-)
diff --git a/include/libunwind.h b/include/libunwind.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index b52fe9d..8ac4970 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index c5b9633..45cff03 100644
</span> --- a/include/libunwind.h
+++ b/include/libunwind.h
@@ -20,12 +20,26 @@
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libunwind/files/0005-libunwind-MacPorts-availability.patch b/devel/libunwind/files/0006-libunwind-MacPorts-availability.patch
</span>similarity index 92%
rename from devel/libunwind/files/0005-libunwind-MacPorts-availability.patch
rename to devel/libunwind/files/0006-libunwind-MacPorts-availability.patch
<span style='display:block; white-space:pre;color:#808080;'>index 3eaeba9..ffef808 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libunwind/files/0005-libunwind-MacPorts-availability.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libunwind/files/0006-libunwind-MacPorts-availability.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +1,16 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 4dbb0103e4ba6dd6b2a7552f4117d211750accac Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From fdab5fe140a5f5886e82ab68fde7a0d0f1ca390f Mon Sep 17 00:00:00 2001
</span> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sun, 4 Jan 2015 13:21:39 -0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 5/8] libunwind: MacPorts availability
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 6/8] libunwind: MacPorts availability
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+(cherry picked from commit eef6a1ecc7f181f2bfb7ebe431df270550d52d4b)
</span> ---
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
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 8ac4970..4d34ce5 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 45cff03..34c40de 100644
</span> --- a/include/libunwind.h
+++ b/include/libunwind.h
@@ -19,7 +19,7 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,7 +23,7 @@ index 8ac4970..4d34ce5 100644
</span> #if __has_include(<Availability.h>)
#include <Availability.h>
diff --git a/src/Unwind_AppleExtras.cpp b/src/Unwind_AppleExtras.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index d8301c0..38281fd 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index b8baef5..078aa86 100644
</span> --- a/src/Unwind_AppleExtras.cpp
+++ b/src/Unwind_AppleExtras.cpp
@@ -41,40 +41,8 @@ struct libgcc_object_info {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libunwind/files/0006-MacPorts-Makefile.patch b/devel/libunwind/files/0007-MacPorts-Makefile.patch
</span>similarity index 78%
rename from devel/libunwind/files/0006-MacPorts-Makefile.patch
rename to devel/libunwind/files/0007-MacPorts-Makefile.patch
<span style='display:block; white-space:pre;color:#808080;'>index 0294f38..5e0fa30 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libunwind/files/0006-MacPorts-Makefile.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libunwind/files/0007-MacPorts-Makefile.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,20 +1,21 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From be4fce5fe4f5d56b3020669404839b94c926e78b Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From e52511d90c70b128a814168a5c31cda2cd0a0138 Mon Sep 17 00:00:00 2001
</span> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Tue, 20 Jan 2015 10:23:13 -0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 6/8] MacPorts Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 7/8] MacPorts Makefile
</span>
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+(cherry picked from commit ada388012fd8cfa296119b898cf0d71113d53ca1)
</span> ---
<span style='display:block; white-space:pre;background:#ffe0e0;'>- src/Makefile | 133 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 133 insertions(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/Makefile | 142 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 142 insertions(+)
</span> create mode 100644 src/Makefile
diff --git a/src/Makefile b/src/Makefile
new file mode 100644
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 0000000..d788822
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 0000000..29c856a
</span> --- /dev/null
+++ b/src/Makefile
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1,133 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -0,0 +1,142 @@
</span> +# Default locations for the build
+ifdef DESTDIR
+DSTROOT = $(DESTDIR)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -89,17 +90,26 @@ index 0000000..d788822
</span> +
+OBJS = $(C_SRCS:%.c=$(OBJROOT)/%.o) $(CXX_SRCS:%.cpp=$(OBJROOT)/%.o) $(ASM_SRCS:%.S=$(OBJROOT)/%.o)
+
<span style='display:block; white-space:pre;background:#e0ffe0;'>++CPPFLAGS = -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -D_LIBUNWIND_IS_NATIVE_ONLY -U__STRICT_ANSI__ $(SYSROOT_FLAGS) $(INCLUDES) $(OTHER_CPPFLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++BASE_CFLAGS = -fvisibility-inlines-hidden -fvisibility-inlines-hidden -fno-rtti -fstrict-aliasing -fno-exceptions -fPIC -funwind-tables
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CFLAGS = $(ARCH_FLAGS) $(BASE_CFLAGS) $(OTHER_CFLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CXXFLAGS = $(ARCH_FLAGS) $(BASE_CFLAGS) $(OTHER_CXXFLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ASFLAGS = $(ARCH_FLAGS) $(BASE_CFLAGS) -force_cpusubtype_ALL $(OTHER_ASFLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++LDFLAGS = $(ARCH_FLAGS) $(OTHER_LDFLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span> +$(OBJROOT)/%.o : %.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(CC) $(ARCH_FLAGS) $(SYSROOT_FLAGS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
</span> +
+$(OBJROOT)/%.o : %.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(CXX) $(ARCH_FLAGS) $(SYSROOT_FLAGS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $<
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $<
</span> +
+$(OBJROOT)/%.o : %.S
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(CC) $(ARCH_FLAGS) -force_cpusubtype_ALL $(SYSROOT_FLAGS) $(INCLUDES) $(CPPFLAGS) $(ASFLAGS) -c -o $@ $<
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(CC) $(CPPFLAGS) $(ASFLAGS) -c -o $@ $<
</span> +
+$(OBJROOT)/$(LIBUNWIND_FILENAME): $(OBJS)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(CXX) -o $@ $(ARCH_FLAGS) $(SYSROOT_FLAGS) $(LDFLAGS) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(CXX) -o $@ $(LDFLAGS) \
</span> + -dynamiclib -install_name $(LIBDIR)/$(LIBUNWIND_FILENAME) \
+ -compatibility_version $(LIBUNWIND_COMPAT_VERSION) -current_version $(LIBUNWIND_CURRENT_VERSION) \
+ $(OBJS)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libunwind/files/0008-Define-__STDC_FORMAT_MACROS-to-bring-in-format-macro.patch b/devel/libunwind/files/0008-Define-__STDC_FORMAT_MACROS-to-bring-in-format-macro.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 375c312..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libunwind/files/0008-Define-__STDC_FORMAT_MACROS-to-bring-in-format-macro.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,29 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 45d0e41fe51c47f69b719e8872cdd0553cdc779a Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Sat, 7 Mar 2015 19:58:56 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 8/8] Define __STDC_FORMAT_MACROS to bring in format macros
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- when including <inttypes.h> in C++ code
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fixes regression from: 1f22bd54e8565959c1d2c3ed7384cb77e18d0807
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-CC: Dan Albert <danalbert@google.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/DwarfParser.hpp | 1 +
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 1 insertion(+)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/DwarfParser.hpp b/src/DwarfParser.hpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 62c047b..150272a 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/DwarfParser.hpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/DwarfParser.hpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -13,6 +13,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifndef __DWARF_PARSER_HPP__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define __DWARF_PARSER_HPP__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define __STDC_FORMAT_MACROS 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <inttypes.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdint.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.10.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libunwind/files/0008-libunwind-Silence-Wundef-warning-in-libunwind.h.patch b/devel/libunwind/files/0008-libunwind-Silence-Wundef-warning-in-libunwind.h.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..f4e77a4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libunwind/files/0008-libunwind-Silence-Wundef-warning-in-libunwind.h.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,34 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 0b926132265100d50cfb3f8a00d37afd76e243e7 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Mon, 31 Oct 2016 23:22:11 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 8/8] libunwind: Silence -Wundef warning in libunwind.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+libunwind/include/libunwind.h:31:7: warning: '__arm__' is not defined, evaluates to 0 [-Wundef]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if __arm__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ^
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+1 warning generated.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://llvm.org/bugs/show_bug.cgi?id=30861
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+(cherry picked from commit 58844e470ee2fb46b0bb4bb6968742f90e8c6486)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include/libunwind.h | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 1 insertion(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/include/libunwind.h b/include/libunwind.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 34c40de..90c5595 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/include/libunwind.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/include/libunwind.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -28,7 +28,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <Availability.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- #if __arm__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #ifdef __arm__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define LIBUNWIND_AVAIL __attribute__((unavailable))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif defined(__OSX_AVAILABLE_STARTING)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define LIBUNWIND_AVAIL __OSX_AVAILABLE_STARTING(__MAC_10_6, __IPHONE_5_0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.10.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libunwind/files/0009-config.h-Add-missing-include-of-stdint.h-for-uint64_.patch b/devel/libunwind/files/0009-config.h-Add-missing-include-of-stdint.h-for-uint64_.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 6f28636..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libunwind/files/0009-config.h-Add-missing-include-of-stdint.h-for-uint64_.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,29 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 59508d1029580fe2f95eb4b8a002175c6f87710d Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Wed, 12 Oct 2016 22:52:51 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 9/9] config.h: Add missing include of stdint.h for uint64_t
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- usage
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Regressed-in: trunk r270692
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Regressed-in: d2d1ea9d75dfc4f55540f7e3cf940c6a1d6674cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-CC: Asiri Rathnayake <asiri.rathnayake@arm.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/config.h | 1 +
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 1 insertion(+)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/config.h b/src/config.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index cfe7706..4e4dd99 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/config.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/config.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -16,6 +16,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <assert.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <stdint.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Define static_assert() unless already defined by compiler.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.10.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>