odcctools-changes

Download

odcctools-changes@lists.macosforge.org

April 2010

1 participants
1 discussions

[159] trunk
by source_changes＠macosforge.org 19 Apr '10

19 Apr '10

Revision: 159 http://trac.macosforge.org/projects/odcctools/changeset/159 Author: peter(a)pogma.com Date: 2010-04-19 09:40:10 -0700 (Mon, 19 Apr 2010) Log Message: ----------- Updated to cctools-758, modified to hopefully build on x86_64 linux - report from Steven Bosscher. Still a work in progress, haven't checked that it works at all. Modified Paths: -------------- trunk/ChangeLog.odcctools trunk/extract.sh trunk/files/as/Makefile.arch.in trunk/files/configure.ac trunk/patches/ar/ar-ranlibpath.diff trunk/patches/as/driver.c trunk/patches/as/messages.diff trunk/patches/ld/uuid-nonsmodule.diff trunk/patches/libstuff/sys_types.diff trunk/patches/misc/libtool-ldpath.diff trunk/patches/misc/libtool-pb.diff trunk/patches/misc/libtool_lipo_transform.diff trunk/patches/misc/redo_prebinding.nogetattrlist.diff trunk/patches/otool/noobjc.diff Added Paths: ----------- trunk/cctools-758.tar.gz trunk/patches/include/mach/machine_armv7.diff trunk/patches/ld/ld-nomach.diff trunk/patches/ld64/cstdio.diff trunk/patches/libstuff/cmd_with_prefix.diff trunk/patches/misc/bootstrap_h.diff trunk/patches/misc/with_prefix.diff Removed Paths: ------------- trunk/cctools-698.1.tar.gz Modified: trunk/ChangeLog.odcctools =================================================================== --- trunk/ChangeLog.odcctools 2009-08-08 20:56:46 UTC (rev 158) +++ trunk/ChangeLog.odcctools 2010-04-19 16:40:10 UTC (rev 159) @@ -1,3 +1,24 @@ +2010-04-19 Peter O'Gorman <peter(a)pogma.com> + + Updated to cctools-758, modified to hopefully build on x86_64 linux + - report from Steven Bosscher. Still a work in progress, haven't + checked that it works at all. + + * files/configure.ac, files/as/Makefile.arch.in, extract.sh, + patches/ld/uuid-nonsmodule.diff, patches/ar/ar-ranlibpath.diff, + patches/as/driver.c, patches/as/messages.diff, + patches/misc/redo_prebinding.nogetattrlist.diff, + patches/misc/libtool-ldpath.diff, + patches/misc/libtool_lipo_transform.diff, + patches/misc/libtool-pb.diff, patches/otool/noobjc.diff, + patches/libstuff/sys_types.diff: Update + * patches/libstuff/cmd_with_prefix.diff, + patches/misc/bootstrap_h.diff, patches/ld/ld-nomach.diff, + patches/include/mach/machine_armv7.diff, patches/ld64/cstdio.diff, + patches/misc/with_prefix.diff, cctools-758.tar.gz : New + * cctools-698.1.tar.gz: Removed + + 2009-07-03 Peter O'Gorman <peter(a)pogma.com> Enable LTO support. This is pretty awesome, can use clang-cc -triple Deleted: trunk/cctools-698.1.tar.gz =================================================================== (Binary files differ) Added: trunk/cctools-758.tar.gz =================================================================== (Binary files differ) Property changes on: trunk/cctools-758.tar.gz ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/extract.sh =================================================================== --- trunk/extract.sh 2009-08-08 20:56:46 UTC (rev 158) +++ trunk/extract.sh 2010-04-19 16:40:10 UTC (rev 159) @@ -3,7 +3,7 @@ set -e CCTOOLSNAME=cctools -CCTOOLSVERS=698.1 +CCTOOLSVERS=758 CCTOOLSDISTFILE=${CCTOOLSNAME}-${CCTOOLSVERS}.tar.gz LD64NAME=ld64 @@ -65,15 +65,17 @@ ld64/Options-config_h.diff ld64/Options-ctype.diff \ ld64/Options-defcross.diff ld64/Options_h_includes.diff \ ld64/Options-stdarg.diff ld64/remove_tmp_math_hack.diff \ -ld64/Thread64_MachOWriterExecutable.diff ld/ld-pb.diff ld-sysroot.diff \ +ld64/Thread64_MachOWriterExecutable.diff ld-sysroot.diff \ ld/uuid-nonsmodule.diff libstuff/default_arch.diff \ libstuff/macosx_deployment_target_default_105.diff \ libstuff/map_64bit_arches.diff libstuff/sys_types.diff \ misc/libtool-ldpath.diff misc/libtool-pb.diff misc/ranlibname.diff \ misc/redo_prebinding.nogetattrlist.diff \ misc/redo_prebinding.nomalloc.diff misc/libtool_lipo_transform.diff \ -otool/nolibmstub.diff otool/noobjc.diff force_load.diff \ -ld64/LTOReader-setasmpath.diff" +otool/nolibmstub.diff otool/noobjc.diff \ +ld64/LTOReader-setasmpath.diff include/mach/machine_armv7.diff \ +ld/ld-nomach.diff libstuff/cmd_with_prefix.diff ld64/cstdio.diff \ +misc/with_prefix.diff misc/bootstrap_h.diff" ADDEDFILESDIR=${TOPSRCDIR}/files Modified: trunk/files/as/Makefile.arch.in =================================================================== --- trunk/files/as/Makefile.arch.in 2009-08-08 20:56:46 UTC (rev 158) +++ trunk/files/as/Makefile.arch.in 2010-04-19 16:40:10 UTC (rev 159) @@ -46,7 +46,7 @@ CFILES = app.c as.c atof-generic.c atof-ieee.c expr.c fixes.c flonum-const.c \ flonum-copy.c flonum-mult.c frags.c hash.c hex-value.c input-file.c \ input-scrub.c layout.c messages.c obstack.c read.c sections.c \ - symbols.c write_object.c xmalloc.c $(CFILES_$(ARCH)) + symbols.c write_object.c xmalloc.c dwarf2dbg.c $(CFILES_$(ARCH)) OBJS = $(CFILES:.c=.o) .c.o: Modified: trunk/files/configure.ac =================================================================== --- trunk/files/configure.ac 2009-08-08 20:56:46 UTC (rev 158) +++ trunk/files/configure.ac 2010-04-19 16:40:10 UTC (rev 159) @@ -1,4 +1,4 @@ -AC_INIT([odcctools], [698.1od9], [peter(a)pogma.com] +AC_INIT([odcctools], [758.1od1], [peter(a)pogma.com] AC_PREREQ([2.57]) AC_REVISION([$Revision: 1.37 $]) @@ -283,11 +283,11 @@ ] ) -AC_CHECK_FUNCS([strmode qsort_r qsort getattrlist NSIsSymbolNameDefined strlcpy]) +AC_CHECK_FUNCS([strmode qsort_r qsort getattrlist NSIsSymbolNameDefined strlcpy strlcat]) AC_CHECK_HEADERS([CommonCrypto/CommonDigest.h],[],[SSL_LIBS=-lssl]) AC_SUBST(SSL_LIBS) -AC_CHECK_DECLS([getc_unlocked, strlcpy]) +AC_CHECK_DECLS([getc_unlocked, strlcpy, strlcat]) AH_VERBATIM([HAVE_DECL_GETC_UNLOCKED_REPLACEMENT], [/* For systems that don't have getc_unlocked, use getc */ #if !HAVE_DECL_GETC_UNLOCKED @@ -296,13 +296,22 @@ AH_VERBATIM([X_DECLS], [/* Declare functions that are missing declarations */ +#if !HAVE_DECL_STRLCPY || ! HAVE_DECL_STRLCAT +#include <sys/types.h> +#endif #if !HAVE_DECL_STRLCPY -#include <sys/types.h> #ifdef __cplusplus extern "C" #endif size_t strlcpy(char *dst, const char *src, size_t size); -#endif]) +#endif +#if !HAVE_DECL_STRLCAT +#ifdef __cplusplus +extern "C" +#endif +size_t strlcat(char *dst, const char *src, size_t size); +#endif +]) case $host_os in darwin*) @@ -316,7 +325,13 @@ ;; esac -COMPONENTS="ar as include libstuff libmacho ld ld64 man misc otool" +AC_CHECK_SIZEOF([long]) +if test $ac_cv_sizeof_long >=8; then + LD_CLASSIC= +else + LD_CLASSIC=ld +fi +COMPONENTS="ar as include libstuff libmacho ${LD_CLASSIC} ld64 man misc otool" AC_SUBST([COMPONENTS], [$COMPONENTS]) AC_CHECK_FUNC([uuid_generate_random],[], Modified: trunk/patches/ar/ar-ranlibpath.diff =================================================================== --- trunk/patches/ar/ar-ranlibpath.diff 2009-08-08 20:56:46 UTC (rev 158) +++ trunk/patches/ar/ar-ranlibpath.diff 2010-04-19 16:40:10 UTC (rev 159) @@ -1,5 +1,5 @@ ---- ./ar.c.orig 2006-04-28 18:41:59.000000000 -0500 -+++ ./ar.c 2009-06-11 12:30:42.000000000 -0500 +--- ar.c.orig 2010-04-18 16:45:35.000000000 -0500 ++++ ar.c 2010-04-18 16:46:58.000000000 -0500 @@ -84,7 +84,7 @@ #include "extern.h" #include "stuff/execute.h" @@ -13,7 +13,7 @@ if(run_ranlib){ /* run ranlib -f or -q on the archive */ reset_execute_list(); -- add_execute_list("ranlib"); +- add_execute_list_with_prefix("ranlib"); + add_execute_list(makestr(BINDIR, "/", RANLIBPROG, NULL)); if(options & AR_S) add_execute_list("-f"); Modified: trunk/patches/as/driver.c =================================================================== --- trunk/patches/as/driver.c 2009-08-08 20:56:46 UTC (rev 158) +++ trunk/patches/as/driver.c 2010-04-19 16:40:10 UTC (rev 159) @@ -1,5 +1,5 @@ ---- driver.c.orig 2009-06-11 12:41:08.000000000 -0500 -+++ driver.c 2009-06-11 12:44:22.000000000 -0500 +--- driver.c.orig 2009-09-21 22:03:08.000000000 -0500 ++++ driver.c 2009-09-21 22:04:44.000000000 -0500 @@ -27,26 +27,13 @@ char **argv, char **envp) @@ -22,11 +22,11 @@ const char *AS = "/as"; int i; - unsigned long count, verbose; + uint32_t count, verbose; char *p, c, *arch_name, *as, *as_local; - char *prefix, buf[MAXPATHLEN], resolved_name[PATH_MAX]; + char buf[MAXPATHLEN], resolved_name[PATH_MAX]; - uint32_t bufsize; + unsigned long bufsize; struct arch_flag arch_flag; const struct arch_flag *arch_flags, *family_arch_flag; @@ -57,17 +44,6 @@ @@ -47,7 +47,7 @@ /* * Process the assembler flags exactly like the assembler would (except * let the assembler complain about multiple flags, bad combinations of -@@ -167,7 +143,7 @@ +@@ -176,7 +152,7 @@ } } @@ -56,7 +56,7 @@ /* * If this assembler exist try to run it else print an error message. -@@ -179,38 +155,19 @@ +@@ -188,38 +164,19 @@ else exit(1); } Modified: trunk/patches/as/messages.diff =================================================================== --- trunk/patches/as/messages.diff 2009-08-08 20:56:46 UTC (rev 158) +++ trunk/patches/as/messages.diff 2010-04-19 16:40:10 UTC (rev 159) @@ -1,14 +1,6 @@ ---- ./messages.c.orig 2008-02-04 16:27:50.000000000 -0600 -+++ ./messages.c 2009-06-11 12:30:54.000000000 -0500 -@@ -22,7 +22,6 @@ - #ifdef OLD_PROJECTBUILDER_INTERFACE - #include <streams/streams.h> - #endif --#include "make.h" - #include <stdlib.h> - #include <string.h> - #include <mach/mach.h> -@@ -30,7 +29,6 @@ +--- messages.c.orig 2009-09-21 22:03:08.000000000 -0500 ++++ messages.c 2009-09-21 22:05:21.000000000 -0500 +@@ -26,7 +26,6 @@ #if defined(__OPENSTEP__) || defined(__GONZO_BUNSEN_BEAKER__) #include <servers/netname.h> #else Added: trunk/patches/include/mach/machine_armv7.diff =================================================================== --- trunk/patches/include/mach/machine_armv7.diff (rev 0) +++ trunk/patches/include/mach/machine_armv7.diff 2010-04-19 16:40:10 UTC (rev 159) @@ -0,0 +1,10 @@ +--- machine.h.orig 2009-09-21 22:50:45.000000000 -0500 ++++ machine.h 2009-09-21 22:51:23.000000000 -0500 +@@ -265,6 +265,7 @@ + #define CPU_SUBTYPE_ARM_V6 ((cpu_subtype_t) 6) + #define CPU_SUBTYPE_ARM_V5TEJ ((cpu_subtype_t) 7) + #define CPU_SUBTYPE_ARM_XSCALE ((cpu_subtype_t) 8) ++#define CPU_SUBTYPE_ARM_V7 ((cpu_subtype_t) 9) + + /* + * MC88000 subtypes Added: trunk/patches/ld/ld-nomach.diff =================================================================== --- trunk/patches/ld/ld-nomach.diff (rev 0) +++ trunk/patches/ld/ld-nomach.diff 2010-04-19 16:40:10 UTC (rev 159) @@ -0,0 +1,14 @@ +--- ld.c.orig 2009-09-21 22:53:53.000000000 -0500 ++++ ld.c 2009-09-21 22:54:21.000000000 -0500 +@@ -56,11 +56,6 @@ + #include "stuff/symbol_list.h" + #endif + #include <mach/mach_init.h> +-#if defined(__OPENSTEP__) || defined(__GONZO_BUNSEN_BEAKER__) +-#include <servers/netname.h> +-#else +-#include <servers/bootstrap.h> +-#endif + #else /* defined(KLD) && defined(__STATIC__) */ + #include <mach/mach.h> + #include <mach/kern_return.h> Modified: trunk/patches/ld/uuid-nonsmodule.diff =================================================================== --- trunk/patches/ld/uuid-nonsmodule.diff 2009-08-08 20:56:46 UTC (rev 158) +++ trunk/patches/ld/uuid-nonsmodule.diff 2010-04-19 16:40:10 UTC (rev 159) @@ -1,26 +1,24 @@ ---- uuid.c.orig 2006-03-16 08:53:13.000000000 -0800 -+++ uuid.c 2006-03-16 08:55:19.000000000 -0800 -@@ -23,7 +23,7 @@ - #if defined(__MWERKS__) && !defined(__private_extern__) - #define __private_extern__ __declspec(private_extern) - #endif -- -+#include <config.h> - #include <sys/types.h> +--- uuid.c.orig 2009-09-21 22:10:40.000000000 -0500 ++++ uuid.c 2009-09-21 22:19:17.000000000 -0500 +@@ -26,11 +26,7 @@ + + #include <stdint.h> #include <string.h> - #include <stdarg.h> -@@ -58,10 +58,14 @@ - * dynamically lookup uuid_generate_random() and if it is defined we - * call it indirectly. - */ -+#if HAVE_NSISSYMBOLNAMEDEFINED - if(NSIsSymbolNameDefined("_uuid_generate_random")){ - nssymbol = (void *)NSLookupAndBindSymbol("_uuid_generate_random"); - uuid_func = NSAddressOfSymbol(nssymbol); - uuid_func(uuid); -+#else -+ if(0){ -+#endif - } - /* - * Since we don't have uuid_generate() just read bytes from /dev/urandom +-#if !(defined(KLD) && defined(__STATIC__)) + #include <uuid/uuid.h> +-#else +-#include <mach-o/loader.h> +-#endif /* !(defined(KLD) && defined(__STATIC__)) */ + + /* + * uuid() is called to set the uuid[] bytes for the uuid load command. +@@ -40,9 +36,5 @@ + uuid( + uint8_t *uuid) + { +-#if defined(KLD) && defined(__STATIC__) +- memset(uuid, '\0', sizeof(struct uuid_command)); +-#else + uuid_generate_random((void *)uuid); +-#endif + } Added: trunk/patches/ld64/cstdio.diff =================================================================== --- trunk/patches/ld64/cstdio.diff (rev 0) +++ trunk/patches/ld64/cstdio.diff 2010-04-19 16:40:10 UTC (rev 159) @@ -0,0 +1,20 @@ +--- src/ld.cpp.orig 2010-04-19 10:58:59.000000000 -0500 ++++ src/ld.cpp 2010-04-19 10:59:29.000000000 -0500 +@@ -36,6 +36,7 @@ + #include <mach/mach_init.h> + #include <mach/mach_host.h> + #include <dlfcn.h> ++#include <cstdio> + + #include <string> + #include <map> +--- src/Options.cpp.orig 2010-04-19 10:59:12.000000000 -0500 ++++ src/Options.cpp 2010-04-19 10:59:42.000000000 -0500 +@@ -29,6 +29,7 @@ + #include <fcntl.h> + #include <ctype.h> + #include <vector> ++#include <cstdio> + + #include "config.h" + #include "Options.h" Added: trunk/patches/libstuff/cmd_with_prefix.diff =================================================================== --- trunk/patches/libstuff/cmd_with_prefix.diff (rev 0) +++ trunk/patches/libstuff/cmd_with_prefix.diff 2010-04-19 16:40:10 UTC (rev 159) @@ -0,0 +1,19 @@ +--- execute.c.orig 2010-04-19 09:51:03.000000000 -0500 ++++ execute.c 2010-04-19 09:51:25.000000000 -0500 +@@ -129,6 +129,7 @@ + * This routine is passed a string to be added to the list of strings for + * command line arguments and is then prefixed with the path of the executable. + */ ++#if 0 + __private_extern__ + void + add_execute_list_with_prefix( +@@ -168,7 +169,7 @@ + + return(makestr(prefix, str, NULL)); + } +- ++#endif + /* + * This routine reset the list of strings of command line arguments so that + * an new command line argument list can be built. Modified: trunk/patches/libstuff/sys_types.diff =================================================================== --- trunk/patches/libstuff/sys_types.diff 2009-08-08 20:56:46 UTC (rev 158) +++ trunk/patches/libstuff/sys_types.diff 2010-04-19 16:40:10 UTC (rev 159) @@ -9,15 +9,13 @@ #include <mach-o/loader.h> #include <mach/m68k/thread_status.h> #undef MACHINE_THREAD_STATE /* need to undef these to avoid warnings */ ---- ofile_error.c.orig 2009-06-11 21:10:23.000000000 -0500 -+++ ofile_error.c 2009-06-11 21:11:00.000000000 -0500 -@@ -20,6 +20,9 @@ - * - * @APPLE_LICENSE_HEADER_END@ - */ -+ +--- ofile_error.c.orig 2009-09-21 22:10:31.000000000 -0500 ++++ ofile_error.c 2009-09-21 22:20:43.000000000 -0500 +@@ -24,6 +24,7 @@ + #define __darwin_i386_float_state i386_float_state + #define __darwin_i386_thread_state i386_thread_state + +#include <sys/types.h> -+ #include <stdarg.h> #include "stuff/ofile.h" #include "stuff/print.h" Added: trunk/patches/misc/bootstrap_h.diff =================================================================== --- trunk/patches/misc/bootstrap_h.diff (rev 0) +++ trunk/patches/misc/bootstrap_h.diff 2010-04-19 16:40:10 UTC (rev 159) @@ -0,0 +1,15 @@ +--- libtool.c.orig 2010-04-19 11:13:30.000000000 -0500 ++++ libtool.c 2010-04-19 11:13:40.000000000 -0500 +@@ -53,12 +53,6 @@ + #endif /* LTO_SUPPORT */ + + #include <mach/mach_init.h> +-#if defined(__OPENSTEP__) || defined(__GONZO_BUNSEN_BEAKER__) +-#include <servers/netname.h> +-#else +-#include <servers/bootstrap.h> +-#endif +- + /* + * This is used internally to build the table of contents. + */ Modified: trunk/patches/misc/libtool-ldpath.diff =================================================================== --- trunk/patches/misc/libtool-ldpath.diff 2009-08-08 20:56:46 UTC (rev 158) +++ trunk/patches/misc/libtool-ldpath.diff 2010-04-19 16:40:10 UTC (rev 159) @@ -1,10 +1,10 @@ ---- ./libtool.c.orig 2009-06-11 12:30:41.000000000 -0500 -+++ ./libtool.c 2009-06-11 12:30:41.000000000 -0500 -@@ -2910,7 +2910,7 @@ +--- libtool.c.orig 2010-04-18 16:47:39.000000000 -0500 ++++ libtool.c 2010-04-18 16:48:39.000000000 -0500 +@@ -2920,7 +2920,7 @@ */ for(i = 0; i < narchs || (i == 0 && narchs == 0); i++){ reset_execute_list(); -- add_execute_list("ld"); +- add_execute_list_with_prefix("ld"); + add_execute_list(makestr(BINDIR, "/", LDPROG, NULL)); if(narchs != 0 && cmd_flags.arch_only_flag.name == NULL) add_execute_list("-arch_multiple"); Modified: trunk/patches/misc/libtool-pb.diff =================================================================== --- trunk/patches/misc/libtool-pb.diff 2009-08-08 20:56:46 UTC (rev 158) +++ trunk/patches/misc/libtool-pb.diff 2010-04-19 16:40:10 UTC (rev 159) @@ -1,31 +0,0 @@ ---- ./libtool.c.orig 2009-06-11 12:30:41.000000000 -0500 -+++ ./libtool.c 2009-06-11 12:30:58.000000000 -0500 -@@ -51,12 +51,10 @@ - #include "stuff/lto.h" - #endif /* LTO_SUPPORT */ - --#include "make.h" - #include <mach/mach_init.h> - #if defined(__OPENSTEP__) || defined(__GONZO_BUNSEN_BEAKER__) - #include <servers/netname.h> - #else --#include <servers/bootstrap.h> - #endif - - /* used by error routines as the name of the program */ -@@ -2828,6 +2826,7 @@ - char *arch_name, - char *fileName) - { -+#ifdef OLD_PROJECTBUILDER_INTERFACE - char message_buf[1024]; - mach_port_t ProjectBuilder_port; - char *portName; -@@ -2863,6 +2862,7 @@ - NULL, 0, - 0, - message_buf, strlen(message_buf) + 1); -+#endif - } - - /* Modified: trunk/patches/misc/libtool_lipo_transform.diff =================================================================== --- trunk/patches/misc/libtool_lipo_transform.diff 2009-08-08 20:56:46 UTC (rev 158) +++ trunk/patches/misc/libtool_lipo_transform.diff 2010-04-19 16:40:10 UTC (rev 159) @@ -1,10 +1,10 @@ ---- libtool.c.orig 2009-06-14 11:21:58.000000000 -0500 -+++ libtool.c 2009-06-14 11:24:54.000000000 -0500 -@@ -3017,7 +3017,7 @@ +--- libtool.c.orig 2010-04-18 16:49:05.000000000 -0500 ++++ libtool.c 2010-04-18 16:49:33.000000000 -0500 +@@ -3011,7 +3011,7 @@ + */ if(narchs > 1){ - tellProjectBuilder("Combining into %s", "", cmd_flags.output); reset_execute_list(); -- add_execute_list("lipo"); +- add_execute_list_with_prefix("lipo"); + add_execute_list(makestr(BINDIR, "/", LIPOPROG, NULL)); add_execute_list("-create"); add_execute_list("-output"); Modified: trunk/patches/misc/redo_prebinding.nogetattrlist.diff =================================================================== --- trunk/patches/misc/redo_prebinding.nogetattrlist.diff 2009-08-08 20:56:46 UTC (rev 158) +++ trunk/patches/misc/redo_prebinding.nogetattrlist.diff 2010-04-19 16:40:10 UTC (rev 159) @@ -1,5 +1,5 @@ ---- ./redo_prebinding.c.orig 2006-09-09 13:49:18.000000000 -0700 -+++ ./redo_prebinding.c 2006-09-09 13:50:19.000000000 -0700 +--- redo_prebinding.c.orig 2009-09-21 22:10:31.000000000 -0500 ++++ redo_prebinding.c 2009-09-21 22:28:01.000000000 -0500 @@ -82,7 +82,7 @@ */ #include <mach-o/redo_prebinding.h> @@ -9,7 +9,7 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -@@ -9263,7 +9263,7 @@ +@@ -9774,7 +9774,7 @@ errors++; } #endif /* defined(LIBRARY_API) */ @@ -18,20 +18,17 @@ #include <sys/attr.h> /* * Structure defining what's returned from getattrlist. It returns all the -@@ -9337,7 +9337,15 @@ +@@ -9859,3 +9859,13 @@ return(FALSE); } -- +#else +static +enum bool +has_resource_fork( -+ char *filename) ++ char *filename) +{ + return FALSE; +} +#endif - - static unsigned long find__dyld_section_addr(const struct mach_header* mh) - { ++ Added: trunk/patches/misc/with_prefix.diff =================================================================== --- trunk/patches/misc/with_prefix.diff (rev 0) +++ trunk/patches/misc/with_prefix.diff 2010-04-19 16:40:10 UTC (rev 159) @@ -0,0 +1,33 @@ +--- redo_prebinding.c.orig 2010-04-19 11:02:01.000000000 -0500 ++++ redo_prebinding.c 2010-04-19 11:02:17.000000000 -0500 +@@ -937,7 +937,7 @@ + /* + * Run objcunique on the output. + */ +- objcunique = cmd_with_prefix("objcunique"); ++ objcunique = "/usr/bin/objcunique"; + if(stat(objcunique, &stat_buf) != -1){ + reset_execute_list(); + add_execute_list(objcunique); +--- strip.c.orig 2010-04-19 11:02:58.000000000 -0500 ++++ strip.c 2010-04-19 11:03:22.000000000 -0500 +@@ -3796,7 +3796,7 @@ + * Create the ld -r command line and execute it. + */ + reset_execute_list(); +- add_execute_list_with_prefix("ld"); ++ add_execute_list(BINDIR "/" LDPROG); + add_execute_list("-keep_private_externs"); + add_execute_list("-r"); + if(Sflag) +--- libtool.c.orig 2010-04-19 11:03:54.000000000 -0500 ++++ libtool.c 2010-04-19 11:04:28.000000000 -0500 +@@ -3036,7 +3036,7 @@ + if(cmd_flags.prebinding == TRUE){ + if(stat("/usr/bin/objcunique", &stat_buf) != -1){ + reset_execute_list(); +- add_execute_list_with_prefix("objcunique"); ++ add_execute_list("/usr/bin/objcunique"); + add_execute_list(cmd_flags.output); + add_execute_list("-prebind"); + for(j = 0; j < cmd_flags.nLdirs; j++) Modified: trunk/patches/otool/noobjc.diff =================================================================== --- trunk/patches/otool/noobjc.diff 2009-08-08 20:56:46 UTC (rev 158) +++ trunk/patches/otool/noobjc.diff 2010-04-19 16:40:10 UTC (rev 159) @@ -1,5 +1,5 @@ ---- ./main.c.orig 2009-06-11 12:30:40.000000000 -0500 -+++ ./main.c 2009-06-11 12:30:52.000000000 -0500 +--- main.c.orig 2009-09-21 22:28:32.000000000 -0500 ++++ main.c 2009-09-21 22:29:57.000000000 -0500 @@ -44,6 +44,10 @@ #include "sparc_disasm.h" #include "arm_disasm.h" @@ -11,7 +11,7 @@ /* Name of this program for error messages (argv[0]) */ char *progname = NULL; -@@ -1138,14 +1142,19 @@ +@@ -1141,14 +1145,19 @@ S_ATTR_SOME_INSTRUCTIONS){ if(strcmp(segname, SEG_OBJC) == 0 && strcmp(sectname, "__protocol") == 0 && vflag == TRUE){ @@ -31,7 +31,7 @@ if(mh_cputype & CPU_ARCH_ABI64) print_objc_string_object_section_64(sectname, ofile->load_commands, mh_ncmds, mh_sizeofcmds, -@@ -1158,12 +1167,19 @@ +@@ -1161,12 +1170,19 @@ ofile->load_commands, mh_ncmds, mh_sizeofcmds, ofile->object_byte_sex, ofile->object_addr, ofile->object_size, vflag); @@ -51,7 +51,7 @@ } #ifdef EFI_SUPPORT else if(strcmp(segname, "__RELOC") == 0 && -@@ -1295,12 +1311,16 @@ +@@ -1298,12 +1314,16 @@ swap_relocation_info(loc_relocs, nloc_relocs, get_host_byte_sex()); } @@ -61,14 +61,14 @@ ofile->object_addr, ofile->object_size, symbols64, nsymbols, strings, strings_size, sorted_symbols, nsorted_symbols, ext_relocs, next_relocs, - loc_relocs, nloc_relocs, vflag); + loc_relocs, nloc_relocs, vflag, Vflag); +#else + printf("Objective-C not supported\n"); +#endif } else if(mh_cputype == CPU_TYPE_ARM){ get_linked_reloc_info(ofile->load_commands, mh_ncmds, -@@ -1332,18 +1352,26 @@ +@@ -1335,18 +1355,26 @@ swap_relocation_info(loc_relocs, nloc_relocs, get_host_byte_sex()); }

1 0