From source_changes at macosforge.org Sat Sep 9 14:19:03 2006 From: source_changes at macosforge.org (source_changes@macosforge.org) Date: Sat Sep 9 14:22:14 2006 Subject: [Odcctools-changes] [139] trunk Message-ID: <20060909211903.7570821E60D0@cvs.opensource.apple.com> Revision: 139 Author: ssen@mit.edu Date: 2006-09-09 14:19:01 -0700 (Sat, 09 Sep 2006) Log Message: ----------- Stop abusing Makefiles and use a shell script to patch Modified Paths: -------------- trunk/README Added Paths: ----------- trunk/extract.sh Removed Paths: ------------- trunk/Makefile Deleted: trunk/Makefile =================================================================== --- trunk/Makefile 2006-06-09 04:24:17 UTC (rev 138) +++ trunk/Makefile 2006-09-09 21:19:01 UTC (rev 139) @@ -1,137 +0,0 @@ -CCTOOLSNAME=cctools -CCTOOLSVERS=590.42.1 -CCTOOLSDISTFILE=$(CCTOOLSNAME)-$(CCTOOLSVERS).tar.bz2 - -LD64NAME=ld64 -LD64VERS=47.2 -LD64DISTFILE=$(LD64NAME)-$(LD64VERS).tar.bz2 - -DISTDIR=odcctools - -TOPSRCDIR=$(shell pwd) -HOSTKERNEL=$(shell uname -s) -TARSTRIP=$(TARSTRIP_$(HOSTKERNEL)) -TARSTRIP_Darwin=--strip-path -TARSTRIP_Linux=--strip-components - -PATCHFILESDIR=$(TOPSRCDIR)/patches -PATCHFILES=as/driver.c ld-Bstatic.diff as/getc_unlocked.diff \ - otool/nolibmstub.diff misc/ranlibname.diff \ - misc/libtool-ldpath.diff ar/ar-ranlibpath.diff \ - otool/noobjc.diff as/input-scrub.diff \ - as/messages.diff ar/contents.diff ar/errno.diff \ - ar/archive.diff misc/libtool-pb.diff ar/ar-printf.diff \ - ld/ld-pb.diff ld-sysroot.diff as/relax.diff \ - as/bignum.diff \ - misc/redo_prebinding.nomalloc.diff include/mach/machine.diff \ - ld/relocate-ld64.diff ld64/Options-stdarg.diff \ - ld64/Options-defcross.diff misc/libtool-relocate-ld64.diff \ - ld/uuid-nonsmodule.diff misc/redo_prebinding.nogetattrlist.diff \ - ld64/Options-ctype.diff ld64/ld64-case-variables.diff \ - ld64/MachOReaderRelocatable-ctz.diff ld64/FileAbstraction-inline.diff - - -ADDEDFILESDIR=$(TOPSRCDIR)/files - -default: none - -clean: - rm -rf $(DISTDIR) - rm -rf .state.* - -none: - @echo "Please choose an action:" - @echo " extract" - @echo " patch" - @echo " regen" - @echo " clean" - - -extract: - if [ \! -f .state.extract ]; then \ - if [ \! -d $(DISTDIR) ]; then \ - mkdir -p $(DISTDIR); \ - tar $(TARSTRIP)=1 -jxf $(CCTOOLSDISTFILE) -C $(DISTDIR); \ - mkdir -p $(DISTDIR)/ld64; \ - tar $(TARSTRIP)=1 -jxf $(LD64DISTFILE) -C $(DISTDIR)/ld64; \ - find $(DISTDIR)/ld64/doc/ \ - -type f -exec cp "{}" $(DISTDIR)/man \; ; \ - find $(DISTDIR) -name \*.orig -exec rm -f "{}" \; ; \ - rm -rf $(DISTDIR)/{cbtlibs,dyld,file,gprof,libdyld,mkshlib,profileServer}; \ - cp $(DISTDIR)/include/mach/machine.h $(DISTDIR)/include/mach/machine.h.new; \ - for i in mach architecture i386 libkern; do \ - ditto /Developer/SDKs/MacOSX10.4u.sdk/usr/include/$$i $(DISTDIR)/include/$$i; \ - done; \ - cp $(DISTDIR)/include/mach/machine.h.new $(DISTDIR)/include/mach/machine.h; \ - fi; \ - touch .state.extract; \ - fi - -patch: extract - if [ \! -f .state.patch ]; then \ - for p in $(PATCHFILES); do \ - echo Applying patch $$p; \ - dir=`dirname $$p`; \ - ( cd $(DISTDIR)/$$dir; \ - patch --no-backup-if-mismatch --posix -p0 < $(PATCHFILESDIR)/$$p ); \ - done; \ - tar cf - --exclude=CVS -C $(ADDEDFILESDIR) . | \ - tar xvf - -C $(DISTDIR); \ - find $(DISTDIR) -type f -name \*.[ch] | while read f; do \ - sed -e 's/^#import/#include/' < $$f > $$f.tmp; \ - mv -f $$f.tmp $$f; \ - done; \ - find $(DISTDIR) -type f -name \*.h | while read f; do \ - sed -e 's/^__private_extern__/extern/' < $$f > $$f.tmp; \ - mv -f $$f.tmp $$f; \ - done; \ - perl -pi -e 's/__GNUC__/__GNUC_UNUSED__/g;' $(DISTDIR)/include/libkern/OSByteOrder.h; \ - touch .state.patch; \ - fi - -updatepatch: extract - if [ \! -f .state.patch ]; then \ - for p in $(PATCHFILES); do \ - echo Applying patch $$p; \ - dir=`dirname $$p`; \ - ( cd $(DISTDIR)/$$dir; \ - patch -b --posix -p0 < $(PATCHFILESDIR)/$$p; \ - if [ $$? -eq 1 ]; then \ - exit 1; \ - fi; \ - ( find . -type f | while read f; do \ - if [ -f "$$f.orig" ]; then \ - diff -u -N "$$f.orig" "$$f"; \ - fi; \ - done) > $(PATCHFILESDIR)/$$p; \ - find . -type f -name \*.orig -exec rm -f "{}" \;; \ - ); \ - done; \ - tar cf - --exclude=CVS -C $(ADDEDFILESDIR) . | \ - tar xvf - -C $(DISTDIR); \ - find $(DISTDIR) -type f -name \*.[ch] | while read f; do \ - sed 's/^#import/#include/' < $$f > $$f.tmp; \ - mv -f $$f.tmp $$f; \ - done; \ - touch .state.patch; \ - fi - -regen: patch - if [ \! -f .state.regen ]; then \ - find $(DISTDIR) -name Makefile -exec rm -f "{}" \; ; \ - find $(DISTDIR) -name \*~ -exec rm -f "{}" \; ; \ - find $(DISTDIR) -name .\#\* -exec rm -f "{}" \; ; \ - ( cd $(DISTDIR) && \ - autoheader && \ - autoconf ); \ - rm -rf $(DISTDIR)/autom4te.cache; \ - touch .state.regen; \ - fi - -dist: regen - if [ \! -f .state.dist ]; then \ - ditto $(DISTDIR) $(DISTDIR)-$$(date +%Y%m%d); \ - tar jcf $(DISTDIR)-$$(date +%Y%m%d).tar.bz2 \ - $(DISTDIR)-$$(date +%Y%m%d); \ - touch .state.dist; \ - fi Modified: trunk/README =================================================================== --- trunk/README 2006-06-09 04:24:17 UTC (rev 138) +++ trunk/README 2006-09-09 21:19:01 UTC (rev 139) @@ -3,11 +3,10 @@ The repository is set up to patch an existing tarball, using a combination of patch files and copying brand new files. To generate a -usable source directory, do the following: +usable source directory based on a subversion checkout, run "./extract.sh". -% make extract -% make patch -% make regen +The resulting source in "odcctools/" can be distributed and built on +a variety of platforms and OS versions. --- Added: trunk/extract.sh =================================================================== --- trunk/extract.sh (rev 0) +++ trunk/extract.sh 2006-09-09 21:19:01 UTC (rev 139) @@ -0,0 +1,149 @@ +#!/bin/sh + +set -e + +CCTOOLSNAME=cctools +CCTOOLSVERS=590.42.1 +CCTOOLSDISTFILE=${CCTOOLSNAME}-${CCTOOLSVERS}.tar.bz2 + +LD64NAME=ld64 +LD64VERS=47.2 +LD64DISTFILE=${LD64NAME}-${LD64VERS}.tar.bz2 + +DISTDIR=odcctools + +TOPSRCDIR=`pwd` + +MAKEDISTFILE=0 +UPDATEPATCH=0 + +while [ $# -gt 0 ]; do + case $1 in + --distfile) + shift + MAKEDISTFILE=1 + ;; + --updatepatch) + shift + UPDATEPATCH=1 + ;; + --help) + echo "Usage: $0 [--help] [--distfile] [--updatepatch]" 1>&2 + exit 0 + ;; + *) + echo "Unknown option $1" 1>&2 + exit 1 + esac +done + +tar --help | grep -- --strip-components > /dev/null 2>&1 + +if [ $? -eq 0 ]; then + TARSTRIP=--strip-components +else + TARSTRIP=--strip-path +fi + +PATCHFILESDIR=${TOPSRCDIR}/patches + +PATCHFILES=`cd "${PATCHFILESDIR}" && find * -type f \! -path \*/.svn\*` + +ADDEDFILESDIR=${TOPSRCDIR}/files + +if [ -d "${DISTDIR}" ]; then + echo "${DISTDIR} already exists. Please move aside before running" 1>&2 + exit 1 +fi + +mkdir -p ${DISTDIR} +tar ${TARSTRIP}=1 -jxf ${CCTOOLSDISTFILE} -C ${DISTDIR} +mkdir -p ${DISTDIR}/ld64 +tar ${TARSTRIP}=1 -jxf ${LD64DISTFILE} -C ${DISTDIR}/ld64 +find ${DISTDIR}/ld64/doc/ -type f -exec cp "{}" ${DISTDIR}/man \; + +# Clean the source a bit +find ${DISTDIR} -name \*.orig -exec rm -f "{}" \; +rm -rf ${DISTDIR}/{cbtlibs,dyld,file,gprof,libdyld,mkshlib,profileServer} + +SDKROOT=/Developer/SDKs/MacOSX10.4u.sdk +echo "Merging content from $SDKROOT" +if [ ! -d "$SDKROOT" ]; then + echo "$SDKROOT must be present" 1>&2 + exit 1 +fi +mv ${DISTDIR}/include/mach/machine.h ${DISTDIR}/include/mach/machine.h.new; +for i in mach architecture i386 libkern; do + tar cf - -C "$SDKROOT/usr/include" $i | tar xf - -C ${DISTDIR}/include +done; +mv ${DISTDIR}/include/mach/machine.h.new ${DISTDIR}/include/mach/machine.h; + +# process source for mechanical substitutions +echo "Removing #import" +find ${DISTDIR} -type f -name \*.[ch] | while read f; do + sed -e 's/^#import/#include/' < $f > $f.tmp + mv -f $f.tmp $f +done + +echo "Removing __private_extern__" +find ${DISTDIR} -type f -name \*.h | while read f; do + sed -e 's/^__private_extern__/extern/' < $f > $f.tmp + mv -f $f.tmp $f +done + +for f in ${DISTDIR}/include/libkern/OSByteOrder.h; do + sed -e 's/__GNUC__/__GNUC_UNUSED__/g' < $f > $f.tmp + mv -f $f.tmp $f +done + +set +e + +INTERACTIVE=1 +echo "Applying patches" +for p in ${PATCHFILES}; do + dir=`dirname $p` + if [ $INTERACTIVE -eq 1 ]; then + read -p "Apply patch $p? " REPLY + else + echo "Applying patch $p" + fi + pushd ${DISTDIR}/$dir > /dev/null + patch --backup --posix -p0 < ${PATCHFILESDIR}/$p + if [ $? -ne 0 ]; then + echo "There was a patch failure. Please manually merge and exit the sub-shell when done" + $SHELL + if [ $UPDATEPATCH -eq 1 ]; then + find . -type f | while read f; do + if [ -f "$f.orig" ]; then + diff -u -N "$f.orig" "$f" + fi + done > ${PATCHFILESDIR}/$p + fi + fi + find . -type f -name \*.orig -exec rm -f "{}" \; + popd > /dev/null +done + +set -e + +echo "Adding new files" +tar cf - --exclude=CVS --exclude=.svn -C ${ADDEDFILESDIR} . | tar xvf - -C ${DISTDIR} + +echo "Deleting cruft" +find ${DISTDIR} -name Makefile -exec rm -f "{}" \; +find ${DISTDIR} -name \*~ -exec rm -f "{}" \; +find ${DISTDIR} -name .\#\* -exec rm -f "{}" \; + +pushd ${DISTDIR} > /dev/null +autoheader +autoconf +rm -rf autom4te.cache +popd > /dev/null + +if [ $MAKEDISTFILE -eq 1 ]; then + DATE=$(date +%Y%m%d) + mv ${DISTDIR} ${DISTDIR}-$DATE + tar jcf ${DISTDIR}-$DATE.tar.bz2 ${DISTDIR}-$DATE +fi + +exit 0 Property changes on: trunk/extract.sh ___________________________________________________________________ Name: svn:executable + * -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.macosforge.org/pipermail/odcctools-changes/attachments/20060909/82692374/attachment-0001.html From source_changes at macosforge.org Sat Sep 9 14:19:16 2006 From: source_changes at macosforge.org (source_changes@macosforge.org) Date: Sat Sep 9 14:22:14 2006 Subject: [Odcctools-changes] [140] trunk/patches Message-ID: <20060909211916.CF7EE21E6123@cvs.opensource.apple.com> Revision: 140 Author: ssen@mit.edu Date: 2006-09-09 14:19:15 -0700 (Sat, 09 Sep 2006) Log Message: ----------- Update patches Modified Paths: -------------- trunk/patches/ar/ar-printf.diff trunk/patches/include/mach/machine.diff trunk/patches/misc/redo_prebinding.nogetattrlist.diff trunk/patches/misc/redo_prebinding.nomalloc.diff Removed Paths: ------------- trunk/patches/ar/archive.diff trunk/patches/include/architecture/i386/selguard.diff trunk/patches/ld/ld-indirect-symbols.diff Modified: trunk/patches/ar/ar-printf.diff =================================================================== --- trunk/patches/ar/ar-printf.diff 2006-09-09 21:19:01 UTC (rev 139) +++ trunk/patches/ar/ar-printf.diff 2006-09-09 21:19:15 UTC (rev 140) @@ -1,32 +1,38 @@ ---- ./archive.c.orig 2006-03-15 20:35:29.000000000 -0800 -+++ ./archive.c 2006-03-15 20:35:30.000000000 -0800 -@@ -313,21 +313,21 @@ - (void)sprintf(hb, HDR3, name, (long int)sb->st_mtime, +--- ./archive.c.orig 2006-09-09 13:44:16.000000000 -0700 ++++ ./archive.c 2006-09-09 13:44:25.000000000 -0700 +@@ -310,24 +310,24 @@ + name, OLDARMAXNAME, name); + (void)fflush(stderr); + } +- (void)sprintf(hb, HDR3, name, (long int)sb->st_mtimespec.tv_sec, ++ (void)sprintf(hb, HDR3, name, (long int)sb->st_mtime, (unsigned int)(u_short)sb->st_uid, (unsigned int)(u_short)sb->st_gid, - sb->st_mode, sb->st_size, ARFMAG); -+ sb->st_mode, (int64_t)sb->st_size, ARFMAG); ++ sb->st_mode, (int64_t)sb->st_size, ARFMAG); lname = 0; } else if (lname > sizeof(hdr->ar_name) || strchr(name, ' ')) (void)sprintf(hb, HDR1, AR_EFMT1, (lname + 3) & ~3, - (long int)sb->st_mtime, +- (long int)sb->st_mtimespec.tv_sec, ++ (long int)sb->st_mtime, (unsigned int)(u_short)sb->st_uid, (unsigned int)(u_short)sb->st_gid, - sb->st_mode, sb->st_size + ((lname + 3) & ~3), -+ sb->st_mode, (int64_t)sb->st_size + ((lname + 3) & ~3), ++ sb->st_mode, (int64_t)sb->st_size + ((lname + 3) & ~3), ARFMAG); else { lname = 0; - (void)sprintf(hb, HDR2, name, (long int)sb->st_mtime, +- (void)sprintf(hb, HDR2, name, (long int)sb->st_mtimespec.tv_sec, ++ (void)sprintf(hb, HDR2, name, (long int)sb->st_mtime, (unsigned int)(u_short)sb->st_uid, (unsigned int)(u_short)sb->st_gid, - sb->st_mode, sb->st_size, ARFMAG); -+ sb->st_mode, (int64_t)sb->st_size, ARFMAG); ++ sb->st_mode, (int64_t)sb->st_size, ARFMAG); } size = sb->st_size; } else { ---- ./contents.c.orig 2006-03-15 20:35:29.000000000 -0800 -+++ ./contents.c 2006-03-15 20:35:30.000000000 -0800 +--- ./contents.c.orig 2006-09-09 13:44:16.000000000 -0700 ++++ ./contents.c 2006-09-09 13:44:22.000000000 -0700 @@ -104,7 +104,7 @@ if (options & AR_V) { (void)strmode(chdr.mode, buf); Deleted: trunk/patches/ar/archive.diff =================================================================== --- trunk/patches/ar/archive.diff 2006-09-09 21:19:01 UTC (rev 139) +++ trunk/patches/ar/archive.diff 2006-09-09 21:19:15 UTC (rev 140) @@ -1,27 +0,0 @@ ---- ./archive.c.orig 2006-03-15 20:35:29.000000000 -0800 -+++ ./archive.c 2006-03-15 20:35:29.000000000 -0800 -@@ -310,21 +310,21 @@ - name, OLDARMAXNAME, name); - (void)fflush(stderr); - } -- (void)sprintf(hb, HDR3, name, (long int)sb->st_mtimespec.tv_sec, -+ (void)sprintf(hb, HDR3, name, (long int)sb->st_mtime, - (unsigned int)(u_short)sb->st_uid, - (unsigned int)(u_short)sb->st_gid, - sb->st_mode, sb->st_size, ARFMAG); - lname = 0; - } else if (lname > sizeof(hdr->ar_name) || strchr(name, ' ')) - (void)sprintf(hb, HDR1, AR_EFMT1, (lname + 3) & ~3, -- (long int)sb->st_mtimespec.tv_sec, -+ (long int)sb->st_mtime, - (unsigned int)(u_short)sb->st_uid, - (unsigned int)(u_short)sb->st_gid, - sb->st_mode, sb->st_size + ((lname + 3) & ~3), - ARFMAG); - else { - lname = 0; -- (void)sprintf(hb, HDR2, name, (long int)sb->st_mtimespec.tv_sec, -+ (void)sprintf(hb, HDR2, name, (long int)sb->st_mtime, - (unsigned int)(u_short)sb->st_uid, - (unsigned int)(u_short)sb->st_gid, - sb->st_mode, sb->st_size, ARFMAG); Deleted: trunk/patches/include/architecture/i386/selguard.diff =================================================================== --- trunk/patches/include/architecture/i386/selguard.diff 2006-09-09 21:19:01 UTC (rev 139) +++ trunk/patches/include/architecture/i386/selguard.diff 2006-09-09 21:19:15 UTC (rev 140) @@ -1,58 +0,0 @@ ---- ./fpu.h.orig 2003-08-12 17:09:50.000000000 -0700 -+++ ./fpu.h 2006-03-15 20:35:30.000000000 -0800 -@@ -38,6 +38,9 @@ - * Data register. - */ - -+#ifndef _I386_FPU_H_ -+#define _I386_FPU_H_ -+ - typedef struct fp_data_reg { - unsigned short mant; - unsigned short mant1 :16, -@@ -120,7 +123,10 @@ - :3; - } fp_control_t; - -+#ifndef _GUARD_I386_SEL_H_ -+#define _GUARD_I386_SEL_H_ - #import -+#endif - - /* - * Floating point 'environment' -@@ -151,3 +157,5 @@ - fp_env_t environ; - fp_stack_t stack; - } fp_state_t; -+ -+#endif ---- ./frame.h.orig 2003-08-12 17:09:53.000000000 -0700 -+++ ./frame.h 2006-03-15 20:35:30.000000000 -0800 -@@ -38,6 +38,9 @@ - * Created. - */ - -+#ifndef _I386_FRAME_H_ -+#define _I386_FRAME_H_ -+ - /* - * Format of the error code - * generated by the hardware -@@ -62,7 +65,10 @@ - } pgfault; - } err_code_t; - -+#ifndef _GUARD_I386_SEL_H_ -+#define _GUARD_I386_SEL_H_ - #import -+#endif - - /* - * The actual hardware exception frame -@@ -122,3 +128,5 @@ - - #define EFL_CLR 0xfff88028 - #define EFL_SET 0x00000002 -+ -+#endif Modified: trunk/patches/include/mach/machine.diff =================================================================== --- trunk/patches/include/mach/machine.diff 2006-09-09 21:19:01 UTC (rev 139) +++ trunk/patches/include/mach/machine.diff 2006-09-09 21:19:15 UTC (rev 140) @@ -1,11 +1,11 @@ ---- ./machine.h.orig 2005-05-12 15:39:36.000000000 -0700 -+++ ./machine.h 2006-03-15 20:35:31.000000000 -0800 +--- ./machine.h.orig 2006-09-09 13:45:52.000000000 -0700 ++++ ./machine.h 2006-09-09 13:48:22.000000000 -0700 @@ -80,32 +80,9 @@ #ifndef _MACH_MACHINE_H_ #define _MACH_MACHINE_H_ --#import --#import +-#include +-#include - -/* - * For each host, there is a maximum possible number of Deleted: trunk/patches/ld/ld-indirect-symbols.diff =================================================================== --- trunk/patches/ld/ld-indirect-symbols.diff 2006-09-09 21:19:01 UTC (rev 139) +++ trunk/patches/ld/ld-indirect-symbols.diff 2006-09-09 21:19:15 UTC (rev 140) @@ -1,14 +0,0 @@ ---- symbols.c.orig 2005-03-06 19:49:49.000000000 -0800 -+++ symbols.c 2005-03-06 19:55:53.000000000 -0800 -@@ -2502,6 +2502,11 @@ - } - } - if(resolve_flat == TRUE){ -+ if(twolevel_namespace == TRUE && -+ (((struct mach_header *)(cur_obj->obj_addr))-> -+ flags & MH_TWOLEVEL) != MH_TWOLEVEL){ -+ continue; /* with for loop */ -+ } - /* lookup the symbol and see if it has already been seen */ - hash_pointer = lookup_symbol(symbol_name); - if(*hash_pointer == NULL){ Modified: trunk/patches/misc/redo_prebinding.nogetattrlist.diff =================================================================== --- trunk/patches/misc/redo_prebinding.nogetattrlist.diff 2006-09-09 21:19:01 UTC (rev 139) +++ trunk/patches/misc/redo_prebinding.nogetattrlist.diff 2006-09-09 21:19:15 UTC (rev 140) @@ -1,15 +1,15 @@ ---- redo_prebinding.c.orig 2006-03-16 08:58:09.000000000 -0800 -+++ redo_prebinding.c 2006-03-16 08:59:35.000000000 -0800 +--- ./redo_prebinding.c.orig 2006-09-09 13:49:18.000000000 -0700 ++++ ./redo_prebinding.c 2006-09-09 13:50:19.000000000 -0700 @@ -82,7 +82,7 @@ */ #include #endif /* defined(LIBRARY_API) */ - +#include - #import - #import - #import -@@ -9262,7 +9262,7 @@ + #include + #include + #include +@@ -9263,7 +9263,7 @@ errors++; } #endif /* defined(LIBRARY_API) */ @@ -18,7 +18,7 @@ #include /* * Structure defining what's returned from getattrlist. It returns all the -@@ -9336,7 +9336,15 @@ +@@ -9337,7 +9337,15 @@ return(FALSE); } Modified: trunk/patches/misc/redo_prebinding.nomalloc.diff =================================================================== --- trunk/patches/misc/redo_prebinding.nomalloc.diff 2006-09-09 21:19:01 UTC (rev 139) +++ trunk/patches/misc/redo_prebinding.nomalloc.diff 2006-09-09 21:19:15 UTC (rev 140) @@ -1,10 +1,11 @@ ---- ./redo_prebinding.c.orig 2005-11-14 17:34:50.000000000 -0800 -+++ ./redo_prebinding.c 2006-03-15 20:35:31.000000000 -0800 -@@ -88,7 +88,6 @@ - #import - #import - #import --#import - #import - #import - #import +--- ./redo_prebinding.c.orig 2006-09-09 13:50:19.000000000 -0700 ++++ ./redo_prebinding.c 2006-09-09 13:50:50.000000000 -0700 +@@ -88,7 +88,7 @@ + #include + #include + #include +-#include ++//#include + #include + #include + #include -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.macosforge.org/pipermail/odcctools-changes/attachments/20060909/8464d052/attachment-0001.html From source_changes at macosforge.org Mon Sep 11 20:36:07 2006 From: source_changes at macosforge.org (source_changes@macosforge.org) Date: Tue Sep 12 14:03:44 2006 Subject: [Odcctools-changes] [141] trunk Message-ID: <20060912033607.7296921EBAF0@cvs.opensource.apple.com> Revision: 141 Author: ssen@mit.edu Date: 2006-09-11 20:36:05 -0700 (Mon, 11 Sep 2006) Log Message: ----------- Update tarballs for Xcode 2.4 Modified Paths: -------------- trunk/ChangeLog.odcctools Added Paths: ----------- trunk/cctools-622.3.tar.bz2 trunk/ld64-59.2.tar.bz2 Removed Paths: ------------- trunk/cctools-590.42.1.tar.bz2 trunk/ld64-47.2.tar.bz2 Modified: trunk/ChangeLog.odcctools =================================================================== --- trunk/ChangeLog.odcctools 2006-09-09 21:19:15 UTC (rev 140) +++ trunk/ChangeLog.odcctools 2006-09-12 03:36:05 UTC (rev 141) @@ -1,3 +1,7 @@ +2006-09-11 Shantonu Sen + + * Import cctools-622.3 and ld64-59.2 + 2006-06-03 Shantonu Sen * Import cctools-590.42.1 and ld64-47.2 Deleted: trunk/cctools-590.42.1.tar.bz2 =================================================================== (Binary files differ) Added: trunk/cctools-622.3.tar.bz2 =================================================================== (Binary files differ) Property changes on: trunk/cctools-622.3.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: trunk/ld64-47.2.tar.bz2 =================================================================== (Binary files differ) Added: trunk/ld64-59.2.tar.bz2 =================================================================== (Binary files differ) Property changes on: trunk/ld64-59.2.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.macosforge.org/pipermail/odcctools-changes/attachments/20060911/840d3c48/attachment-0001.html From source_changes at macosforge.org Mon Sep 11 20:59:38 2006 From: source_changes at macosforge.org (source_changes@macosforge.org) Date: Tue Sep 12 14:03:45 2006 Subject: [Odcctools-changes] [142] trunk Message-ID: <20060912035938.C6EC921EBC05@cvs.opensource.apple.com> Revision: 142 Author: ssen@mit.edu Date: 2006-09-11 20:59:36 -0700 (Mon, 11 Sep 2006) Log Message: ----------- update patches and files Modified Paths: -------------- trunk/extract.sh trunk/files/configure.ac trunk/patches/ld/relocate-ld64.diff trunk/patches/ld64/MachOReaderRelocatable-ctz.diff Modified: trunk/extract.sh =================================================================== --- trunk/extract.sh 2006-09-12 03:36:05 UTC (rev 141) +++ trunk/extract.sh 2006-09-12 03:59:36 UTC (rev 142) @@ -3,11 +3,11 @@ set -e CCTOOLSNAME=cctools -CCTOOLSVERS=590.42.1 +CCTOOLSVERS=622.3 CCTOOLSDISTFILE=${CCTOOLSNAME}-${CCTOOLSVERS}.tar.bz2 LD64NAME=ld64 -LD64VERS=47.2 +LD64VERS=59.2 LD64DISTFILE=${LD64NAME}-${LD64VERS}.tar.bz2 DISTDIR=odcctools Modified: trunk/files/configure.ac =================================================================== --- trunk/files/configure.ac 2006-09-12 03:36:05 UTC (rev 141) +++ trunk/files/configure.ac 2006-09-12 03:59:36 UTC (rev 142) @@ -1,4 +1,4 @@ -AC_INIT([odcctools], [590.42.1od14], [odcctools@opendarwin.org]) +AC_INIT([odcctools], [622.3od15], [odcctools@opendarwin.org]) AC_PREREQ([2.57]) AC_REVISION([$Revision: 1.45 $]) @@ -25,7 +25,7 @@ AC_DEFINE(EMULATED_HOST_CPU_TYPE, 18, [Emulated CPU type]) AC_DEFINE(EMULATED_HOST_CPU_SUBTYPE, 100, [Emulated CPU subtype]) ;; - i?86) + i?86|x86_64) AC_DEFINE(EMULATED_HOST_CPU_TYPE, 7, [Emulated CPU type]) AC_DEFINE(EMULATED_HOST_CPU_SUBTYPE, 10, [Emulated CPU subtype]) ;; @@ -48,16 +48,16 @@ AC_MSG_CHECKING([for configured assembler targets]) AC_ARG_ENABLE([as-targets], AC_HELP_STRING([--enable-as-targets], - [space-separated list ("ppc", "ppc64", "i386", "all")]), + [space-separated list ("ppc", "ppc64", "i386", "x86_64", "all")]), [conftargets="$enableval"], [conftargets="default"]) case "$conftargets" in all) - ASTARGETS="ppc ppc64 i386" + ASTARGETS="ppc ppc64 i386 x86_64" ;; default) - ASTARGETS="ppc ppc64 i386" + ASTARGETS="ppc ppc64 i386 x86_64" ;; yes) AC_MSG_ERROR([no assembler targets configured]) @@ -283,6 +283,9 @@ i386) AC_CONFIG_FILES([as/i386/Makefile:as/i386/Makefile.in:as/Makefile.arch.in]) ;; + x86_64) + AC_CONFIG_FILES([as/x86_64/Makefile:as/x86_64/Makefile.in:as/Makefile.arch.in]) + ;; *) AC_MSG_ERROR([Unrecognized assembler target $ast]) ;; Modified: trunk/patches/ld/relocate-ld64.diff =================================================================== --- trunk/patches/ld/relocate-ld64.diff 2006-09-12 03:36:05 UTC (rev 141) +++ trunk/patches/ld/relocate-ld64.diff 2006-09-12 03:59:36 UTC (rev 142) @@ -1,11 +1,20 @@ ---- ./ld.c.orig 2006-03-15 20:35:30.000000000 -0800 -+++ ./ld.c 2006-03-15 20:35:31.000000000 -0800 -@@ -555,7 +555,7 @@ - strcmp(argv[i], "-arch") == 0 && - i + 1 < argc && - strcmp(argv[i+1], "ppc64") == 0){ -- argv[0] = "/usr/bin/ld64"; -+ argv[0] = BINDIR "/" LD64PROG; - ld_exit(!execute(argv, 0)); +--- ./ld.c.orig 2006-09-11 20:51:23.000000000 -0700 ++++ ./ld.c 2006-09-11 20:51:33.000000000 -0700 +@@ -2024,7 +2024,7 @@ + * 64-bit architectures are handled by ld64 + */ + if(arch_flag.cputype & CPU_ARCH_ABI64) { +- argv[0] = "/usr/bin/ld64"; ++ argv[0] = BINDIR "/" LD64PROG; + ld_exit(!execute(argv, 0)); } + +@@ -2913,7 +2913,7 @@ + */ + if(arch_flag.cputype != 0 && + arch_flag.cputype & CPU_ARCH_ABI64){ +- argv[0] = "/usr/bin/ld64"; ++ argv[0] = BINDIR "/" LD64PROG; + ld_exit(!execute(argv, 0)); } + Modified: trunk/patches/ld64/MachOReaderRelocatable-ctz.diff =================================================================== --- trunk/patches/ld64/MachOReaderRelocatable-ctz.diff 2006-09-12 03:36:05 UTC (rev 141) +++ trunk/patches/ld64/MachOReaderRelocatable-ctz.diff 2006-09-12 03:59:36 UTC (rev 142) @@ -1,6 +1,6 @@ ---- src/MachOReaderRelocatable.hpp.orig 2006-06-08 20:44:51.000000000 -0700 -+++ src/MachOReaderRelocatable.hpp 2006-06-08 20:50:35.000000000 -0700 -@@ -357,6 +357,16 @@ +--- ./src/MachOReaderRelocatable.hpp.orig 2006-09-11 20:51:41.000000000 -0700 ++++ ./src/MachOReaderRelocatable.hpp 2006-09-11 20:51:50.000000000 -0700 +@@ -383,6 +383,16 @@ } } @@ -17,19 +17,24 @@ template void SymbolAtom::setSize(uint64_t size) -@@ -364,13 +374,13 @@ - fSize = size; - - // Try to compute the alignment base on the address aligned at in object file and the size -- uint8_t sizeAlign = __builtin_ctz(fSize); -+ uint8_t sizeAlign = ctz(fSize); - uint8_t sizeAndSectAlign = std::min((uint8_t)fSection->align(), sizeAlign); - // If address is zero, can't figure out better alignment than section alignment and size - if ( fAddress == 0 ) - fAlignment = sizeAndSectAlign; - else -- fAlignment = std::min((uint8_t)__builtin_ctz(fAddress), sizeAndSectAlign); -+ fAlignment = std::min((uint8_t)ctz(fAddress), sizeAndSectAlign); +@@ -394,17 +404,17 @@ + if ( fAddress == 0 ) + fAlignment = fSection->align(); + else +- fAlignment = std::min((uint8_t)__builtin_ctz(fAddress), (uint8_t)fSection->align()); ++ fAlignment = std::min((uint8_t)ctz(fAddress), (uint8_t)fSection->align()); + } + else { + // For data, compute the alignment base on the address aligned at in object file and the size +- uint8_t sizeAlign = __builtin_ctz(fSize); ++ uint8_t sizeAlign = ctz(fSize); + uint8_t sizeAndSectAlign = std::min((uint8_t)fSection->align(), sizeAlign); + // If address is zero, can't figure out better alignment than section alignment and size + if ( fAddress == 0 ) + fAlignment = sizeAndSectAlign; + else +- fAlignment = std::min((uint8_t)__builtin_ctz(fAddress), sizeAndSectAlign); ++ fAlignment = std::min((uint8_t)ctz(fAddress), sizeAndSectAlign); + } } - -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.macosforge.org/pipermail/odcctools-changes/attachments/20060911/dd6ff9c7/attachment-0001.html From source_changes at macosforge.org Mon Sep 11 21:17:12 2006 From: source_changes at macosforge.org (source_changes@macosforge.org) Date: Tue Sep 12 14:03:45 2006 Subject: [Odcctools-changes] [143] trunk Message-ID: <20060912041712.09AAC21EBC7C@cvs.opensource.apple.com> Revision: 143 Author: ssen@mit.edu Date: 2006-09-11 21:17:11 -0700 (Mon, 11 Sep 2006) Log Message: ----------- make it compile Modified Paths: -------------- trunk/extract.sh trunk/files/libstuff/apple_version.c Modified: trunk/extract.sh =================================================================== --- trunk/extract.sh 2006-09-12 03:59:36 UTC (rev 142) +++ trunk/extract.sh 2006-09-12 04:17:11 UTC (rev 143) @@ -98,7 +98,7 @@ set +e -INTERACTIVE=1 +INTERACTIVE=0 echo "Applying patches" for p in ${PATCHFILES}; do dir=`dirname $p` Modified: trunk/files/libstuff/apple_version.c =================================================================== --- trunk/files/libstuff/apple_version.c 2006-09-12 03:59:36 UTC (rev 142) +++ trunk/files/libstuff/apple_version.c 2006-09-12 04:17:11 UTC (rev 143) @@ -3,4 +3,5 @@ #endif const char apple_version[]= PACKAGE_NAME "-" PACKAGE_VERSION; +const double ld64VersionNumber = 59.2; const char ld64VersionString[]= "@(#)PROGRAM:ld64 PROJECT:" PACKAGE_NAME "-" PACKAGE_VERSION "\n"; -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.macosforge.org/pipermail/odcctools-changes/attachments/20060911/8a6d7eea/attachment-0001.html From source_changes at macosforge.org Tue Sep 12 13:42:21 2006 From: source_changes at macosforge.org (source_changes@macosforge.org) Date: Tue Sep 12 14:03:46 2006 Subject: [Odcctools-changes] [144] trunk Message-ID: <20060912204221.DF6CB21EDD82@cvs.opensource.apple.com> Revision: 144 Author: ssen@mit.edu Date: 2006-09-12 13:42:19 -0700 (Tue, 12 Sep 2006) Log Message: ----------- add x86_64 diffs Modified Paths: -------------- trunk/patches/ld64/ld64-case-variables.diff Added Paths: ----------- trunk/files/as/x86_64/ trunk/files/as/x86_64/Makefile.in Added: trunk/files/as/x86_64/Makefile.in =================================================================== --- trunk/files/as/x86_64/Makefile.in (rev 0) +++ trunk/files/as/x86_64/Makefile.in 2006-09-12 20:42:19 UTC (rev 144) @@ -0,0 +1,6 @@ +ARCH = x86_64 + +CFILES_x86_64 = i386.c +MYDEFS_x86_64 = -DI386 -Di486 -Di586 -Di686 -DARCH64 +MYLIBS_x86_64 = -lstuff64 + Modified: trunk/patches/ld64/ld64-case-variables.diff =================================================================== --- trunk/patches/ld64/ld64-case-variables.diff 2006-09-12 04:17:11 UTC (rev 143) +++ trunk/patches/ld64/ld64-case-variables.diff 2006-09-12 20:42:19 UTC (rev 144) @@ -54,3 +54,21 @@ case N_LBRAC: case N_RBRAC: case N_SLINE: +@@ -2777,7 +2777,7 @@ + else + makeReferenceToSymbol(x86_64::kPCRel32GOTLoad, srcAddr, targetSymbol, addend); + break; +- case X86_64_RELOC_SUBTRACTOR: ++ case X86_64_RELOC_SUBTRACTOR: { + if ( reloc->r_pcrel() ) + throw "X86_64_RELOC_SUBTRACTOR cannot be pc-relative"; + if ( reloc->r_length() < 2 ) +@@ -2839,7 +2839,7 @@ + ref->setFromTargetOffset(-dstAddr); + else + ref->setToTargetOffset(dstAddr); +- break; ++ } break; + default: + fprintf(stderr, "unknown relocation type %d\n", reloc->r_type()); + } -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.macosforge.org/pipermail/odcctools-changes/attachments/20060912/339ac1bb/attachment.html From source_changes at macosforge.org Wed Sep 13 14:48:32 2006 From: source_changes at macosforge.org (source_changes@macosforge.org) Date: Wed Sep 13 14:42:07 2006 Subject: [Odcctools-changes] [145] trunk/patches/ld64/ld64-case-variables.diff Message-ID: <20060913214832.10F6121F093A@cvs.opensource.apple.com> Revision: 145 Author: ssen@mit.edu Date: 2006-09-13 14:48:31 -0700 (Wed, 13 Sep 2006) Log Message: ----------- commit patch for x86_64 Modified Paths: -------------- trunk/patches/ld64/ld64-case-variables.diff Modified: trunk/patches/ld64/ld64-case-variables.diff =================================================================== --- trunk/patches/ld64/ld64-case-variables.diff 2006-09-12 20:42:19 UTC (rev 144) +++ trunk/patches/ld64/ld64-case-variables.diff 2006-09-13 21:48:31 UTC (rev 145) @@ -1,6 +1,6 @@ ---- src/MachOReaderDylib.hpp.orig 2006-06-04 09:20:28.000000000 -0700 -+++ src/MachOReaderDylib.hpp 2006-06-04 09:20:51.000000000 -0700 -@@ -243,13 +243,13 @@ +--- ./src/MachOReaderDylib.hpp.orig 2006-09-06 13:26:13.000000000 -0700 ++++ ./src/MachOReaderDylib.hpp 2006-09-12 13:37:21.000000000 -0700 +@@ -246,13 +246,13 @@ case LC_DYSYMTAB: dynamicInfo = (macho_dysymtab_command

*)cmd; break; @@ -16,9 +16,9 @@ case LC_SUB_UMBRELLA: if ( !options.fFlatNamespace ) { const char* frameworkLeafName = ((macho_sub_umbrella_command

*)cmd)->sub_umbrella(); ---- src/MachOReaderRelocatable.hpp.orig 2006-06-04 09:18:26.000000000 -0700 -+++ src/MachOReaderRelocatable.hpp 2006-06-04 09:20:11.000000000 -0700 -@@ -1384,7 +1384,7 @@ +--- ./src/MachOReaderRelocatable.hpp.orig 2006-09-06 13:32:03.000000000 -0700 ++++ ./src/MachOReaderRelocatable.hpp 2006-09-12 13:38:36.000000000 -0700 +@@ -1544,7 +1544,7 @@ // not associated with an atom, just copy stab.string = symString; break; @@ -27,16 +27,16 @@ // n_value field is NOT atom address ;-( // need to find atom by name match const char* colon = strchr(symString, ':'); -@@ -1404,7 +1404,7 @@ - if ( stab.atom == NULL ) { +@@ -1565,7 +1565,7 @@ fprintf(stderr, "can't find atom for N_GSYM stabs %s in %s\n", symString, path); + useStab = false; } - break; + } break; case N_FUN: // old style stabs without BNSYM state = inFun; -@@ -1442,7 +1442,7 @@ +@@ -1603,7 +1603,7 @@ currentAtom = NULL; break; case N_LCSYM: @@ -45,7 +45,7 @@ BaseAtom* nestedAtom = (BaseAtom*)this->findAtomAndOffset(sym->n_value()).atom; if ( nestedAtom != NULL ) { stab.atom = nestedAtom; -@@ -1452,7 +1452,7 @@ +@@ -1613,7 +1613,7 @@ fprintf(stderr, "can't find atom for stabs 0x%X at %08llX in %s\n", type, (uint64_t)sym->n_value(), path); } @@ -54,21 +54,21 @@ case N_LBRAC: case N_RBRAC: case N_SLINE: -@@ -2777,7 +2777,7 @@ - else - makeReferenceToSymbol(x86_64::kPCRel32GOTLoad, srcAddr, targetSymbol, addend); - break; -- case X86_64_RELOC_SUBTRACTOR: -+ case X86_64_RELOC_SUBTRACTOR: { - if ( reloc->r_pcrel() ) - throw "X86_64_RELOC_SUBTRACTOR cannot be pc-relative"; - if ( reloc->r_length() < 2 ) -@@ -2839,7 +2839,7 @@ - ref->setFromTargetOffset(-dstAddr); - else - ref->setToTargetOffset(dstAddr); -- break; -+ } break; - default: - fprintf(stderr, "unknown relocation type %d\n", reloc->r_type()); - } +@@ -2767,7 +2767,7 @@ + else + makeReferenceToSymbol(x86_64::kPCRel32GOTLoad, srcAddr, targetSymbol, addend); + break; +- case X86_64_RELOC_SUBTRACTOR: ++ case X86_64_RELOC_SUBTRACTOR: { + if ( reloc->r_pcrel() ) + throw "X86_64_RELOC_SUBTRACTOR cannot be pc-relative"; + if ( reloc->r_length() < 2 ) +@@ -2829,7 +2829,7 @@ + ref->setFromTargetOffset(-dstAddr); + else + ref->setToTargetOffset(dstAddr); +- break; ++ } break; + default: + fprintf(stderr, "unknown relocation type %d\n", reloc->r_type()); + } -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.macosforge.org/pipermail/odcctools-changes/attachments/20060913/92fed122/attachment.html From source_changes at macosforge.org Thu Sep 14 20:00:45 2006 From: source_changes at macosforge.org (source_changes@macosforge.org) Date: Thu Sep 14 19:54:21 2006 Subject: [Odcctools-changes] [146] trunk/extract.sh Message-ID: <20060915030045.7EF6E21F32BF@cvs.opensource.apple.com> Revision: 146 Author: ssen@mit.edu Date: 2006-09-14 20:00:39 -0700 (Thu, 14 Sep 2006) Log Message: ----------- fix extraction on 10.4 Modified Paths: -------------- trunk/extract.sh Modified: trunk/extract.sh =================================================================== --- trunk/extract.sh 2006-09-13 21:48:31 UTC (rev 145) +++ trunk/extract.sh 2006-09-15 03:00:39 UTC (rev 146) @@ -37,9 +37,9 @@ esac done -tar --help | grep -- --strip-components > /dev/null 2>&1 -if [ $? -eq 0 ]; then + +if [ "`tar --help | grep -- --strip-components 2> /dev/null`" ]; then TARSTRIP=--strip-components else TARSTRIP=--strip-path -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.macosforge.org/pipermail/odcctools-changes/attachments/20060914/43267f97/attachment.html From source_changes at macosforge.org Sun Sep 17 14:13:32 2006 From: source_changes at macosforge.org (source_changes@macosforge.org) Date: Sun Sep 17 14:07:14 2006 Subject: [Odcctools-changes] [147] trunk Message-ID: <20060917211332.9769B2223332@cvs.opensource.apple.com> Revision: 147 Author: ssen@mit.edu Date: 2006-09-17 14:13:30 -0700 (Sun, 17 Sep 2006) Log Message: ----------- Add ability to avoid SDK merge if you are planning on building with xcode 2.4. Fix some warnings Modified Paths: -------------- trunk/extract.sh Added Paths: ----------- trunk/patches/include/stuff/ trunk/patches/include/stuff/bytesex-floatstate.diff Modified: trunk/extract.sh =================================================================== --- trunk/extract.sh 2006-09-15 03:00:39 UTC (rev 146) +++ trunk/extract.sh 2006-09-17 21:13:30 UTC (rev 147) @@ -16,6 +16,7 @@ MAKEDISTFILE=0 UPDATEPATCH=0 +USESSDK=1 while [ $# -gt 0 ]; do case $1 in @@ -27,8 +28,12 @@ shift UPDATEPATCH=1 ;; + --nosdk) + shift + USESDK=0 + ;; --help) - echo "Usage: $0 [--help] [--distfile] [--updatepatch]" 1>&2 + echo "Usage: $0 [--help] [--distfile] [--updatepatch] [--nosdk]" 1>&2 exit 0 ;; *) @@ -66,17 +71,25 @@ find ${DISTDIR} -name \*.orig -exec rm -f "{}" \; rm -rf ${DISTDIR}/{cbtlibs,dyld,file,gprof,libdyld,mkshlib,profileServer} -SDKROOT=/Developer/SDKs/MacOSX10.4u.sdk -echo "Merging content from $SDKROOT" -if [ ! -d "$SDKROOT" ]; then - echo "$SDKROOT must be present" 1>&2 - exit 1 +if [ $USESDK -eq 1 ]; then + SDKROOT=/Developer/SDKs/MacOSX10.4u.sdk + echo "Merging content from $SDKROOT" + if [ ! -d "$SDKROOT" ]; then + echo "$SDKROOT must be present" 1>&2 + exit 1 + fi + + mv ${DISTDIR}/include/mach/machine.h ${DISTDIR}/include/mach/machine.h.new; + for i in mach architecture i386 libkern; do + tar cf - -C "$SDKROOT/usr/include" $i | tar xf - -C ${DISTDIR}/include + done + mv ${DISTDIR}/include/mach/machine.h.new ${DISTDIR}/include/mach/machine.h; + + for f in ${DISTDIR}/include/libkern/OSByteOrder.h; do + sed -e 's/__GNUC__/__GNUC_UNUSED__/g' < $f > $f.tmp + mv -f $f.tmp $f + done fi -mv ${DISTDIR}/include/mach/machine.h ${DISTDIR}/include/mach/machine.h.new; -for i in mach architecture i386 libkern; do - tar cf - -C "$SDKROOT/usr/include" $i | tar xf - -C ${DISTDIR}/include -done; -mv ${DISTDIR}/include/mach/machine.h.new ${DISTDIR}/include/mach/machine.h; # process source for mechanical substitutions echo "Removing #import" @@ -91,11 +104,6 @@ mv -f $f.tmp $f done -for f in ${DISTDIR}/include/libkern/OSByteOrder.h; do - sed -e 's/__GNUC__/__GNUC_UNUSED__/g' < $f > $f.tmp - mv -f $f.tmp $f -done - set +e INTERACTIVE=0 Added: trunk/patches/include/stuff/bytesex-floatstate.diff =================================================================== --- trunk/patches/include/stuff/bytesex-floatstate.diff (rev 0) +++ trunk/patches/include/stuff/bytesex-floatstate.diff 2006-09-17 21:13:30 UTC (rev 147) @@ -0,0 +1,11 @@ +--- bytesex.h.orig 2006-09-17 13:54:31.000000000 -0700 ++++ bytesex.h 2006-09-17 13:55:07.000000000 -0700 +@@ -227,7 +227,7 @@ + /* current i386 thread states */ + #if i386_THREAD_STATE == 1 + extern void swap_i386_float_state( +- struct __darwin_i386_float_state *fpu, ++ struct i386_float_state *fpu, + enum byte_sex target_byte_sex); + + extern void swap_i386_exception_state( -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.macosforge.org/pipermail/odcctools-changes/attachments/20060917/4b29dfc3/attachment-0001.html From source_changes at macosforge.org Mon Sep 25 10:04:41 2006 From: source_changes at macosforge.org (source_changes@macosforge.org) Date: Mon Sep 25 10:06:46 2006 Subject: [odcctools-changes] [148] trunk/extract.sh Message-ID: <20060925170441.619AF15A3BB@cvs.opensource.apple.com> Revision: 148 http://trac.macosforge.org/projects/odcctools/changeset/148 Author: ssen@mit.edu Date: 2006-09-25 10:04:40 -0700 (Mon, 25 Sep 2006) Log Message: ----------- fix typo Modified Paths: -------------- trunk/extract.sh Modified: trunk/extract.sh =================================================================== --- trunk/extract.sh 2006-09-17 21:13:30 UTC (rev 147) +++ trunk/extract.sh 2006-09-25 17:04:40 UTC (rev 148) @@ -16,7 +16,7 @@ MAKEDISTFILE=0 UPDATEPATCH=0 -USESSDK=1 +USESDK=1 while [ $# -gt 0 ]; do case $1 in -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.macosforge.org/pipermail/odcctools-changes/attachments/20060925/a0050750/attachment.html From source_changes at macosforge.org Mon Sep 25 10:05:21 2006 From: source_changes at macosforge.org (source_changes@macosforge.org) Date: Mon Sep 25 10:07:26 2006 Subject: [odcctools-changes] [149] trunk/files Message-ID: <20060925170521.A842015A3DD@cvs.opensource.apple.com> Revision: 149 http://trac.macosforge.org/projects/odcctools/changeset/149 Author: ssen@mit.edu Date: 2006-09-25 10:05:21 -0700 (Mon, 25 Sep 2006) Log Message: ----------- We don't need #defines for LEGACY fields anymore since we embed xcode 2.4 SDK headers Modified Paths: -------------- trunk/files/libmacho/Makefile.in trunk/files/libstuff/Makefile.in trunk/files/otool/Makefile.in Modified: trunk/files/libmacho/Makefile.in =================================================================== --- trunk/files/libmacho/Makefile.in 2006-09-25 17:04:40 UTC (rev 148) +++ trunk/files/libmacho/Makefile.in 2006-09-25 17:05:21 UTC (rev 149) @@ -31,13 +31,10 @@ FORHDRS = -I$(top_srcdir)/include/foreign endif -LEGACY = -D_MACH_I386_THREAD_STATUS_FPSTATE_LEGACY_FIELD_NAMES_ \ - -D_ARCHITECTURE_I386_FPU_FPSTATE_LEGACY_FIELD_NAMES_ - MYINCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \ $(INCPRIVEXT) $(FORHDRS) MYWARNINGS = -MYDEFS = $(LEGACY) +MYDEFS = MYCOMPILEFLAGS = $(WARNINGS) $(MYWARNINGS) $(DEFS) $(MYDEFS) \ $(CPPFLAGS) $(MYINCLUDES) $(CFLAGS) Modified: trunk/files/libstuff/Makefile.in =================================================================== --- trunk/files/libstuff/Makefile.in 2006-09-25 17:04:40 UTC (rev 148) +++ trunk/files/libstuff/Makefile.in 2006-09-25 17:05:21 UTC (rev 149) @@ -25,13 +25,10 @@ FORHDRS = -I$(top_srcdir)/include/foreign endif -LEGACY = -D_MACH_I386_THREAD_STATUS_FPSTATE_LEGACY_FIELD_NAMES_ \ - -D_ARCHITECTURE_I386_FPU_FPSTATE_LEGACY_FIELD_NAMES_ - MYINCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \ $(INCPRIVEXT) $(FORHDRS) MYWARNINGS = -MYDEFS = $(LEGACY) +MYDEFS = MYCOMPILEFLAGS = $(WARNINGS) $(MYWARNINGS) $(DEFS) $(MYDEFS) \ $(CPPFLAGS) $(MYINCLUDES) $(CFLAGS) $(MDYNAMICNOPIC) Modified: trunk/files/otool/Makefile.in =================================================================== --- trunk/files/otool/Makefile.in 2006-09-25 17:04:40 UTC (rev 148) +++ trunk/files/otool/Makefile.in 2006-09-25 17:05:21 UTC (rev 149) @@ -32,13 +32,10 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ transform = @program_transform_name@ -LEGACY = -D_MACH_I386_THREAD_STATUS_FPSTATE_LEGACY_FIELD_NAMES_ \ - -D_ARCHITECTURE_I386_FPU_FPSTATE_LEGACY_FIELD_NAMES_ - MYINCLUDES = -I$(builddir) -I$(srcdir) -I$(top_builddir)/include \ -I$(top_srcdir)/include $(INCPRIVEXT) $(FORHDRS) MYWARNINGS = -MYDEFS = $(LEGACY) +MYDEFS = MYLDFLAGS = -L$(top_builddir)/libstuff MYLIBS = -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.macosforge.org/pipermail/odcctools-changes/attachments/20060925/e4bd8034/attachment.html