[132154] trunk/dports/devel/cctools
jeremyhu at macports.org
jeremyhu at macports.org
Sat Jan 24 16:53:11 PST 2015
Revision: 132154
https://trac.macports.org/changeset/132154
Author: jeremyhu at macports.org
Date: 2015-01-24 16:53:11 -0800 (Sat, 24 Jan 2015)
Log Message:
-----------
cctools: Fix a build failure with newer cctools on Tiger
Modified Paths:
--------------
trunk/dports/devel/cctools/Portfile
Added Paths:
-----------
trunk/dports/devel/cctools/files/cctools-862-unifdef__DARWIN_UNIX03-arm.patch
Modified: trunk/dports/devel/cctools/Portfile
===================================================================
--- trunk/dports/devel/cctools/Portfile 2015-01-25 00:19:24 UTC (rev 132153)
+++ trunk/dports/devel/cctools/Portfile 2015-01-25 00:53:11 UTC (rev 132154)
@@ -32,7 +32,7 @@
depends_build port:libunwind-headers
-patchfiles cctools-829-lto.patch PR-37520.patch cctools-839-static-dis_info.patch PR-12400897.patch cctools-862-prunetrie.patch
+patchfiles cctools-829-lto.patch PR-37520.patch cctools-839-static-dis_info.patch PR-12400897.patch cctools-862-prunetrie.patch cctools-862-unifdef__DARWIN_UNIX03-arm.patch
variant universal {}
@@ -48,7 +48,7 @@
rmd160 91c0a3f192f1eed60b64ef5a0a06918d0ce0b0c9 \
sha256 6116c06920112c634f6df2fa8b2f171ee3b90ff2176137da5856336695a6a676
- patchfiles-delete cctools-829-lto.patch PR-37520.patch cctools-839-static-dis_info.patch cctools-862-prunetrie.patch
+ patchfiles-delete cctools-829-lto.patch PR-37520.patch cctools-839-static-dis_info.patch cctools-862-prunetrie.patch cctools-862-unifdef__DARWIN_UNIX03-arm.patch
patchfiles-append cctools-806-lto.patch PR-9087924.patch PR-9830754.patch cctools-822-no-lto.patch PR-11136237.patch PR-12475288.patch cctools-806-prunetrie.patch
} else {
if {${os.major} < 11} {
Added: trunk/dports/devel/cctools/files/cctools-862-unifdef__DARWIN_UNIX03-arm.patch
===================================================================
--- trunk/dports/devel/cctools/files/cctools-862-unifdef__DARWIN_UNIX03-arm.patch (rev 0)
+++ trunk/dports/devel/cctools/files/cctools-862-unifdef__DARWIN_UNIX03-arm.patch 2015-01-25 00:53:11 UTC (rev 132154)
@@ -0,0 +1,214 @@
+<rdar://problem/19591541>
+
+--- include/mach/arm/_structs.h.orig 2014-11-01 22:48:02.000000000 -0700
++++ include/mach/arm/_structs.h 2015-01-24 16:36:04.000000000 -0800
+@@ -7,7 +7,6 @@
+ #ifndef _MACH_ARM__STRUCTS_H_
+ #define _MACH_ARM__STRUCTS_H_
+
+-#if __DARWIN_UNIX03
+ #define _STRUCT_ARM_EXCEPTION_STATE struct __darwin_arm_exception_state
+ _STRUCT_ARM_EXCEPTION_STATE
+ {
+@@ -15,17 +14,7 @@ _STRUCT_ARM_EXCEPTION_STATE
+ __uint32_t __fsr; /* Fault status */
+ __uint32_t __far; /* Virtual Fault Address */
+ };
+-#else /* !__DARWIN_UNIX03 */
+-#define _STRUCT_ARM_EXCEPTION_STATE struct arm_exception_state
+-_STRUCT_ARM_EXCEPTION_STATE
+-{
+- __uint32_t exception; /* number of arm exception taken */
+- __uint32_t fsr; /* Fault status */
+- __uint32_t far; /* Virtual Fault Address */
+-};
+-#endif /* __DARWIN_UNIX03 */
+
+-#if __DARWIN_UNIX03
+ #define _STRUCT_ARM_EXCEPTION_STATE64 struct __darwin_arm_exception_state64
+ _STRUCT_ARM_EXCEPTION_STATE64
+ {
+@@ -33,17 +22,7 @@ _STRUCT_ARM_EXCEPTION_STATE64
+ __uint32_t __esr; /* Exception syndrome */
+ __uint32_t __exception; /* number of arm exception taken */
+ };
+-#else /* !__DARWIN_UNIX03 */
+-#define _STRUCT_ARM_EXCEPTION_STATE64 struct arm_exception_state64
+-_STRUCT_ARM_EXCEPTION_STATE64
+-{
+- __uint64_t far; /* Virtual Fault Address */
+- __uint32_t esr; /* Exception syndrome */
+- __uint32_t exception; /* number of arm exception taken */
+-};
+-#endif /* __DARWIN_UNIX03 */
+
+-#if __DARWIN_UNIX03
+ #define _STRUCT_ARM_THREAD_STATE struct __darwin_arm_thread_state
+ _STRUCT_ARM_THREAD_STATE
+ {
+@@ -53,19 +32,7 @@ _STRUCT_ARM_THREAD_STATE
+ __uint32_t __pc; /* Program counter r15 */
+ __uint32_t __cpsr; /* Current program status register */
+ };
+-#else /* !__DARWIN_UNIX03 */
+-#define _STRUCT_ARM_THREAD_STATE struct arm_thread_state
+-_STRUCT_ARM_THREAD_STATE
+-{
+- __uint32_t r[13]; /* General purpose register r0-r12 */
+- __uint32_t sp; /* Stack pointer r13 */
+- __uint32_t lr; /* Link register r14 */
+- __uint32_t pc; /* Program counter r15 */
+- __uint32_t cpsr; /* Current program status register */
+-};
+-#endif /* __DARWIN_UNIX03 */
+
+-#if __DARWIN_UNIX03
+ #define _STRUCT_ARM_THREAD_STATE64 struct __darwin_arm_thread_state64
+ _STRUCT_ARM_THREAD_STATE64
+ {
+@@ -76,20 +43,7 @@ _STRUCT_ARM_THREAD_STATE64
+ __uint64_t __pc; /* Program counter */
+ __uint32_t __cpsr; /* Current program status register */
+ };
+-#else /* !__DARWIN_UNIX03 */
+-#define _STRUCT_ARM_THREAD_STATE64 struct arm_thread_state64
+-_STRUCT_ARM_THREAD_STATE64
+-{
+- __uint64_t x[29]; /* General purpose registers x0-x28 */
+- __uint64_t fp; /* Frame pointer x29 */
+- __uint64_t lr; /* Link register x30 */
+- __uint64_t sp; /* Stack pointer x31 */
+- __uint64_t pc; /* Program counter */
+- __uint32_t cpsr; /* Current program status register */
+-};
+-#endif /* __DARWIN_UNIX03 */
+
+-#if __DARWIN_UNIX03
+ #define _STRUCT_ARM_VFP_STATE struct __darwin_arm_vfp_state
+ _STRUCT_ARM_VFP_STATE
+ {
+@@ -97,16 +51,7 @@ _STRUCT_ARM_VFP_STATE
+ __uint32_t __fpscr;
+
+ };
+-#else /* !__DARWIN_UNIX03 */
+-#define _STRUCT_ARM_VFP_STATE struct arm_vfp_state
+-_STRUCT_ARM_VFP_STATE
+-{
+- __uint32_t r[64];
+- __uint32_t fpscr;
+-};
+-#endif /* __DARWIN_UNIX03 */
+
+-#if __DARWIN_UNIX03
+ #define _STRUCT_ARM_NEON_STATE64 struct __darwin_arm_neon_state64
+ #define _STRUCT_ARM_NEON_STATE struct __darwin_arm_neon_state
+
+@@ -143,50 +88,11 @@ _STRUCT_ARM_NEON_STATE
+ /* #error Unknown architecture. */
+ #endif
+
+-#else /* !__DARWIN_UNIX03 */
+-#define _STRUCT_ARM_NEON_STATE64 struct arm_neon_state64
+-#define _STRUCT_ARM_NEON_STATE struct arm_neon_state
+-
+-#if defined(__arm64__)
+-_STRUCT_ARM_NEON_STATE64
+-{
+- __uint128_t q[32];
+- uint32_t fpsr;
+- uint32_t fpcr;
+-
+-};
+-_STRUCT_ARM_NEON_STATE
+-{
+- __uint128_t q[16];
+- uint32_t fpsr;
+- uint32_t fpcr;
+-
+-};
+-#elif defined(__arm__)
+-/*
+- * No 128-bit intrinsic for ARM; leave it opaque for now.
+- */
+-_STRUCT_ARM_NEON_STATE64
+-{
+- char opaque[(32 * 16) + (2 * sizeof(__uint32_t))];
+-} __attribute__((aligned(16)));
+-
+-_STRUCT_ARM_NEON_STATE
+-{
+- char opaque[(16 * 16) + (2 * sizeof(__uint32_t))];
+-} __attribute__((aligned(16)));
+-
+-#else
+-#error Unknown architecture.
+-#endif
+-
+-#endif /* __DARWIN_UNIX03 */
+
+ /*
+ * Debug State
+ */
+ #if defined(__arm__)
+-#if __DARWIN_UNIX03
+ #define _STRUCT_ARM_DEBUG_STATE struct __darwin_arm_debug_state
+ _STRUCT_ARM_DEBUG_STATE
+ {
+@@ -195,19 +101,8 @@ _STRUCT_ARM_DEBUG_STATE
+ __uint32_t __wvr[16];
+ __uint32_t __wcr[16];
+ };
+-#else /* !__DARWIN_UNIX03 */
+-#define _STRUCT_ARM_DEBUG_STATE struct arm_debug_state
+-_STRUCT_ARM_DEBUG_STATE
+-{
+- __uint32_t bvr[16];
+- __uint32_t bcr[16];
+- __uint32_t wvr[16];
+- __uint32_t wcr[16];
+-};
+-#endif /* __DARWIN_UNIX03 */
+
+ #elif defined(__arm64__)
+-#if __DARWIN_UNIX03
+ #define _STRUCT_ARM_LEGACY_DEBUG_STATE struct arm_legacy_debug_state
+ _STRUCT_ARM_LEGACY_DEBUG_STATE
+ {
+@@ -236,36 +131,6 @@ _STRUCT_ARM_DEBUG_STATE64
+ __uint64_t __wcr[16];
+ __uint64_t __mdscr_el1; /* Bit 0 is SS (Hardware Single Step) */
+ };
+-#else /* !__DARWIN_UNIX03 */
+-#define _STRUCT_ARM_LEGACY_DEBUG_STATE struct arm_legacy_debug_state
+-_STRUCT_ARM_LEGACY_DEBUG_STATE
+-{
+- __uint32_t bvr[16];
+- __uint32_t bcr[16];
+- __uint32_t wvr[16];
+- __uint32_t wcr[16];
+-};
+-
+-#define _STRUCT_ARM_DEBUG_STATE32 struct arm_debug_state32
+-_STRUCT_ARM_DEBUG_STATE32
+-{
+- __uint32_t bvr[16];
+- __uint32_t bcr[16];
+- __uint32_t wvr[16];
+- __uint32_t wcr[16];
+- __uint64_t mdscr_el1; /* Bit 0 is SS (Hardware Single Step) */
+-};
+-
+-#define _STRUCT_ARM_DEBUG_STATE64 struct arm_debug_state64
+-_STRUCT_ARM_DEBUG_STATE64
+-{
+- __uint64_t bvr[16];
+- __uint64_t bcr[16];
+- __uint64_t wvr[16];
+- __uint64_t wcr[16];
+- __uint64_t mdscr_el1; /* Bit 0 is SS (Hardware Single Step) */
+-};
+-#endif /* __DARWIN_UNIX03 */
+
+ #else
+ /* #error unknown architecture */
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150124/9e69847e/attachment-0001.html>
More information about the macports-changes
mailing list