<!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>[120130] 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/120130">120130</a></dd>
<dt>Author</dt> <dd>jeremyhu@macports.org</dd>
<dt>Date</dt> <dd>2014-05-16 14:51:27 -0700 (Fri, 16 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>ld64: One more libstdc++ build fix and add an llvm35 variant. (#43729)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdevelld64Portfile">trunk/dports/devel/ld64/Portfile</a></li>
<li><a href="#trunkdportsdevelld64filesld64236hash_setpatch">trunk/dports/devel/ld64/files/ld64-236-hash_set.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 (120129 => 120130)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/ld64/Portfile 2014-05-16 21:50:17 UTC (rev 120129)
+++ trunk/dports/devel/ld64/Portfile 2014-05-16 21:51:27 UTC (rev 120130)
</span><span class="lines">@@ -31,11 +31,11 @@
</span><span class="cx"> # dependency cycle as llvm requires apple-gcc42 and ld64 to build correctly. Users
</span><span class="cx"> # wanting LTO support in ld64 on Tiger can install the +llvm variant after llvm
</span><span class="cx"> # has been installed.
</span><del>-if {![variant_isset llvm29] && ![variant_isset llvm30] && ![variant_isset llvm31] && ![variant_isset llvm32] && ![variant_isset llvm33] && ![variant_isset llvm34] && ${os.major} >= 9} {
- default_variants +llvm33
</del><ins>+if {![variant_isset llvm29] && ![variant_isset llvm30] && ![variant_isset llvm31] && ![variant_isset llvm32] && ![variant_isset llvm33] && ![variant_isset llvm34] && ![variant_isset llvm34] && ${os.major} >= 9} {
+ default_variants +llvm34
</ins><span class="cx">
</span><span class="cx"> # Leopard/powerpc has the option to not be LTO
</span><del>- if {![variant_isset llvm33] && ${os.arch} ne "powerpc"} {
</del><ins>+ if {![variant_isset llvm34] && ${os.arch} ne "powerpc"} {
</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">@@ -44,36 +44,41 @@
</span><span class="cx"> variant universal {}
</span><span class="cx">
</span><span class="cx"> set llvm_version {}
</span><del>-variant llvm29 conflicts llvm30 llvm31 llvm32 llvm33 llvm34 description {Use llvm-2.9 for libLTO} {
</del><ins>+variant llvm29 conflicts llvm30 llvm31 llvm32 llvm33 llvm34 llvm35 description {Use llvm-2.9 for libLTO} {
</ins><span class="cx"> set llvm_version 2.9
</span><span class="cx"> depends_lib-append port:llvm-${llvm_version}
</span><span class="cx"> }
</span><span class="cx">
</span><del>-variant llvm30 conflicts llvm29 llvm31 llvm32 llvm33 llvm34 description {Use llvm-3.0 for libLTO} {
</del><ins>+variant llvm30 conflicts llvm29 llvm31 llvm32 llvm33 llvm34 llvm35 description {Use llvm-3.0 for libLTO} {
</ins><span class="cx"> set llvm_version 3.0
</span><span class="cx"> depends_lib-append port:llvm-${llvm_version}
</span><span class="cx"> }
</span><span class="cx">
</span><del>-variant llvm31 conflicts llvm29 llvm30 llvm32 llvm33 llvm34 description {Use llvm-3.1 for libLTO} {
</del><ins>+variant llvm31 conflicts llvm29 llvm30 llvm32 llvm33 llvm34 llvm35 description {Use llvm-3.1 for libLTO} {
</ins><span class="cx"> set llvm_version 3.1
</span><span class="cx"> depends_lib-append port:llvm-${llvm_version}
</span><span class="cx"> }
</span><span class="cx">
</span><del>-variant llvm32 conflicts llvm29 llvm30 llvm31 llvm33 llvm34 description {Use llvm-3.2 for libLTO} {
</del><ins>+variant llvm32 conflicts llvm29 llvm30 llvm31 llvm33 llvm34 llvm35 description {Use llvm-3.2 for libLTO} {
</ins><span class="cx"> set llvm_version 3.2
</span><span class="cx"> depends_lib-append port:llvm-${llvm_version}
</span><span class="cx"> }
</span><span class="cx">
</span><del>-variant llvm33 conflicts llvm29 llvm30 llvm31 llvm32 llvm34 description {Use llvm-3.3 for libLTO} {
</del><ins>+variant llvm33 conflicts llvm29 llvm30 llvm31 llvm32 llvm34 llvm35 description {Use llvm-3.3 for libLTO} {
</ins><span class="cx"> set llvm_version 3.3
</span><span class="cx"> depends_lib-append port:llvm-${llvm_version}
</span><span class="cx"> }
</span><span class="cx">
</span><del>-variant llvm34 conflicts llvm29 llvm30 llvm31 llvm32 llvm33 description {Use llvm-3.4 for libLTO} {
</del><ins>+variant llvm34 conflicts llvm29 llvm30 llvm31 llvm32 llvm33 llvm35 description {Use llvm-3.4 for libLTO} {
</ins><span class="cx"> set llvm_version 3.4
</span><span class="cx"> depends_lib-append port:llvm-${llvm_version}
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+variant llvm35 conflicts llvm29 llvm30 llvm31 llvm32 llvm33 llvm34 description {Use llvm-3.5 for libLTO} {
+ set llvm_version 3.5
+ depends_lib-append port:llvm-${llvm_version}
+}
+
</ins><span class="cx"> set makefile "Makefile-133"
</span><span class="cx">
</span><span class="cx"> # TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
</span></span></pre></div>
<a id="trunkdportsdevelld64filesld64236hash_setpatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/ld64/files/ld64-236-hash_set.patch (120129 => 120130)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/ld64/files/ld64-236-hash_set.patch 2014-05-16 21:50:17 UTC (rev 120129)
+++ trunk/dports/devel/ld64/files/ld64-236-hash_set.patch 2014-05-16 21:51:27 UTC (rev 120130)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> diff -Naurp src/ld/InputFiles.cpp src/ld/InputFiles.cpp
</span><span class="cx"> --- src/ld/InputFiles.cpp 2014-04-04 15:42:29.000000000 -0700
</span><del>-+++ src/ld/InputFiles.cpp 2014-05-16 10:06:53.000000000 -0700
</del><ins>++++ src/ld/InputFiles.cpp 2014-05-16 14:28:58.000000000 -0700
</ins><span class="cx"> @@ -50,6 +50,8 @@
</span><span class="cx"> #include <vector>
</span><span class="cx"> #include <list>
</span><span class="lines">@@ -12,7 +12,7 @@
</span><span class="cx">
</span><span class="cx"> diff -Naurp src/ld/InputFiles.h src/ld/InputFiles.h
</span><span class="cx"> --- src/ld/InputFiles.h 2014-04-04 15:42:29.000000000 -0700
</span><del>-+++ src/ld/InputFiles.h 2014-05-16 10:06:53.000000000 -0700
</del><ins>++++ src/ld/InputFiles.h 2014-05-16 14:28:58.000000000 -0700
</ins><span class="cx"> @@ -107,7 +107,11 @@ private:
</span><span class="cx"> static void parseWorkerThread(InputFiles *inputFiles);
</span><span class="cx"> void startThread(void (*threadFunc)(InputFiles *)) const;
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx"> std::vector<ld::File*> _inputFiles;
</span><span class="cx"> diff -Naurp src/ld/LinkEditClassic.hpp src/ld/LinkEditClassic.hpp
</span><span class="cx"> --- src/ld/LinkEditClassic.hpp 2014-04-04 15:42:29.000000000 -0700
</span><del>-+++ src/ld/LinkEditClassic.hpp 2014-05-16 10:06:53.000000000 -0700
</del><ins>++++ src/ld/LinkEditClassic.hpp 2014-05-16 14:28:58.000000000 -0700
</ins><span class="cx"> @@ -32,7 +32,6 @@
</span><span class="cx"> #include <unistd.h>
</span><span class="cx">
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> std::vector<char*> _fullBuffers;
</span><span class="cx"> diff -Naurp src/ld/Options.h src/ld/Options.h
</span><span class="cx"> --- src/ld/Options.h 2014-04-04 15:42:29.000000000 -0700
</span><del>-+++ src/ld/Options.h 2014-05-16 10:06:53.000000000 -0700
</del><ins>++++ src/ld/Options.h 2014-05-16 14:28:58.000000000 -0700
</ins><span class="cx"> @@ -30,8 +30,8 @@
</span><span class="cx"> #include <mach/machine.h>
</span><span class="cx">
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx"> enum InterposeMode { kInterposeNone, kInterposeAllExternal, kInterposeSome };
</span><span class="cx"> diff -Naurp src/ld/OutputFile.cpp src/ld/OutputFile.cpp
</span><span class="cx"> --- src/ld/OutputFile.cpp 2014-04-04 15:42:29.000000000 -0700
</span><del>-+++ src/ld/OutputFile.cpp 2014-05-16 10:06:53.000000000 -0700
</del><ins>++++ src/ld/OutputFile.cpp 2014-05-16 14:28:58.000000000 -0700
</ins><span class="cx"> @@ -50,7 +50,8 @@
</span><span class="cx"> #include <vector>
</span><span class="cx"> #include <list>
</span><span class="lines">@@ -119,7 +119,7 @@
</span><span class="cx"> const ld::File* atomFile = atom->file();
</span><span class="cx"> diff -Naurp src/ld/Resolver.cpp src/ld/Resolver.cpp
</span><span class="cx"> --- src/ld/Resolver.cpp 2014-04-04 15:42:29.000000000 -0700
</span><del>-+++ src/ld/Resolver.cpp 2014-05-16 10:06:53.000000000 -0700
</del><ins>++++ src/ld/Resolver.cpp 2014-05-16 14:28:58.000000000 -0700
</ins><span class="cx"> @@ -47,6 +47,8 @@
</span><span class="cx"> #include <vector>
</span><span class="cx"> #include <list>
</span><span class="lines">@@ -131,7 +131,7 @@
</span><span class="cx">
</span><span class="cx"> diff -Naurp src/ld/Resolver.h src/ld/Resolver.h
</span><span class="cx"> --- src/ld/Resolver.h 2014-04-04 15:42:29.000000000 -0700
</span><del>-+++ src/ld/Resolver.h 2014-05-16 10:06:53.000000000 -0700
</del><ins>++++ src/ld/Resolver.h 2014-05-16 14:28:58.000000000 -0700
</ins><span class="cx"> @@ -42,7 +42,6 @@
</span><span class="cx"> #include <mach-o/dyld.h>
</span><span class="cx">
</span><span class="lines">@@ -155,7 +155,7 @@
</span><span class="cx"> public:
</span><span class="cx"> diff -Naurp src/ld/SymbolTable.cpp src/ld/SymbolTable.cpp
</span><span class="cx"> --- src/ld/SymbolTable.cpp 2014-04-04 15:42:29.000000000 -0700
</span><del>-+++ src/ld/SymbolTable.cpp 2014-05-16 10:06:53.000000000 -0700
</del><ins>++++ src/ld/SymbolTable.cpp 2014-05-16 14:28:58.000000000 -0700
</ins><span class="cx"> @@ -41,6 +41,8 @@
</span><span class="cx"> #include <set>
</span><span class="cx"> #include <vector>
</span><span class="lines">@@ -176,7 +176,7 @@
</span><span class="cx"> else
</span><span class="cx"> diff -Naurp src/ld/SymbolTable.h src/ld/SymbolTable.h
</span><span class="cx"> --- src/ld/SymbolTable.h 2014-04-04 15:42:29.000000000 -0700
</span><del>-+++ src/ld/SymbolTable.h 2014-05-16 10:06:53.000000000 -0700
</del><ins>++++ src/ld/SymbolTable.h 2014-05-16 14:28:58.000000000 -0700
</ins><span class="cx"> @@ -42,7 +42,7 @@
</span><span class="cx"> #include <mach-o/dyld.h>
</span><span class="cx">
</span><span class="lines">@@ -237,7 +237,7 @@
</span><span class="cx"> typedef std::map<const char *, DuplicatedSymbolAtomList * > DuplicateSymbols;
</span><span class="cx"> diff -Naurp src/ld/ld.cpp src/ld/ld.cpp
</span><span class="cx"> --- src/ld/ld.cpp 2014-04-04 15:42:29.000000000 -0700
</span><del>-+++ src/ld/ld.cpp 2014-05-16 10:06:53.000000000 -0700
</del><ins>++++ src/ld/ld.cpp 2014-05-16 14:28:58.000000000 -0700
</ins><span class="cx"> @@ -54,7 +54,8 @@ extern "C" double log2 ( double );
</span><span class="cx"> #include <vector>
</span><span class="cx"> #include <list>
</span><span class="lines">@@ -268,19 +268,28 @@
</span><span class="cx"> return hash;
</span><span class="cx"> diff -Naurp src/ld/ld.hpp src/ld/ld.hpp
</span><span class="cx"> --- src/ld/ld.hpp 2014-04-04 15:42:29.000000000 -0700
</span><del>-+++ src/ld/ld.hpp 2014-05-16 10:06:53.000000000 -0700
</del><ins>++++ src/ld/ld.hpp 2014-05-16 14:43:37.000000000 -0700
+@@ -32,7 +32,7 @@
+ #include <assert.h>
+
+ #include <vector>
+-#include <unordered_set>
++#include <ext/hash_set>
+
+ #include "configure.h"
+
</ins><span class="cx"> @@ -821,7 +821,7 @@ struct CStringEquals
</span><span class="cx"> bool operator()(const char* left, const char* right) const { return (strcmp(left, right) == 0); }
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> -typedef std::unordered_set<const char*, ld::CStringHash, ld::CStringEquals> CStringSet;
</span><del>-+typedef std::unordered_set<const char*, ld::CStringHash, ld::CStringEquals> CStringSet;
</del><ins>++typedef __gnu_cxx::hash_set<const char*, __gnu_cxx::hash<const char*>, CStringEquals> CStringSet;
</ins><span class="cx">
</span><span class="cx"> class Internal
</span><span class="cx"> {
</span><span class="cx"> diff -Naurp src/ld/parsers/archive_file.cpp src/ld/parsers/archive_file.cpp
</span><span class="cx"> --- src/ld/parsers/archive_file.cpp 2014-04-04 15:42:29.000000000 -0700
</span><del>-+++ src/ld/parsers/archive_file.cpp 2014-05-16 10:06:53.000000000 -0700
</del><ins>++++ src/ld/parsers/archive_file.cpp 2014-05-16 14:28:58.000000000 -0700
</ins><span class="cx"> @@ -33,7 +33,7 @@
</span><span class="cx"> #include <set>
</span><span class="cx"> #include <map>
</span><span class="lines">@@ -305,8 +314,8 @@
</span><span class="cx"> typedef typename A::P P;
</span><span class="cx"> typedef typename A::P::E E;
</span><span class="cx"> diff -Naurp src/ld/parsers/lto_file.cpp src/ld/parsers/lto_file.cpp
</span><del>---- src/ld/parsers/lto_file.cpp 2014-05-16 10:06:18.000000000 -0700
-+++ src/ld/parsers/lto_file.cpp 2014-05-16 10:06:53.000000000 -0700
</del><ins>+--- src/ld/parsers/lto_file.cpp 2014-05-16 14:28:17.000000000 -0700
++++ src/ld/parsers/lto_file.cpp 2014-05-16 14:28:58.000000000 -0700
</ins><span class="cx"> @@ -30,11 +30,10 @@
</span><span class="cx"> #include <sys/fcntl.h>
</span><span class="cx"> #include <sys/stat.h>
</span><span class="lines">@@ -338,8 +347,8 @@
</span><span class="cx"> class AtomSyncer : public ld::File::AtomHandler {
</span><span class="cx"> public:
</span><span class="cx"> diff -Naurp src/ld/parsers/macho_dylib_file.cpp src/ld/parsers/macho_dylib_file.cpp
</span><del>---- src/ld/parsers/macho_dylib_file.cpp 2014-05-16 10:06:18.000000000 -0700
-+++ src/ld/parsers/macho_dylib_file.cpp 2014-05-16 10:06:53.000000000 -0700
</del><ins>+--- src/ld/parsers/macho_dylib_file.cpp 2014-05-16 14:28:17.000000000 -0700
++++ src/ld/parsers/macho_dylib_file.cpp 2014-05-16 14:28:58.000000000 -0700
</ins><span class="cx"> @@ -34,8 +34,8 @@
</span><span class="cx"> #include <vector>
</span><span class="cx"> #include <set>
</span><span class="lines">@@ -394,7 +403,7 @@
</span><span class="cx"> for (int32_t i = 0; i < count; ++i) {
</span><span class="cx"> diff -Naurp src/ld/passes/dtrace_dof.cpp src/ld/passes/dtrace_dof.cpp
</span><span class="cx"> --- src/ld/passes/dtrace_dof.cpp 2014-04-04 15:42:29.000000000 -0700
</span><del>-+++ src/ld/passes/dtrace_dof.cpp 2014-05-16 10:06:53.000000000 -0700
</del><ins>++++ src/ld/passes/dtrace_dof.cpp 2014-05-16 14:28:58.000000000 -0700
</ins><span class="cx"> @@ -30,8 +30,7 @@
</span><span class="cx">
</span><span class="cx"> #include <vector>
</span><span class="lines">@@ -430,7 +439,7 @@
</span><span class="cx">
</span><span class="cx"> diff -Naurp src/ld/passes/got.cpp src/ld/passes/got.cpp
</span><span class="cx"> --- src/ld/passes/got.cpp 2014-04-04 15:42:29.000000000 -0700
</span><del>-+++ src/ld/passes/got.cpp 2014-05-16 10:06:53.000000000 -0700
</del><ins>++++ src/ld/passes/got.cpp 2014-05-16 14:28:58.000000000 -0700
</ins><span class="cx"> @@ -30,6 +30,7 @@
</span><span class="cx">
</span><span class="cx"> #include <vector>
</span><span class="lines">@@ -441,7 +450,7 @@
</span><span class="cx"> #include "ld.hpp"
</span><span class="cx"> diff -Naurp src/ld/passes/order.cpp src/ld/passes/order.cpp
</span><span class="cx"> --- src/ld/passes/order.cpp 2014-04-04 15:42:29.000000000 -0700
</span><del>-+++ src/ld/passes/order.cpp 2014-05-16 10:06:53.000000000 -0700
</del><ins>++++ src/ld/passes/order.cpp 2014-05-16 14:28:58.000000000 -0700
</ins><span class="cx"> @@ -32,7 +32,6 @@
</span><span class="cx"> #include <vector>
</span><span class="cx"> #include <map>
</span><span class="lines">@@ -465,7 +474,7 @@
</span><span class="cx">
</span><span class="cx"> diff -Naurp src/ld/passes/tlvp.cpp src/ld/passes/tlvp.cpp
</span><span class="cx"> --- src/ld/passes/tlvp.cpp 2014-04-04 15:42:29.000000000 -0700
</span><del>-+++ src/ld/passes/tlvp.cpp 2014-05-16 10:06:53.000000000 -0700
</del><ins>++++ src/ld/passes/tlvp.cpp 2014-05-16 14:28:58.000000000 -0700
</ins><span class="cx"> @@ -30,6 +30,7 @@
</span><span class="cx">
</span><span class="cx"> #include <vector>
</span><span class="lines">@@ -476,7 +485,7 @@
</span><span class="cx"> #include "tlvp.h"
</span><span class="cx"> diff -Naurp src/other/dyldinfo.cpp src/other/dyldinfo.cpp
</span><span class="cx"> --- src/other/dyldinfo.cpp 2014-04-04 15:42:29.000000000 -0700
</span><del>-+++ src/other/dyldinfo.cpp 2014-05-16 10:06:53.000000000 -0700
</del><ins>++++ src/other/dyldinfo.cpp 2014-05-16 14:28:58.000000000 -0700
</ins><span class="cx"> @@ -33,7 +33,7 @@
</span><span class="cx">
</span><span class="cx"> #include <vector>
</span><span class="lines">@@ -503,7 +512,7 @@
</span><span class="cx"> void printRebaseInfoOpcodes();
</span><span class="cx"> diff -Naurp src/other/machochecker.cpp src/other/machochecker.cpp
</span><span class="cx"> --- src/other/machochecker.cpp 2014-04-04 15:42:29.000000000 -0700
</span><del>-+++ src/other/machochecker.cpp 2014-05-16 10:06:53.000000000 -0700
</del><ins>++++ src/other/machochecker.cpp 2014-05-16 14:28:58.000000000 -0700
</ins><span class="cx"> @@ -33,7 +33,7 @@
</span><span class="cx">
</span><span class="cx"> #include <vector>
</span><span class="lines">@@ -540,7 +549,7 @@
</span><span class="cx"> void checkMachHeader();
</span><span class="cx"> diff -Naurp src/other/unwinddump.cpp src/other/unwinddump.cpp
</span><span class="cx"> --- src/other/unwinddump.cpp 2014-04-04 15:42:29.000000000 -0700
</span><del>-+++ src/other/unwinddump.cpp 2014-05-16 10:06:53.000000000 -0700
</del><ins>++++ src/other/unwinddump.cpp 2014-05-16 14:28:58.000000000 -0700
</ins><span class="cx"> @@ -33,7 +33,7 @@
</span><span class="cx">
</span><span class="cx"> #include <vector>
</span></span></pre>
</div>
</div>
</body>
</html>