[131425] trunk/dports/devel/libunwind
jeremyhu at macports.org
jeremyhu at macports.org
Sun Jan 11 19:44:08 PST 2015
Revision: 131425
https://trac.macports.org/changeset/131425
Author: jeremyhu at macports.org
Date: 2015-01-11 19:44:08 -0800 (Sun, 11 Jan 2015)
Log Message:
-----------
libunwind-headers: Fix for use on Tiger (#46527)
Modified Paths:
--------------
trunk/dports/devel/libunwind/Portfile
Added Paths:
-----------
trunk/dports/devel/libunwind/files/0002-libunwind-Fix-fallback-implementation-of-_dyld_find_.patch
trunk/dports/devel/libunwind/files/0003-libunwind-Add-missing-include-of-libunwind_ext.h-to-.patch
trunk/dports/devel/libunwind/files/0004-libunwind-Use-__builtin_trap-rather-than-__builtin_u.patch
trunk/dports/devel/libunwind/files/0005-libunwind-ppc-build-fix.patch
trunk/dports/devel/libunwind/files/0006-libunwind-Only-include-Availability.h-on-Leopard-and.patch
trunk/dports/devel/libunwind/files/0008-libunwind-MacPorts-availability.patch
Removed Paths:
-------------
trunk/dports/devel/libunwind/files/libunwind-available.patch
trunk/dports/devel/libunwind/files/libunwind-donthide.patch
trunk/dports/devel/libunwind/files/libunwind-fallback-x86_64.patch
trunk/dports/devel/libunwind/files/libunwind-ppc.patch
trunk/dports/devel/libunwind/files/no-builtin_unreachable.patch
Modified: trunk/dports/devel/libunwind/Portfile
===================================================================
--- trunk/dports/devel/libunwind/Portfile 2015-01-12 03:06:02 UTC (rev 131424)
+++ trunk/dports/devel/libunwind/Portfile 2015-01-12 03:44:08 UTC (rev 131425)
@@ -6,7 +6,7 @@
name libunwind
version 3.5.0
revision 4
-subport ${name}-headers { revision 5 }
+subport ${name}-headers { revision 6 }
epoch 1
categories devel
platforms darwin
@@ -35,10 +35,14 @@
file copy ${filespath}/Makefile ${build.dir}/Makefile
}
+patch.pre_args -p1
patchfiles \
- libunwind-ppc.patch \
- no-builtin_unreachable.patch \
- libunwind-available.patch
+ 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
post-patch {
if {${os.major} < 9} {
@@ -73,10 +77,6 @@
variant universal {}
- patchfiles-append \
- libunwind-donthide.patch \
- libunwind-fallback-x86_64.patch
-
if {${os.major} < 11} {
# Snow Leopard's libSystem's libmacho does not contain getsectiondata()
Added: trunk/dports/devel/libunwind/files/0002-libunwind-Fix-fallback-implementation-of-_dyld_find_.patch
===================================================================
--- trunk/dports/devel/libunwind/files/0002-libunwind-Fix-fallback-implementation-of-_dyld_find_.patch (rev 0)
+++ trunk/dports/devel/libunwind/files/0002-libunwind-Fix-fallback-implementation-of-_dyld_find_.patch 2015-01-12 03:44:08 UTC (rev 131425)
@@ -0,0 +1,42 @@
+From 5e5525647e09e584475ba8f6d3f75c174a23e386 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at 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 at 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
+
Added: trunk/dports/devel/libunwind/files/0003-libunwind-Add-missing-include-of-libunwind_ext.h-to-.patch
===================================================================
--- trunk/dports/devel/libunwind/files/0003-libunwind-Add-missing-include-of-libunwind_ext.h-to-.patch (rev 0)
+++ trunk/dports/devel/libunwind/files/0003-libunwind-Add-missing-include-of-libunwind_ext.h-to-.patch 2015-01-12 03:44:08 UTC (rev 131425)
@@ -0,0 +1,55 @@
+From 54e1764c41242c4a343edfdb92b0d8d88ddd5462 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at 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 at 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
+
Added: trunk/dports/devel/libunwind/files/0004-libunwind-Use-__builtin_trap-rather-than-__builtin_u.patch
===================================================================
--- trunk/dports/devel/libunwind/files/0004-libunwind-Use-__builtin_trap-rather-than-__builtin_u.patch (rev 0)
+++ trunk/dports/devel/libunwind/files/0004-libunwind-Use-__builtin_trap-rather-than-__builtin_u.patch 2015-01-12 03:44:08 UTC (rev 131425)
@@ -0,0 +1,31 @@
+From f3daa24749c2b01d82172487a64cbc353b0d4424 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at 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 at 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
+
Added: trunk/dports/devel/libunwind/files/0005-libunwind-ppc-build-fix.patch
===================================================================
--- trunk/dports/devel/libunwind/files/0005-libunwind-ppc-build-fix.patch (rev 0)
+++ trunk/dports/devel/libunwind/files/0005-libunwind-ppc-build-fix.patch 2015-01-12 03:44:08 UTC (rev 131425)
@@ -0,0 +1,43 @@
+From f9b3d797e4899e235142d1171f18796830cbcd49 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at 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 at 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
+
Added: trunk/dports/devel/libunwind/files/0006-libunwind-Only-include-Availability.h-on-Leopard-and.patch
===================================================================
--- trunk/dports/devel/libunwind/files/0006-libunwind-Only-include-Availability.h-on-Leopard-and.patch (rev 0)
+++ trunk/dports/devel/libunwind/files/0006-libunwind-Only-include-Availability.h-on-Leopard-and.patch 2015-01-12 03:44:08 UTC (rev 131425)
@@ -0,0 +1,69 @@
+From 46135392a3ca41ad55572a6e721c71c8b7e4a6d1 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at 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 at apple.com>
+---
+ include/libunwind.h | 20 +++++++++++++++-----
+ src/Unwind/config.h | 9 ++++++++-
+ 2 files changed, 23 insertions(+), 6 deletions(-)
+
+diff --git a/include/libunwind.h b/include/libunwind.h
+index 448d86a..fbfc19b 100644
+--- a/include/libunwind.h
++++ b/include/libunwind.h
+@@ -26,12 +26,22 @@
+ #endif
+
+ #if __APPLE__
+- #include <Availability.h>
+- #if __arm__
+- #define LIBUNWIND_AVAIL __attribute__((unavailable))
+- #else
+- #define LIBUNWIND_AVAIL __OSX_AVAILABLE_STARTING(__MAC_10_6, __IPHONE_5_0)
++ #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>
++ #define LIBUNWIND_AVAIL AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER
++ #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
+
Added: trunk/dports/devel/libunwind/files/0008-libunwind-MacPorts-availability.patch
===================================================================
--- trunk/dports/devel/libunwind/files/0008-libunwind-MacPorts-availability.patch (rev 0)
+++ trunk/dports/devel/libunwind/files/0008-libunwind-MacPorts-availability.patch 2015-01-12 03:44:08 UTC (rev 131425)
@@ -0,0 +1,70 @@
+From 1691346de5361741a1b661d62da7e05e844e702f Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at 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
+
Deleted: trunk/dports/devel/libunwind/files/libunwind-available.patch
===================================================================
--- trunk/dports/devel/libunwind/files/libunwind-available.patch 2015-01-12 03:06:02 UTC (rev 131424)
+++ trunk/dports/devel/libunwind/files/libunwind-available.patch 2015-01-12 03:44:08 UTC (rev 131425)
@@ -1,13 +0,0 @@
-diff --git a/include/libunwind.h b/include/libunwind.h
-index 448d86a..971953b 100644
---- include/libunwind.h
-+++ include/libunwind.h
-@@ -25,7 +25,7 @@
- #define LIBCXXABI_ARM_EHABI 0
- #endif
-
--#if __APPLE__
-+#if defined(__APPLE__) && !defined(USE_MACPORTS_LIBUNWIND)
- #include <Availability.h>
- #if __arm__
- #define LIBUNWIND_AVAIL __attribute__((unavailable))
Deleted: trunk/dports/devel/libunwind/files/libunwind-donthide.patch
===================================================================
--- trunk/dports/devel/libunwind/files/libunwind-donthide.patch 2015-01-12 03:06:02 UTC (rev 131424)
+++ trunk/dports/devel/libunwind/files/libunwind-donthide.patch 2015-01-12 03:44:08 UTC (rev 131425)
@@ -1,41 +0,0 @@
---- src/Unwind/Unwind_AppleExtras.cpp.orig 2015-01-04 02:29:35.000000000 -0800
-+++ src/Unwind/Unwind_AppleExtras.cpp 2015-01-04 02:30:46.000000000 -0800
-@@ -41,38 +41,7 @@ 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
-
-
Deleted: trunk/dports/devel/libunwind/files/libunwind-fallback-x86_64.patch
===================================================================
--- trunk/dports/devel/libunwind/files/libunwind-fallback-x86_64.patch 2015-01-12 03:06:02 UTC (rev 131424)
+++ trunk/dports/devel/libunwind/files/libunwind-fallback-x86_64.patch 2015-01-12 03:44:08 UTC (rev 131425)
@@ -1,14 +0,0 @@
---- src/Unwind/AddressSpace.hpp.orig 2015-01-04 00:47:48.000000000 -0800
-+++ src/Unwind/AddressSpace.hpp 2015-01-04 00:48:13.000000000 -0800
-@@ -295,7 +295,11 @@ inline LocalAddressSpace::pint_t LocalAd
-
- // 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;
-
Deleted: trunk/dports/devel/libunwind/files/libunwind-ppc.patch
===================================================================
--- trunk/dports/devel/libunwind/files/libunwind-ppc.patch 2015-01-12 03:06:02 UTC (rev 131424)
+++ trunk/dports/devel/libunwind/files/libunwind-ppc.patch 2015-01-12 03:44:08 UTC (rev 131425)
@@ -1,26 +0,0 @@
---- src/Unwind/config.h.orig 2015-01-11 13:39:54.000000000 -0800
-+++ src/Unwind/config.h 2015-01-11 13:43:38.000000000 -0800
-@@ -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__)
Deleted: trunk/dports/devel/libunwind/files/no-builtin_unreachable.patch
===================================================================
--- trunk/dports/devel/libunwind/files/no-builtin_unreachable.patch 2015-01-12 03:06:02 UTC (rev 131424)
+++ trunk/dports/devel/libunwind/files/no-builtin_unreachable.patch 2015-01-12 03:44:08 UTC (rev 131425)
@@ -1,15 +0,0 @@
-http://www.llvm.org/bugs/show_bug.cgi?id=22198
-
---- src/Unwind/DwarfInstructions.hpp.orig 2015-01-11 13:10:47.000000000 -0800
-+++ src/Unwind/DwarfInstructions.hpp 2015-01-11 13:13:44.000000000 -0800
-@@ -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();
- }
- };
-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150111/84e98fac/attachment-0001.html>
More information about the macports-changes
mailing list