<!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>[132154] trunk/dports/devel/cctools</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/132154">132154</a></dd>
<dt>Author</dt> <dd>jeremyhu@macports.org</dd>
<dt>Date</dt> <dd>2015-01-24 16:53:11 -0800 (Sat, 24 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>cctools: Fix a build failure with newer cctools on Tiger</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdevelcctoolsPortfile">trunk/dports/devel/cctools/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsdevelcctoolsfilescctools862unifdef__DARWIN_UNIX03armpatch">trunk/dports/devel/cctools/files/cctools-862-unifdef__DARWIN_UNIX03-arm.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdevelcctoolsPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/cctools/Portfile (132153 => 132154)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx">
</span><span class="cx"> depends_build port:libunwind-headers
</span><span class="cx">
</span><del>-patchfiles cctools-829-lto.patch PR-37520.patch cctools-839-static-dis_info.patch PR-12400897.patch cctools-862-prunetrie.patch
</del><ins>+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
</ins><span class="cx">
</span><span class="cx"> variant universal {}
</span><span class="cx">
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> rmd160 91c0a3f192f1eed60b64ef5a0a06918d0ce0b0c9 \
</span><span class="cx"> sha256 6116c06920112c634f6df2fa8b2f171ee3b90ff2176137da5856336695a6a676
</span><span class="cx">
</span><del>- patchfiles-delete cctools-829-lto.patch PR-37520.patch cctools-839-static-dis_info.patch cctools-862-prunetrie.patch
</del><ins>+ 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
</ins><span class="cx"> 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
</span><span class="cx"> } else {
</span><span class="cx"> if {${os.major} < 11} {
</span></span></pre></div>
<a id="trunkdportsdevelcctoolsfilescctools862unifdef__DARWIN_UNIX03armpatch"></a>
<div class="addfile"><h4>Added: trunk/dports/devel/cctools/files/cctools-862-unifdef__DARWIN_UNIX03-arm.patch (0 => 132154)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,214 @@
</span><ins>+<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 */
</ins></span></pre>
</div>
</div>
</body>
</html>