<!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>[131487] trunk/dports/devel/ld64</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/131487">131487</a></dd>
<dt>Author</dt> <dd>jeremyhu@macports.org</dd>
<dt>Date</dt> <dd>2015-01-12 12:57:35 -0800 (Mon, 12 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>ld64: Update ld64-127 to build on Leopard/ppc</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdevelld64Portfile">trunk/dports/devel/ld64/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsdevelld64filesld64127ppcpatch">trunk/dports/devel/ld64/files/ld64-127-ppc.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdevelld64Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/ld64/Portfile (131486 => 131487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/ld64/Portfile 2015-01-12 20:43:13 UTC (rev 131486)
+++ trunk/dports/devel/ld64/Portfile 2015-01-12 20:57:35 UTC (rev 131487)
</span><span class="lines">@@ -35,8 +35,7 @@
</span><span class="cx"> default_variants +llvm34
</span><span class="cx"> }
</span><span class="cx">
</span><del>- # Leopard/powerpc has the option to not be LTO
- if {![variant_isset llvm34] && ![variant_isset llvm35] && ${os.arch} ne "powerpc" && ${os.major} >= 9} {
</del><ins>+ if {![variant_isset llvm34] && ![variant_isset llvm35] && ${os.major} >= 9} {
</ins><span class="cx"> ui_error "Your platform cannot be configured without LTO support in ld64. Please enable one of the llvmXX variants, and try again."
</span><span class="cx"> return -code error "Your platform cannot be configured without LTO support in ld64. Please enable one of the llvmXX variants, and try again."
</span><span class="cx"> }
</span><span class="lines">@@ -77,9 +76,8 @@
</span><span class="cx"> depends_build-append path:include/libunwind.h:libunwind-headers
</span><span class="cx"> }
</span><span class="cx">
</span><del>-if {${os.arch} eq "powerpc" || ([variant_isset universal] && [lsearch ${universal_archs} ppc] != -1) || ${os.major} < 9} {
</del><ins>+if {${os.major} < 9} {
</ins><span class="cx"> # XCode 3.2.6
</span><del>- # 127.2 should work for powerpc, but it will require some build fixes.
</del><span class="cx"> version 97.17
</span><span class="cx"> revision 4
</span><span class="cx"> checksums rmd160 d52df7d7f741c8bedd29cbac73dbb9db992b4795 \
</span><span class="lines">@@ -97,12 +95,12 @@
</span><span class="cx"> revision 9
</span><span class="cx"> checksums rmd160 8ee709341549a1944732daef6ebab7ef1acfcc6e \
</span><span class="cx"> sha256 97b75547b2bd761306ab3e15ae297f01e7ab9760b922bc657f4ef72e4e052142
</span><del>- supported_archs i386 x86_64
</del><ins>+ supported_archs i386 x86_64 ppc
</ins><span class="cx">
</span><span class="cx"> set makefile "Makefile-127"
</span><span class="cx">
</span><span class="cx"> patchfiles-delete ld64-133-no-CrashReporterClient.h.patch ld64-136-i386-badAddress.patch PR-16935960.patch PR-16936488.patch
</span><del>- patchfiles-append ld64-127-any-cctools.patch ld64-127-long-branch-warn.patch ld64-127-cxx_initializer_order_and_sim.patch
</del><ins>+ patchfiles-append ld64-127-any-cctools.patch ld64-127-long-branch-warn.patch ld64-127-cxx_initializer_order_and_sim.patch ld64-127-ppc.patch
</ins><span class="cx"> } elseif {${os.major} < 11} {
</span><span class="cx"> # XCode 4.6
</span><span class="cx"> # Until we figure out a way to better bootstrap ld64-236 on SnowLeopard or fix its build failure
</span><span class="lines">@@ -111,7 +109,7 @@
</span><span class="cx"> checksums rmd160 4a2930ccdd398b63a108810e90293ab96dc154a0 \
</span><span class="cx"> sha256 99d6c4acb6d4cdf45772951dd2308222aa966763170137459a9d276674645d9e
</span><span class="cx">
</span><del>- supported_archs i386 x86_64
</del><ins>+ supported_archs i386 x86_64 ppc
</ins><span class="cx">
</span><span class="cx"> patchfiles-delete PR-16935960.patch PR-16936488.patch
</span><span class="cx"> patchfiles-append ld64-136-hash_set.patch
</span></span></pre></div>
<a id="trunkdportsdevelld64filesld64127ppcpatch"></a>
<div class="addfile"><h4>Added: trunk/dports/devel/ld64/files/ld64-127-ppc.patch (0 => 131487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/ld64/files/ld64-127-ppc.patch (rev 0)
+++ trunk/dports/devel/ld64/files/ld64-127-ppc.patch 2015-01-12 20:57:35 UTC (rev 131487)
</span><span class="lines">@@ -0,0 +1,27 @@
</span><ins>+diff --git src/ld/HeaderAndLoadCommands.hpp src/ld/HeaderAndLoadCommands.hpp
+index 395fc99..ac2a0a5 100644
+--- src/ld/HeaderAndLoadCommands.hpp
++++ src/ld/HeaderAndLoadCommands.hpp
+@@ -1106,7 +1106,7 @@ uint8_t* HeaderAndLoadCommandsAtom<x86>::copyThreadsLoadCommand(uint8_t* p) cons
+ template <>
+ uint32_t HeaderAndLoadCommandsAtom<x86_64>::threadLoadCommandSize() const
+ {
+- return this->alignedSize(16 + x86_THREAD_STATE64_COUNT * 4);
++ return this->alignedSize(16 + 42*4); // base size + x86_THREAD_STATE64_COUNT * 4
+ }
+
+ template <>
+@@ -1117,8 +1117,8 @@ uint8_t* HeaderAndLoadCommandsAtom<x86_64>::copyThreadsLoadCommand(uint8_t* p) c
+ macho_thread_command<P>* cmd = (macho_thread_command<P>*)p;
+ cmd->set_cmd(LC_UNIXTHREAD);
+ cmd->set_cmdsize(threadLoadCommandSize());
+- cmd->set_flavor(x86_THREAD_STATE64);
+- cmd->set_count(x86_THREAD_STATE64_COUNT);
++ cmd->set_flavor(4); // x86_THREAD_STATE64
++ cmd->set_count(42); // x86_THREAD_STATE64_COUNT
+ cmd->set_thread_register(16, start); // rip
+ if ( _options.hasCustomStack() )
+ cmd->set_thread_register(7, _options.customStackAddr()); // r1
+--
+2.2.1
+
</ins></span></pre>
</div>
</div>
</body>
</html>