October 2006 - darwinbuild-changes - lists.macosforge.org

[317] trunk/darwinbuild/darwinbuild
by source_changes＠macosforge.org 04 Oct '06

04 Oct '06

Revision: 317 http://trac.macosforge.org/projects/darwinbuild/changeset/317 Author: kevin Date: 2006-10-04 02:02:39 -0700 (Wed, 04 Oct 2006) Log Message: ----------- - only do timing if /bin/date is present in the BuildRoot Modified Paths: -------------- trunk/darwinbuild/darwinbuild Modified: trunk/darwinbuild/darwinbuild =================================================================== --- trunk/darwinbuild/darwinbuild 2006-01-17 22:39:01 UTC (rev 316) +++ trunk/darwinbuild/darwinbuild 2006-10-04 09:02:39 UTC (rev 317) @@ -722,13 +722,19 @@ cd '$SRCROOT' EOF cat <<-EOF >> $SCRIPT - START_DATE=\$(date "+%s") + if [ -x /bin/date ]; then + START_DATE=\$(date "+%s") + fi $buildtool $action $build_string < /dev/null EXIT_STATUS="\$?" - END_DATE=\$(date "+%s") - ELAPSED_TIME=\$((\$END_DATE - \$START_DATE)) + if [ -x /bin/date ]; then + END_DATE=\$(date "+%s") + ELAPSED_TIME=\$((\$END_DATE - \$START_DATE)) + fi echo '++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++' - echo " BUILD TIME: \$((\$ELAPSED_TIME / 3600))h \$((\$ELAPSED_TIME / 60))m \$((\$ELAPSED_TIME % 60))s" + if [ -x /bin/date ]; then + echo " BUILD TIME: \$((\$ELAPSED_TIME / 3600))h \$((\$ELAPSED_TIME / 60))m \$((\$ELAPSED_TIME % 60))s" + fi echo "EXIT STATUS: \$EXIT_STATUS" exit \$EXIT_STATUS EOF

1 0

[318] trunk/www
by source_changes＠macosforge.org 04 Oct '06

04 Oct '06

Revision: 318 http://trac.macosforge.org/projects/darwinbuild/changeset/318 Author: kevin Date: 2006-10-04 02:02:39 -0700 (Wed, 04 Oct 2006) Log Message: ----------- - link to available Property Lists Modified Paths: -------------- trunk/www/sidebar.html Added Paths: ----------- trunk/www/plists/ trunk/www/plists/index.html Added: trunk/www/plists/index.html =================================================================== --- trunk/www/plists/index.html (rev 0) +++ trunk/www/plists/index.html 2006-10-04 09:02:39 UTC (rev 318) @@ -0,0 +1,166 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"> +<html> +<head> +<title>DarwinBuild - Property Lists</title> +<link rel="stylesheet" href="../darwinbuild.css"> +</head> +<body> + + +<iframe id="sidebar" src="../sidebar.html"></iframe> + + +<div id="banner"> +Property Lists +</div> + +<div id="content"> +<div class="article"> +<h3>Overview</h3> +<div class="articlebody"> +<p> +DarwinBuild is capable of building projects found in many Darwin releases. +Each release is described by a property list, which DarwinBuild uses to +perform its builds. Property lists for supported releases can be found +below. If you need support for a release not mentioned here, please email the +<a href="http://opendarwin.org/mailman/listinfo/darwinbuild">mailing list</a>. +</p> +</div> +</div> + + +<div class="article"> +<a name="releases"></a><h3>Releases</h3> +<div class="articlebody"> +<p> +Each Mac OS X version has a unique build number. Darwin property lists +with this build number describe the various open source projects and versions +in that corresponding Mac OS X version, as they are published by Apple. +OpenDarwin property lists contain additional information, such as patches that +are necessary to build the open source projects on a pure-Darwin system. +</p> + +<table> +<tr><th align="left">Build</th><th align="left">Plists</th><th align="left">Version</th></tr> + +<tr> +<th colspan="3" align="left"><br/>Tiger</th> +</tr> + +<tr> +<td>8G32</td> +<td>[<a href="http://darwinsource.opendarwin.org/plists/8G32.plist">Darwin</a>] +[<a href="http://release.opendarwin.org/release/8.4.1/Plists/8G32od1.plist">OpenDarwin</a>]</td> +<td>Mac OS X 10.4.4 (Darwin 8.4) [for PowerPC]</td> +</tr> + +<tr> +<td>8F46</td> +<td>[<a href="http://darwinsource.opendarwin.org/plists/8F46.plist">Darwin</a>] +[<a href="http://release.opendarwin.org/release/8.3.1/Plists/8F46od1.plist">OpenDarwin</a>]</td> +<td>Mac OS X 10.4.3 (Darwin 8.3)</td> +</tr> + +<tr> +<td>8C46</td> +<td>[<a href="http://darwinsource.opendarwin.org/plists/8C46.plist">Darwin</a>] +[<a href="http://release.opendarwin.org/release/8.2.1/Plists/8C46od1.plist">OpenDarwin</a>]</td> +<td>Mac OS X 10.4.2 (Darwin 8.2)</td> +</tr> + +<tr> +<td>8B15</td> +<td>[<a href="http://darwinsource.opendarwin.org/plists/8B15.plist">Darwin</a>] +[<a href="http://release.opendarwin.org/release/8.1.1/Plists/8B15od1.plist">OpenDarwin</a>]</td> +<td>Mac OS X 10.4.1 (Darwin 8.1)</td> +</tr> + +<tr> +<td>8A428</td> +<td>[<a href="http://darwinsource.opendarwin.org/plists/8A428.plist">Darwin</a>] +</td> +<td>Mac OS X 10.4 (Darwin 8.0)</td> +</tr> + +<tr> +<th colspan="3" align="left"><br/>Panther</th> +</tr> + +<tr> +<td>7W98</td> +<td>[<a href="http://darwinsource.opendarwin.org/plists/7W98.plist">Darwin</a>] +</td> +<td>Mac OS X 10.3.9 (Darwin 7.9)</td> +</tr> + +<tr> +<td>7U16</td> +<td>[<a href="http://darwinsource.opendarwin.org/plists/7U16.plist">Darwin</a>] +</td> +<td>Mac OS X 10.3.8 (Darwin 7.8)</td> +</tr> + +<tr> +<td>7S215</td> +<td>[<a href="http://darwinsource.opendarwin.org/plists/7S215.plist">Darwin</a>] +</td> +<td>Mac OS X 10.3.7 (Darwin 7.7)</td> +</tr> + +<tr> +<td>7R28</td> +<td>[<a href="http://darwinsource.opendarwin.org/plists/7R28.plist">Darwin</a>] +</td> +<td>Mac OS X 10.3.6 (Darwin 7.6)</td> +</tr> + +<tr> +<td>7M34</td> +<td>[<a href="http://darwinsource.opendarwin.org/plists/7M34.plist">Darwin</a>] +</td> +<td>Mac OS X 10.3.5 (Darwin 7.5)</td> +</tr> + +<tr> +<td>7H63</td> +<td>[<a href="http://darwinsource.opendarwin.org/plists/7H63.plist">Darwin</a>] +</td> +<td>Mac OS X 10.3.4 (Darwin 7.4)</td> +</tr> + +<tr> +<td>7F44</td> +<td>[<a href="http://darwinsource.opendarwin.org/plists/7F44.plist">Darwin</a>] +</td> +<td>Mac OS X 10.3.3 (Darwin 7.3)</td> +</tr> + +<tr> +<td>7D24</td> +<td>[<a href="http://darwinsource.opendarwin.org/plists/7D24.plist">Darwin</a>] +</td> +<td>Mac OS X 10.3.2 (Darwin 7.2)</td> +</tr> + +<tr> +<td>7C107</td> +<td>[<a href="http://darwinsource.opendarwin.org/plists/7C107.plist">Darwin</a>] +</td> +<td>Mac OS X 10.3.1 (Darwin 7.1)</td> +</tr> + +<tr> +<td>7B85</td> +<td>[<a href="http://darwinsource.opendarwin.org/plists/7B85.plist">Darwin</a>] +</td> +<td>Mac OS X 10.3 (Darwin 7.0)</td> +</tr> + +</table> +</div> +</div> + +</div> + +</body> +</html> Property changes on: trunk/www/plists/index.html ___________________________________________________________________ Name: svn:eol-style + native Modified: trunk/www/sidebar.html =================================================================== --- trunk/www/sidebar.html 2006-01-17 23:32:35 UTC (rev 317) +++ trunk/www/sidebar.html 2006-10-04 09:02:39 UTC (rev 318) @@ -38,6 +38,8 @@ <div class="grouptitle">Downloads</div> <div class="grouplinks"> <a href="releases/index.html">DarwinBuild Releases</a><br> +<a href="plists/index.html">Property Lists</a><br> +<br> <a href="sources.html">Getting the Source Code</a><br> </div> </div>

1 0

[314] trunk/darwintrace/Makefile
by source_changes＠macosforge.org 04 Oct '06

04 Oct '06

Revision: 314 http://trac.macosforge.org/projects/darwinbuild/changeset/314 Author: kevin Date: 2006-10-04 02:02:37 -0700 (Wed, 04 Oct 2006) Log Message: ----------- - build ppc64 darwintrace.dylib Modified Paths: -------------- trunk/darwintrace/Makefile Modified: trunk/darwintrace/Makefile =================================================================== --- trunk/darwintrace/Makefile 2006-01-05 20:58:56 UTC (rev 313) +++ trunk/darwintrace/Makefile 2006-10-04 09:02:37 UTC (rev 314) @@ -11,6 +11,7 @@ darwintrace.dylib: darwintrace.c cc -o $@ \ + -arch i386 -arch ppc -arch ppc64 \ -W -Wall -pedantic -std=c99 \ -flat_namespace \ -fno-common \

1 0

[316] trunk/CHANGES
by source_changes＠macosforge.org 04 Oct '06

04 Oct '06

Revision: 316 http://trac.macosforge.org/projects/darwinbuild/changeset/316 Author: kevin Date: 2006-10-04 02:02:38 -0700 (Wed, 04 Oct 2006) Log Message: ----------- - updated change history Modified Paths: -------------- trunk/CHANGES Modified: trunk/CHANGES =================================================================== --- trunk/CHANGES 2006-01-10 23:40:22 UTC (rev 315) +++ trunk/CHANGES 2006-10-04 09:02:38 UTC (rev 316) @@ -2,6 +2,12 @@ ----------------------------------- Release x.y.z [Now] + - Added 8G32 plist (Mac OS X 10.4.4 for PowerPC, Darwin 8.4) + - darwintrace: build ppc64 library + - darwinbuild: add .pbxproj suffix (for xcodebuild) + - darwinxref: delete dictionary keys from database when obsolete + - darwinxref: register Mach-O symbols + - darwinxref: register ppc64 binaries - darwinbuild: consolidate manifest symlinks and digests in build log - darwinbuild: added elapsed build time to the build log

1 0

[315] trunk/plists/8G32.plist
by source_changes＠macosforge.org 04 Oct '06

04 Oct '06

Revision: 315 http://trac.macosforge.org/projects/darwinbuild/changeset/315 Author: kevin Date: 2006-10-04 02:02:38 -0700 (Wed, 04 Oct 2006) Log Message: ----------- - Added Darwin 8.4 Added Paths: ----------- trunk/plists/8G32.plist Added: trunk/plists/8G32.plist =================================================================== --- trunk/plists/8G32.plist (rev 0) +++ trunk/plists/8G32.plist 2006-10-04 09:02:38 UTC (rev 315) @@ -0,0 +1,132 @@ +// !$*UTF8*$! +{ + binary_sites = ( + "http://darwinsource.opendarwin.org/Roots/8G32", + ); + build = 8G32; + darwin = "Darwin 8.4"; + inherits = 8F46; + macosx = "Mac OS X 10.4.4"; + projects = { + AppleI2C = { + version = 350.0.2; + }; + AppleKiwiRoot = { + version = 104.2.1; + }; + AppleMacRISC4PE = { + version = 185.0.0; + }; + CF = { + version = 368.25; + }; + CFNetwork = { + version = 129.9; + }; + CyrusIMAP = { + version = 156.9; + }; + DirectoryService = { + target = DirectoryServiceFW; + version = 352.1; + }; + IOFWDVComponents = { + version = 179.4.0; + }; + IOFireWireFamily = { + version = 209.4.1; + }; + IOSerialFamily = { + version = 30.1; + }; + IOStorageFamily = { + version = 69.1; + }; + IOUSBFamily = { + version = 228.4.0; + }; + JBoss = { + target = magnum; + version = 737; + }; + JavaScriptCore = { + version = 417.8; + }; + JavaScriptGlue = { + version = 417; + }; + OpenSSL = { + version = 26.2; + }; + Security = { + version = 25966; + }; + SpamAssassin = { + version = 124.2; + }; + Tokend = { + version = 25868; + }; + WebCore = { + version = 417.17; + }; + apache2 = { + version = 19.4; + }; + apache_mod_php = { + version = 18.2; + }; + apache_mod_ssl = { + version = 680; + }; + bootp = { + version = 133.6; + }; + configd = { + target = configd_base; + version = 136.1; + }; + curl = { + version = 28.0.2; + }; + diskdev_cmds = { + version = 332.11.1; + }; + libsecurity_keychain = { + version = 25886; + }; + libsecurityd = { + version = 25847; + }; + mDNSResponder = { + version = 107.4; + }; + msdosfs = { + version = 89.3.1; + }; + netinfo = { + version = 369.2; + }; + network_cmds = { + version = 245.1.3; + }; + passwordserver_sasl = { + version = 59.3; + }; + samba = { + version = 92.15; + }; + securityd = { + version = 25991; + }; + sudo = { + version = 17; + }; + syslog = { + version = 13.1; + }; + xnu = { + version = 792.6.56; + }; + }; +} Property changes on: trunk/plists/8G32.plist ___________________________________________________________________ Name: svn:eol-style + native

1 0

[313] trunk/darwinbuild/darwinbuild
by source_changes＠macosforge.org 04 Oct '06

04 Oct '06

Revision: 313 http://trac.macosforge.org/projects/darwinbuild/changeset/313 Author: kevin Date: 2006-10-04 02:02:37 -0700 (Wed, 04 Oct 2006) Log Message: ----------- - added .pbxproj to xcode project suffixes Modified Paths: -------------- trunk/darwinbuild/darwinbuild Modified: trunk/darwinbuild/darwinbuild =================================================================== --- trunk/darwinbuild/darwinbuild 2005-12-21 20:31:06 UTC (rev 312) +++ trunk/darwinbuild/darwinbuild 2006-10-04 09:02:37 UTC (rev 313) @@ -497,7 +497,7 @@ ### Look for the build tool: make, xcodebuild ### -numfiles=$(echo *.pbproj *.xcode *.xcodeproj 2> /dev/null ) +numfiles=$(echo *.pbxproj *.pbproj *.xcode *.xcodeproj 2> /dev/null ) if [ -n "$numfiles" ]; then buildtool="xcodebuild" else

1 0

[312] trunk/plists/8A428.plist
by source_changes＠macosforge.org 04 Oct '06

04 Oct '06

Revision: 312 http://trac.macosforge.org/projects/darwinbuild/changeset/312 Author: kevin Date: 2006-10-04 02:02:33 -0700 (Wed, 04 Oct 2006) Log Message: ----------- *** empty log message *** Modified Paths: -------------- trunk/plists/8A428.plist Modified: trunk/plists/8A428.plist =================================================================== --- trunk/plists/8A428.plist 2005-12-06 02:22:02 UTC (rev 311) +++ trunk/plists/8A428.plist 2006-10-04 09:02:33 UTC (rev 312) @@ -10288,7 +10288,6 @@ libsecurity_asn1, libsecurity_cdsa_plugin, libsecurity_cdsa_utilities, - libsecurity_cryptkit, libsecurity_utilities, xnu, ); @@ -10625,36 +10624,6 @@ }; version = 7; }; - libsecurity_cryptkit = { - dependencies = { - build = ( - CarbonHeaders, - adv_cmds, - awk, - bash, - cctools, - file_cmds, - gcc_os, - gcc_select, - system_cmds, - text_cmds, - ); - header = ( - CF, - CarbonHeaders, - CommonCrypto, - Libc_headers, - Security, - architecture, - gcc_os, - libsecurity_asn1, - libsecurity_cdsa_utilities, - libsecurity_utilities, - xnu, - ); - }; - version = 6; - }; libsecurity_cssm = { dependencies = { build = (

1 0

[310] trunk/darwinxref/plugins/register.c
by source_changes＠macosforge.org 04 Oct '06

04 Oct '06

Revision: 310 http://trac.macosforge.org/projects/darwinbuild/changeset/310 Author: kevin Date: 2006-10-04 02:02:32 -0700 (Wed, 04 Oct 2006) Log Message: ----------- - normalize table creation and pruning Modified Paths: -------------- trunk/darwinxref/plugins/register.c Modified: trunk/darwinxref/plugins/register.c =================================================================== --- trunk/darwinxref/plugins/register.c 2005-12-01 00:19:39 UTC (rev 309) +++ trunk/darwinxref/plugins/register.c 2006-10-04 09:02:32 UTC (rev 310) @@ -321,7 +321,7 @@ // 32-bit, read the rest of the header // if (magic == MH_MAGIC || magic == MH_CIGAM) { - *isMachO = 1; + if (isMachO) *isMachO = 1; mh = malloc(sizeof(struct mach_header)); if (mh == NULL) return -1; memset(mh, 0, sizeof(struct mach_header)); @@ -336,7 +336,7 @@ // 64-bit, read the rest of the header // } else if (magic == MH_MAGIC_64 || magic == MH_CIGAM_64) { - *isMachO = 1; + if (isMachO) *isMachO = 1; mh64 = malloc(sizeof(struct mach_header_64)); if (mh64 == NULL) return -1; memset(mh64, 0, sizeof(struct mach_header_64)); @@ -652,11 +652,7 @@ } -int register_files(char* build, char* project, char* path) { - char* errmsg; - int res; - int loaded = 0; - +static int create_tables() { char* table = "CREATE TABLE files (build text, project text, path text)"; char* index = "CREATE INDEX files_index ON files (build, project, path)"; SQL_NOERR(table); @@ -670,10 +666,11 @@ table = "CREATE TABLE mach_o_symbols (mach_o_object INTEGER, type INTEGER, value INTEGER, name TEXT)"; SQL_NOERR(table); - - if (SQL("BEGIN")) { return -1; } - - res = SQL("DELETE FROM files WHERE build=%Q AND project=%Q", + return 0; +} + +static int prune_old_entries(const char* build, const char* project) { + SQL("DELETE FROM files WHERE build=%Q AND project=%Q", build, project); SQL("DELETE FROM unresolved_dependencies WHERE build=%Q AND project=%Q", @@ -681,8 +678,22 @@ SQL("DELETE FROM mach_o_objects WHERE build=%Q AND project=%Q", build, project); - SQL("DELETE FROM mach_o_symbols WHERE mach_o_object NOT IN (SELECT serial FROM mach_o_objects WHERE build=%Q AND project=%Q)", build, project); + SQL("DELETE FROM mach_o_symbols WHERE mach_o_object NOT IN (SELECT serial FROM mach_o_objects)"); +} +int register_files(char* build, char* project, char* path) { + char* errmsg; + int res; + int loaded = 0; + + create_tables(); + + if (SQL("BEGIN")) { return -1; } + + prune_old_entries(build, project); + + + // // Enumerate the files in the path (DSTROOT) and associate them // with the project name and version in the sqlite database. @@ -769,22 +780,12 @@ char *line; size_t size; - - char* table = "CREATE TABLE files (build text, project text, path text) "; - char* index = "CREATE INDEX files_index ON files (build, project, path)"; - SQL_NOERR(table); - SQL_NOERR(index); - table = "CREATE TABLE unresolved_dependencies (build text, project text, type text, dependency)"; - SQL_NOERR(table); + create_tables(); if (SQL("BEGIN")) { return -1; } - res = SQL("DELETE FROM files WHERE build=%Q AND project=%Q", - build, project); + prune_old_entries(build, project); - SQL("DELETE FROM unresolved_dependencies WHERE build=%Q AND project=%Q", - build, project); - // // Enumerate the files in the path (DSTROOT) and associate them // with the project name and version in the sqlite database.

1 0

[311] trunk/darwinxref/DBDataStore.c
by source_changes＠macosforge.org 04 Oct '06

04 Oct '06

Revision: 311 http://trac.macosforge.org/projects/darwinbuild/changeset/311 Author: kevin Date: 2006-10-04 02:02:33 -0700 (Wed, 04 Oct 2006) Log Message: ----------- - Delete the entire dictionary prior to inserting; removes obsolete keys. Modified Paths: -------------- trunk/darwinxref/DBDataStore.c Modified: trunk/darwinxref/DBDataStore.c =================================================================== --- trunk/darwinxref/DBDataStore.c 2005-12-01 01:08:50 UTC (rev 310) +++ trunk/darwinxref/DBDataStore.c 2006-10-04 09:02:33 UTC (rev 311) @@ -664,6 +664,13 @@ char* cproj = strdup_cfstr(project); char* cprop = strdup_cfstr(property); + // Delete all keys from the dictionary prior to insertion. + if (project) { + SQL("DELETE FROM properties WHERE build=%Q AND project=%Q AND property=%Q", cbuild, cproj, cprop); + } else { + SQL("DELETE FROM properties WHERE build=%Q AND project IS NULL AND property=%Q", cbuild, cprop); + } + CFArrayRef keys = dictionaryGetSortedKeys(value); CFIndex i, count = CFArrayGetCount(keys); for (i = 0; i < count; ++i) { @@ -671,12 +678,6 @@ char* ckey = strdup_cfstr(key); CFTypeRef cf = CFDictionaryGetValue(value, key); - if (project) { - SQL("DELETE FROM properties WHERE build=%Q AND project=%Q AND property=%Q AND key=%Q", cbuild, cproj, cprop, ckey); - } else { - SQL("DELETE FROM properties WHERE build=%Q AND project IS NULL AND property=%Q AND key=%Q", cbuild, cprop, ckey); - } - if (CFGetTypeID(cf) == CFStringGetTypeID()) { char* cvalu = strdup_cfstr(cf); if (project) {

1 0

[309] trunk/darwinxref/plugins/register.c
by source_changes＠macosforge.org 04 Oct '06

04 Oct '06

Revision: 309 http://trac.macosforge.org/projects/darwinbuild/changeset/309 Author: kevin Date: 2006-10-04 02:02:32 -0700 (Wed, 04 Oct 2006) Log Message: ----------- - fixed symbol registration crashers for ppc64 Modified Paths: -------------- trunk/darwinxref/plugins/register.c Modified: trunk/darwinxref/plugins/register.c =================================================================== --- trunk/darwinxref/plugins/register.c 2005-11-30 21:15:25 UTC (rev 308) +++ trunk/darwinxref/plugins/register.c 2006-10-04 09:02:32 UTC (rev 309) @@ -355,7 +355,7 @@ } - switch (mh->filetype) { + switch (mh64 ? mh64->filetype : mh->filetype) { case MH_EXECUTE: case MH_DYLIB: case MH_BUNDLE: @@ -390,7 +390,8 @@ int i; - for (i = 0; i < mh->ncmds; ++i) { + uint32_t ncmds = mh64 ? mh64->ncmds : mh->ncmds; + for (i = 0; i < ncmds; ++i) { // // Read a generic load command into memory. // At first, we only know it has a type and size. @@ -465,7 +466,7 @@ if (swap) swap_symtab_command(symtab, NXHostByteOrder()); nsyms = symtab->nsyms; - uint32_t symsize = nsyms * sizeof(struct nlist); // XXX: nlist_64 + uint32_t symsize = nsyms * (mh64 ? sizeof(struct nlist_64) : sizeof(struct nlist)); symbols = malloc(symsize); strsize = symtab->strsize; @@ -476,11 +477,11 @@ off_t origin = fa ? fa->offset : 0; - lseek(fd, symtab->symoff + origin, SEEK_SET); + lseek(fd, (off_t)symtab->symoff + origin, SEEK_SET); res = read(fd, symbols, symsize); if (res < symsize) { /* XXX: leaks */ return 0; } - lseek(fd, symtab->stroff + origin, SEEK_SET); + lseek(fd, (off_t)symtab->stroff + origin, SEEK_SET); res = read(fd, strings, strsize); if (res < strsize) { /* XXX: leaks */ return 0; } @@ -500,6 +501,7 @@ int k; for (k = 0; k < seg->nsects; ++k) { struct section* sect = (struct section*)((uint8_t*)seg + sizeof(struct segment_command) + k * sizeof(struct section)); + if (swap) swap_section(sect, 1, NXHostByteOrder()); if (strcmp(sect->sectname, SECT_TEXT) == 0 && strcmp(sect->segname, SEG_TEXT) == 0) { text_nsect = ++count_nsect; } else if (strcmp(sect->sectname, SECT_DATA) == 0 && strcmp(sect->segname, SEG_DATA) == 0) { @@ -524,6 +526,7 @@ int k; for (k = 0; k < seg->nsects; ++k) { struct section_64* sect = (struct section_64*)((uint8_t*)seg + sizeof(struct segment_command_64) + k * sizeof(struct section_64)); + if (swap) swap_section_64(sect, 1, NXHostByteOrder()); if (strcmp(sect->sectname, SECT_TEXT) == 0 && strcmp(sect->segname, SEG_TEXT) == 0) { text_nsect = ++count_nsect; } else if (strcmp(sect->sectname, SECT_DATA) == 0 && strcmp(sect->segname, SEG_DATA) == 0) { @@ -549,6 +552,7 @@ memcpy(&symbol, (symbols + j * sizeof(struct nlist_64)), sizeof(struct nlist_64)); if (swap) swap_nlist_64(&symbol, 1, NXHostByteOrder()); } else { + symbol.n_value = 0; memcpy(&symbol, (symbols + j * sizeof(struct nlist)), sizeof(struct nlist)); if (swap) swap_nlist_64(&symbol, 1, NXHostByteOrder()); // we copied a 32-bit nlist into a 64-bit one, adjust the value accordingly

1 0