-Only in include: 2.0Compat
+Only in include/: 2.0Compat
Only in include/: CVS
-diff -ubr include/Makefile include/Makefile
+diff -rub include/Makefile include/Makefile
--- include/Makefile Fri Sep 6 18:27:31 2002
+++ include/Makefile Mon Aug 25 12:12:28 2003
@@ -11,7 +11,7 @@
Only in include/architecture: CVS
Only in include/architecture/i386: CVS
-diff -ubr include/architecture/i386/fpu.h include/architecture/i386/fpu.h
+diff -rub include/architecture/i386/fpu.h include/architecture/i386/fpu.h
--- include/architecture/i386/fpu.h Tue Apr 30 00:37:18 2002
+++ include/architecture/i386/fpu.h Mon Aug 25 12:56:22 2003
@@ -121,7 +121,7 @@
/*
* Floating point 'environment'
-diff -ubr include/architecture/i386/frame.h include/architecture/i386/frame.h
+diff -rub include/architecture/i386/frame.h include/architecture/i386/frame.h
--- include/architecture/i386/frame.h Tue Apr 30 00:37:18 2002
+++ include/architecture/i386/frame.h Mon Aug 25 12:56:22 2003
@@ -63,7 +63,7 @@
/*
* The actual hardware exception frame
Only in include/architecture/m88k: CVS
-diff -ubr include/architecture/m88k/fp_regs.h include/architecture/m88k/fp_regs.h
+diff -rub include/architecture/m88k/fp_regs.h include/architecture/m88k/fp_regs.h
--- include/architecture/m88k/fp_regs.h Tue Jan 14 23:35:23 2003
+++ include/architecture/m88k/fp_regs.h Mon Aug 25 12:56:22 2003
@@ -37,7 +37,7 @@
/*
* m88k_xrf_t -- data types that MAY be in extended register file
-diff -ubr include/architecture/m88k/reg_help.h include/architecture/m88k/reg_help.h
+diff -rub include/architecture/m88k/reg_help.h include/architecture/m88k/reg_help.h
--- include/architecture/m88k/reg_help.h Tue Jan 14 23:35:23 2003
+++ include/architecture/m88k/reg_help.h Mon Aug 25 12:56:22 2003
@@ -37,7 +37,7 @@
Only in include/architecture/nrw: CVS
Only in include/architecture: ppc
Only in include/architecture/sparc: CVS
-Only in include: cbt
+Only in include/: cbt
Only in include/gnu: CVS
-Only in include: gpul_notes
+Only in include/: gpul_notes
Only in include/mach: CVS
Only in include/mach/hppa: CVS
Only in include/mach: i386
Only in include/mach/i860: CVS
Only in include/mach/m68k: CVS
Only in include/mach/m88k: CVS
-diff -ubr include/mach/m88k/thread_status.h include/mach/m88k/thread_status.h
+diff -rub include/mach/m88k/thread_status.h include/mach/m88k/thread_status.h
--- include/mach/m88k/thread_status.h Tue Jan 14 23:35:24 2003
+++ include/mach/m88k/thread_status.h Mon Aug 25 12:56:22 2003
@@ -45,8 +45,8 @@
/**************************************************************************
* Data Typedefs used by thread_getstatus() and thread_setstatus() *
Only in include/mach: m98k
-diff -ubr include/mach/machine.h include/mach/machine.h
+diff -rub include/mach/machine.h include/mach/machine.h
--- include/mach/machine.h Tue Jan 14 23:35:24 2003
+++ include/mach/machine.h Mon Aug 25 12:56:22 2003
@@ -81,8 +81,8 @@
Only in include/mach/ppc: CVS
Only in include/mach/sparc: CVS
Only in include/mach-o: CVS
-diff -ubr include/mach-o/dyld.h include/mach-o/dyld.h
+diff -rub include/mach-o/dyld.h include/mach-o/dyld.h
--- include/mach-o/dyld.h Fri Sep 6 18:27:36 2002
+++ include/mach-o/dyld.h Mon Aug 25 12:56:22 2003
@@ -48,7 +48,7 @@
void);
extern void _dyld_lookup_and_bind(
-diff -ubr include/mach-o/dyld_gdb.h include/mach-o/dyld_gdb.h
+diff -rub include/mach-o/dyld_gdb.h include/mach-o/dyld_gdb.h
--- include/mach-o/dyld_gdb.h Tue Apr 30 00:37:19 2002
+++ include/mach-o/dyld_gdb.h Mon Aug 25 12:56:22 2003
@@ -9,7 +9,7 @@
/* object_images is the global object_images structure */
Only in include/mach-o/hppa: CVS
-diff -ubr include/mach-o/hppa/swap.h include/mach-o/hppa/swap.h
+diff -rub include/mach-o/hppa/swap.h include/mach-o/hppa/swap.h
--- include/mach-o/hppa/swap.h Tue Apr 30 00:37:19 2002
+++ include/mach-o/hppa/swap.h Mon Aug 25 12:56:22 2003
@@ -21,8 +21,8 @@
struct hp_pa_integer_thread_state *regs,
Only in include/mach-o/i386: CVS
Only in include/mach-o/i860: CVS
-diff -ubr include/mach-o/i860/swap.h include/mach-o/i860/swap.h
+diff -rub include/mach-o/i860/swap.h include/mach-o/i860/swap.h
--- include/mach-o/i860/swap.h Tue Apr 30 00:37:19 2002
+++ include/mach-o/i860/swap.h Mon Aug 25 12:56:22 2003
@@ -21,8 +21,8 @@
extern void swap_i860_thread_state_regs(
struct i860_thread_state_regs *cpu,
-diff -ubr include/mach-o/kld.h include/mach-o/kld.h
+diff -rub include/mach-o/kld.h include/mach-o/kld.h
--- include/mach-o/kld.h Tue Apr 30 00:37:19 2002
+++ include/mach-o/kld.h Mon Aug 25 12:56:22 2003
@@ -51,11 +51,6 @@
+ unsigned long link_options);
#endif /* _MACHO_KLD_H_ */
-diff -ubr include/mach-o/loader.h include/mach-o/loader.h
+diff -rub include/mach-o/loader.h include/mach-o/loader.h
--- include/mach-o/loader.h Tue Jan 14 23:35:24 2003
+++ include/mach-o/loader.h Mon Aug 25 12:56:22 2003
@@ -92,9 +92,11 @@
* undefined external symbols indicates the external references.
*/
Only in include/mach-o/m68k: CVS
-diff -ubr include/mach-o/m68k/swap.h include/mach-o/m68k/swap.h
+diff -rub include/mach-o/m68k/swap.h include/mach-o/m68k/swap.h
--- include/mach-o/m68k/swap.h Tue Apr 30 00:37:19 2002
+++ include/mach-o/m68k/swap.h Mon Aug 25 12:56:22 2003
@@ -21,8 +21,8 @@
extern void swap_m68k_thread_state_regs(
struct m68k_thread_state_regs *cpu,
Only in include/mach-o/m88k: CVS
-diff -ubr include/mach-o/m88k/swap.h include/mach-o/m88k/swap.h
+diff -rub include/mach-o/m88k/swap.h include/mach-o/m88k/swap.h
--- include/mach-o/m88k/swap.h Tue Apr 30 00:37:19 2002
+++ include/mach-o/m88k/swap.h Mon Aug 25 12:56:22 2003
@@ -21,8 +21,8 @@
extern void swap_m88k_thread_state_grf_t(
m88k_thread_state_grf_t *cpu,
-diff -ubr include/mach-o/nlist.h include/mach-o/nlist.h
+diff -rub include/mach-o/nlist.h include/mach-o/nlist.h
--- include/mach-o/nlist.h Tue Jan 14 23:35:24 2003
+++ include/mach-o/nlist.h Mon Aug 25 12:56:22 2003
@@ -198,15 +198,24 @@
/*
Only in include/mach-o/ppc: CVS
-diff -ubr include/mach-o/ppc/reloc.h include/mach-o/ppc/reloc.h
+diff -rub include/mach-o/ppc/reloc.h include/mach-o/ppc/reloc.h
--- include/mach-o/ppc/reloc.h Tue Apr 30 00:37:19 2002
+++ include/mach-o/ppc/reloc.h Mon Aug 25 12:56:22 2003
@@ -27,7 +27,14 @@
+ PPC_RELOC_JBSR,
+ PPC_RELOC_LO14_SECTDIFF
};
-diff -ubr include/mach-o/rld.h include/mach-o/rld.h
+diff -rub include/mach-o/rld.h include/mach-o/rld.h
--- include/mach-o/rld.h Fri Sep 6 18:27:39 2002
+++ include/mach-o/rld.h Mon Aug 25 12:56:22 2003
@@ -28,7 +28,7 @@
extern long rld_load(
Only in include/mach-o/sparc: CVS
-diff -ubr include/mach-o/sparc/swap.h include/mach-o/sparc/swap.h
+diff -rub include/mach-o/sparc/swap.h include/mach-o/sparc/swap.h
--- include/mach-o/sparc/swap.h Tue Apr 30 00:37:19 2002
+++ include/mach-o/sparc/swap.h Mon Aug 25 12:56:22 2003
@@ -21,8 +21,8 @@
void swap_sparc_thread_state_regs(
struct sparc_thread_state_regs *cpu,
-diff -ubr include/mach-o/stab.h include/mach-o/stab.h
+diff -rub include/mach-o/stab.h include/mach-o/stab.h
--- include/mach-o/stab.h Tue Jan 14 23:35:24 2003
+++ include/mach-o/stab.h Mon Aug 25 12:56:22 2003
@@ -91,6 +91,7 @@
#define N_RSYM 0x40 /* register sym: name,,NO_SECT,type,register */
#define N_SLINE 0x44 /* src line: 0,,n_sect,linenumber,address */
#define N_ENSYM 0x4e /* end nsect sym: 0,,n_sect,0,address */
-diff -ubr include/notes include/notes
+diff -rub include/notes include/notes
--- include/notes Tue Jan 14 23:35:23 2003
+++ include/notes Mon Aug 25 12:12:28 2003
@@ -1,3 +1,96 @@
- Added the VEO cputype and its subtypes to <mach/machine.h>. Radar bug
#3068161.
Only in include/standalone: CVS
-diff -ubr include/standalone/libsa.h include/standalone/libsa.h
+diff -rub include/standalone/libsa.h include/standalone/libsa.h
--- include/standalone/libsa.h Tue Apr 30 00:37:19 2002
+++ include/standalone/libsa.h Mon Aug 25 12:56:22 2003
@@ -23,13 +23,13 @@
#ifndef bcopy
#ifdef __OPENSTEP__
Only in include/stuff: CVS
-diff -ubr include/stuff/allocate.h include/stuff/allocate.h
+diff -rub include/stuff/allocate.h include/stuff/allocate.h
--- include/stuff/allocate.h Tue Apr 30 00:37:19 2002
+++ include/stuff/allocate.h Mon Aug 25 13:08:44 2003
@@ -21,8 +21,10 @@
#endif
/* defined in allocate.c */
-diff -ubr include/stuff/arch.h include/stuff/arch.h
+diff -rub include/stuff/arch.h include/stuff/arch.h
--- include/stuff/arch.h Fri Sep 6 18:27:41 2002
+++ include/stuff/arch.h Mon Aug 25 13:10:15 2003
@@ -24,15 +24,17 @@
/*
* The structure describing an architecture flag with the string of the flag
-diff -ubr include/stuff/best_arch.h include/stuff/best_arch.h
+diff -rub include/stuff/best_arch.h include/stuff/best_arch.h
--- include/stuff/best_arch.h Tue Apr 30 00:37:19 2002
+++ include/stuff/best_arch.h Mon Aug 25 13:10:13 2003
@@ -21,8 +21,10 @@
#endif
#include <mach/machine.h>
-diff -ubr include/stuff/bool.h include/stuff/bool.h
+diff -rub include/stuff/bool.h include/stuff/bool.h
--- include/stuff/bool.h Tue Apr 30 00:37:19 2002
+++ include/stuff/bool.h Mon Aug 25 12:56:22 2003
@@ -25,6 +25,9 @@
#define DYLD_BOOL bool
#undef FALSE
-diff -ubr include/stuff/breakout.h include/stuff/breakout.h
+diff -rub include/stuff/breakout.h include/stuff/breakout.h
--- include/stuff/breakout.h Fri Sep 6 18:27:42 2002
+++ include/stuff/breakout.h Mon Aug 25 13:10:12 2003
@@ -21,11 +21,13 @@
/*
* The input files are broken out in to their object files and then placed in
-diff -ubr include/stuff/bytesex.h include/stuff/bytesex.h
+diff -rub include/stuff/bytesex.h include/stuff/bytesex.h
--- include/stuff/bytesex.h Fri Sep 6 18:27:42 2002
+++ include/stuff/bytesex.h Mon Aug 25 13:10:10 2003
@@ -25,23 +25,25 @@
enum byte_sex {
UNKNOWN_BYTE_SEX,
-diff -ubr include/stuff/errors.h include/stuff/errors.h
+diff -rub include/stuff/errors.h include/stuff/errors.h
--- include/stuff/errors.h Tue Apr 30 00:37:19 2002
+++ include/stuff/errors.h Mon Aug 25 13:09:00 2003
@@ -21,11 +21,13 @@
/* user defined (imported) */
__private_extern__ char *progname;
-diff -ubr include/stuff/execute.h include/stuff/execute.h
+diff -rub include/stuff/execute.h include/stuff/execute.h
--- include/stuff/execute.h Tue Apr 30 00:37:19 2002
+++ include/stuff/execute.h Mon Aug 25 13:10:04 2003
@@ -21,8 +21,10 @@
#endif
/*
-diff -ubr include/stuff/hash_string.h include/stuff/hash_string.h
+diff -rub include/stuff/hash_string.h include/stuff/hash_string.h
--- include/stuff/hash_string.h Tue Apr 30 00:37:19 2002
+++ include/stuff/hash_string.h Mon Aug 25 13:10:32 2003
@@ -21,8 +21,10 @@
#endif
__private_extern__ long hash_string(
-diff -ubr include/stuff/hppa.h include/stuff/hppa.h
+diff -rub include/stuff/hppa.h include/stuff/hppa.h
--- include/stuff/hppa.h Tue Apr 30 00:37:19 2002
+++ include/stuff/hppa.h Mon Aug 25 13:10:40 2003
@@ -21,8 +21,10 @@
#endif
__private_extern__ void calc_hppa_HILO(
-diff -ubr include/stuff/ofile.h include/stuff/ofile.h
+diff -rub include/stuff/ofile.h include/stuff/ofile.h
--- include/stuff/ofile.h Fri Sep 6 18:27:42 2002
+++ include/stuff/ofile.h Mon Aug 25 13:10:51 2003
@@ -25,21 +25,23 @@
const char *file_name,
const struct arch_flag *arch_flag, /* can be NULL */
const char *object_name, /* can be NULL */
-diff -ubr include/stuff/print.h include/stuff/print.h
+diff -rub include/stuff/print.h include/stuff/print.h
--- include/stuff/print.h Tue Apr 30 00:37:19 2002
+++ include/stuff/print.h Mon Aug 25 13:10:58 2003
@@ -21,11 +21,13 @@
__private_extern__ void print(
const char *format, ...)
-diff -ubr include/stuff/reloc.h include/stuff/reloc.h
+diff -rub include/stuff/reloc.h include/stuff/reloc.h
--- include/stuff/reloc.h Tue Apr 30 00:37:19 2002
+++ include/stuff/reloc.h Mon Aug 25 13:11:02 2003
@@ -21,12 +21,14 @@
__private_extern__ unsigned long reloc_pair_r_type(
cpu_type_t cputype);
-diff -ubr include/stuff/round.h include/stuff/round.h
+diff -rub include/stuff/round.h include/stuff/round.h
--- include/stuff/round.h Tue Apr 30 00:37:19 2002
+++ include/stuff/round.h Mon Aug 25 13:11:06 2003
@@ -21,13 +21,15 @@
+ unsigned long v,
unsigned long r);
Only in include/stuff: symbol_list.h
-diff -ubr include/stuff/vm_flush_cache.h include/stuff/vm_flush_cache.h
+diff -rub include/stuff/vm_flush_cache.h include/stuff/vm_flush_cache.h
--- include/stuff/vm_flush_cache.h Tue Apr 30 00:37:19 2002
+++ include/stuff/vm_flush_cache.h Mon Aug 25 13:11:15 2003
@@ -21,11 +21,13 @@
-Only in ld: CVS
-diff -ubr ld/Makefile ld/Makefile
+Only in ld/: CVS
+diff -rub ld/Makefile ld/Makefile
--- ld/Makefile Fri Sep 6 18:27:43 2002
-+++ ld/Makefile Mon Aug 25 23:04:37 2003
++++ ld/Makefile Sat Sep 6 20:17:46 2003
@@ -9,10 +9,10 @@
-DKERNEL -DKERNEL_PRIVATE -DAPPLE -DNeXT -DLIBSA_PRIVATE
ifneq "mwccppc" "$(notdir $(CC))"
- GCC_FLAGS = -Wall -Wno-precomp $(X_CFLAGS)
+ ifeq "Linux" "$(shell uname)"
-+ GCC_FLAGS = -Wall $(X_CFLAGS) -D__ppc__ -I/usr/include -I../../../macosx-include
++ GCC_FLAGS = -Wall $(X_CFLAGS) -D__LITTLE_ENDIAN__ -U__BIG_ENDIAN__ -D__ppc__ -I/usr/include -I../../../macosx-include
+ else
+ GCC_FLAGS = -Wall $(X_CFLAGS)
+ endif
ld_vers.o: ld_vers.c
ifeq "mwccppc" "$(notdir $(CC))"
-diff -ubr ld/coalesced_sections.c ld/coalesced_sections.c
+diff -rub ld/coalesced_sections.c ld/coalesced_sections.c
--- ld/coalesced_sections.c Tue Jan 14 23:35:24 2003
+++ ld/coalesced_sections.c Mon Aug 25 22:11:47 2003
@@ -579,15 +579,15 @@
* relocation entries only non-position-independent local
* relocation entries are kept. Modules of dylibs are not
* linked together and can only be slid keeping all sections
-diff -ubr ld/dylibs.c ld/dylibs.c
+Only in ld/: dtmp_obj
+diff -rub ld/dylibs.c ld/dylibs.c
--- ld/dylibs.c Fri Sep 6 18:27:43 2002
+++ ld/dylibs.c Mon Aug 25 22:11:47 2003
@@ -116,7 +116,8 @@
mdl->dynamic_library = p;
}
}
-diff -ubr ld/dylibs.h ld/dylibs.h
+diff -rub ld/dylibs.h ld/dylibs.h
--- ld/dylibs.h Fri Sep 6 18:27:43 2002
+++ ld/dylibs.h Mon Aug 25 12:12:28 2003
@@ -55,7 +55,7 @@
__private_extern__ void add_dylib_segment(
struct segment_command *sg,
char *dylib_name,
-Only in ld: dynamic_profile_obj
-Only in ld: fake-mach.c
-diff -ubr ld/generic_reloc.c ld/generic_reloc.c
+Only in ld/: dynamic_kld
+Only in ld/: dynamic_obj
+Only in ld/: dynamic_profile_obj
+Only in ld/: fake-mach.c
+diff -rub ld/generic_reloc.c ld/generic_reloc.c
--- ld/generic_reloc.c Tue Jan 14 23:35:24 2003
+++ ld/generic_reloc.c Mon Aug 25 22:11:47 2003
@@ -351,13 +351,13 @@
(merged_symbol->nlist.n_type & N_PEXT) == N_PEXT)){
reloc->r_extern = 0;
/*
-diff -ubr ld/hppa_reloc.c ld/hppa_reloc.c
+diff -rub ld/hppa_reloc.c ld/hppa_reloc.c
--- ld/hppa_reloc.c Tue Jan 14 23:35:24 2003
+++ ld/hppa_reloc.c Mon Aug 25 22:11:47 2003
@@ -384,13 +384,13 @@
(merged_symbol->nlist.n_type & N_PEXT) == N_PEXT)){
reloc->r_extern = 0;
/*
-diff -ubr ld/i860_reloc.c ld/i860_reloc.c
+diff -rub ld/i860_reloc.c ld/i860_reloc.c
--- ld/i860_reloc.c Tue Jan 14 23:35:24 2003
+++ ld/i860_reloc.c Mon Aug 25 22:11:47 2003
@@ -370,13 +370,13 @@
reloc->r_extern = 0;
/*
* If this symbol was in the base file then no futher
-diff -ubr ld/indirect_sections.c ld/indirect_sections.c
+diff -rub ld/indirect_sections.c ld/indirect_sections.c
--- ld/indirect_sections.c Tue Jan 14 23:35:24 2003
+++ ld/indirect_sections.c Mon Aug 25 22:11:47 2003
@@ -370,11 +370,13 @@
"(output file must contain at least global symbols, for "
"maximum stripping use -x)");
indirect_symbols = (unsigned long *)(output_addr +
-diff -ubr ld/layout.c ld/layout.c
+diff -rub ld/layout.c ld/layout.c
--- ld/layout.c Tue Jan 14 23:35:24 2003
+++ ld/layout.c Mon Aug 25 23:22:05 2003
@@ -42,18 +42,22 @@
print_obj_name(object_file);
print("\n");
}
-diff -ubr ld/ld.c ld/ld.c
+diff -rub ld/ld.c ld/ld.c
--- ld/ld.c Tue Jan 14 23:35:24 2003
+++ ld/ld.c Mon Aug 25 22:11:47 2003
@@ -50,6 +50,9 @@
}
/*
-diff -ubr ld/ld.h ld/ld.h
+diff -rub ld/ld.h ld/ld.h
--- ld/ld.h Tue Jan 14 23:35:24 2003
+++ ld/ld.h Mon Aug 25 12:12:29 2003
@@ -41,6 +41,7 @@
/* The list of symbols to be traced */
__private_extern__ char **trace_syms;
-diff -ubr ld/literal_pointers.c ld/literal_pointers.c
+Only in ld/: ld_dir
+diff -rub ld/literal_pointers.c ld/literal_pointers.c
--- ld/literal_pointers.c Tue Jan 14 23:35:25 2003
+++ ld/literal_pointers.c Mon Aug 25 22:11:47 2003
@@ -149,8 +149,8 @@
* together and can only be slid keeping all sections
* relative to each other the same.
*/
-diff -ubr ld/m88k_reloc.c ld/m88k_reloc.c
+diff -rub ld/m88k_reloc.c ld/m88k_reloc.c
--- ld/m88k_reloc.c Tue Jan 14 23:35:25 2003
+++ ld/m88k_reloc.c Mon Aug 25 22:11:47 2003
@@ -373,13 +373,13 @@
(merged_symbol->nlist.n_type & N_PEXT) == N_PEXT)){
reloc->r_extern = 0;
/*
-Only in ld: make.h
-Only in ld: makeUser.c
-diff -ubr ld/mod_sections.c ld/mod_sections.c
+Only in ld/: make.h
+Only in ld/: makeUser.c
+diff -rub ld/mod_sections.c ld/mod_sections.c
--- ld/mod_sections.c Tue Jan 14 23:35:25 2003
+++ ld/mod_sections.c Mon Aug 25 22:11:47 2003
@@ -56,8 +56,8 @@
#endif /* !defined(RLD) */
/*
-diff -ubr ld/mod_sections.h ld/mod_sections.h
+diff -rub ld/mod_sections.h ld/mod_sections.h
--- ld/mod_sections.h Tue Apr 30 00:37:20 2002
+++ ld/mod_sections.h Mon Aug 25 12:12:29 2003
@@ -28,6 +28,8 @@
__private_extern__ void mod_section_merge(
void *data,
-diff -ubr ld/notes ld/notes
+diff -rub ld/notes ld/notes
--- ld/notes Tue Jan 14 23:35:25 2003
+++ ld/notes Mon Aug 25 12:12:29 2003
@@ -23,6 +23,420 @@
Changes for the 5.11 release (the cctools-440 release):
- Fixed the warnings about extra tokens at end of #endif directive in
4byte_literals.c, 8byte_literals.c, coalesced_sections.c, cstring_literals.c,
-diff -ubr ld/objects.c ld/objects.c
+diff -rub ld/objects.c ld/objects.c
--- ld/objects.c Tue Jan 14 23:35:25 2003
+++ ld/objects.c Mon Aug 25 22:11:47 2003
@@ -110,7 +110,7 @@
merged_symbol = (struct merged_symbol *)fine_reloc->output_offset;
if((merged_symbol->nlist.n_type & N_TYPE) == N_INDR)
merged_symbol = (struct merged_symbol *)
-diff -ubr ld/pass1.c ld/pass1.c
+Only in ld/: optimized_obj
+Only in ld/: otmp_obj
+diff -rub ld/pass1.c ld/pass1.c
--- ld/pass1.c Tue Jan 14 23:35:25 2003
+++ ld/pass1.c Mon Aug 25 22:11:47 2003
@@ -71,6 +71,9 @@
return;
}
/*
-diff -ubr ld/pass1.h ld/pass1.h
+diff -rub ld/pass1.h ld/pass1.h
--- ld/pass1.h Tue Jan 14 23:35:25 2003
+++ ld/pass1.h Mon Aug 25 12:12:29 2003
@@ -33,6 +33,9 @@
__private_extern__ void check_fat(
char *file_name,
unsigned long file_size,
-diff -ubr ld/pass2.c ld/pass2.c
+diff -rub ld/pass2.c ld/pass2.c
--- ld/pass2.c Tue Jan 14 23:35:25 2003
+++ ld/pass2.c Mon Aug 25 22:11:47 2003
@@ -336,7 +336,7 @@
system_fatal("can't write to output file");
if((r = vm_deallocate(mach_task_self(), (vm_address_t)(output_addr +
write_offset), write_size)) != KERN_SUCCESS)
-diff -ubr ld/ppc_reloc.c ld/ppc_reloc.c
+diff -rub ld/ppc_reloc.c ld/ppc_reloc.c
--- ld/ppc_reloc.c Tue Jan 14 23:35:25 2003
+++ ld/ppc_reloc.c Mon Aug 25 22:11:47 2003
@@ -242,6 +242,7 @@
r_type == PPC_RELOC_HA16_SECTDIFF)
spair_reloc->r_address = other_half;
}
-diff -ubr ld/rld.c ld/rld.c
+Only in ld/: profile_obj
+Only in ld/: ptmp_obj
+diff -rub ld/rld.c ld/rld.c
--- ld/rld.c Tue Jan 14 23:35:25 2003
+++ ld/rld.c Mon Aug 25 22:11:47 2003
@@ -56,11 +56,13 @@
}
#endif /* !defined(SA_RLD) && !defined(KLD) */
-diff -ubr ld/sections.c ld/sections.c
+Only in ld/: sarld_dir
+diff -rub ld/sections.c ld/sections.c
--- ld/sections.c Tue Jan 14 23:35:25 2003
+++ ld/sections.c Mon Aug 25 22:11:47 2003
@@ -324,6 +324,13 @@
*/
if(r_extern){
reloc->r_address += addr_adjust;
-diff -ubr ld/sets.c ld/sets.c
+diff -rub ld/sets.c ld/sets.c
--- ld/sets.c Tue Jan 14 23:35:25 2003
+++ ld/sets.c Mon Aug 25 22:11:47 2003
@@ -134,7 +134,7 @@
kern_return_t r;
char *file_addr, *file_name;
long file_size;
-diff -ubr ld/sparc_reloc.c ld/sparc_reloc.c
+Only in ld/: shlib_obj
+diff -rub ld/sparc_reloc.c ld/sparc_reloc.c
--- ld/sparc_reloc.c Tue Jan 14 23:35:25 2003
+++ ld/sparc_reloc.c Mon Aug 25 22:11:47 2003
@@ -385,13 +385,13 @@
(merged_symbol->nlist.n_type & N_PEXT) == N_PEXT)){
reloc->r_extern = 0;
/*
-diff -ubr ld/symbols.c ld/symbols.c
+Only in ld/: static_kld
+diff -rub ld/symbols.c ld/symbols.c
--- ld/symbols.c Tue Jan 14 23:35:25 2003
+++ ld/symbols.c Mon Aug 25 22:11:47 2003
@@ -47,6 +47,9 @@
}
}
if(host_byte_sex != target_byte_sex){
-diff -ubr ld/symbols.h ld/symbols.h
+diff -rub ld/symbols.h ld/symbols.h
--- ld/symbols.h Tue Jan 14 23:35:25 2003
+++ ld/symbols.h Mon Aug 25 12:12:29 2003
@@ -78,7 +78,8 @@
-Only in libstuff: CVS
-diff -ubr libstuff/Makefile libstuff/Makefile
+Only in libstuff/: CVS
+diff -rub libstuff/Makefile libstuff/Makefile
--- libstuff/Makefile Fri Sep 6 18:27:55 2002
-+++ libstuff/Makefile Mon Aug 25 21:54:30 2003
++++ libstuff/Makefile Sat Sep 6 20:12:21 2003
@@ -1,7 +1,7 @@
RC_OS = macos
OFLAG = -O
else
- CFLAGS = $(OFLAG) -g -I$(SRCROOT)/../include -Wall -Wno-precomp $(X_CFLAGS)
+ ifeq "Linux" "$(shell uname)"
-+ CFLAGS = $(OFLAG) -g -I$(SRCROOT)/../include -Wall $(X_CFLAGS) -D__ppc__ -I/usr/include -I../../../macosx-include
++ CFLAGS = $(OFLAG) -g -I$(SRCROOT)/../include -Wall $(X_CFLAGS) -D__LITTLE_ENDIAN__ -U__BIG_ENDIAN__ -D__ppc__ -I/usr/include -I../../../macosx-include
+ else
+ CFLAGS = $(OFLAG) -g -I$(SRCROOT)/../include -Wall $(X_CFLAGS)
+ endif
ifeq "NO" "$(USE_DEPENDENCY_FILE)"
.c.o:
-diff -ubr libstuff/SymLoc.c libstuff/SymLoc.c
+diff -rub libstuff/SymLoc.c libstuff/SymLoc.c
--- libstuff/SymLoc.c Fri Sep 6 18:27:55 2002
+++ libstuff/SymLoc.c Mon Aug 25 13:17:40 2003
@@ -1,15 +1,15 @@
// read DylibProjects entries
*buf = '\0';
-diff -ubr libstuff/arch.c libstuff/arch.c
+diff -rub libstuff/arch.c libstuff/arch.c
--- libstuff/arch.c Tue Jan 14 23:35:27 2003
+++ libstuff/arch.c Mon Aug 25 13:17:40 2003
@@ -60,11 +60,13 @@
return(0x1000); /* 4K */
else
return(0x2000); /* 8K */
-diff -ubr libstuff/best_arch.c libstuff/best_arch.c
+diff -rub libstuff/best_arch.c libstuff/best_arch.c
--- libstuff/best_arch.c Tue Jan 14 23:35:27 2003
+++ libstuff/best_arch.c Mon Aug 25 13:17:40 2003
@@ -44,7 +44,8 @@
for(i = 0; i < nfat_archs; i++){
if(fat_archs[i].cputype != cputype)
continue;
-diff -ubr libstuff/bytesex.c libstuff/bytesex.c
+diff -rub libstuff/bytesex.c libstuff/bytesex.c
--- libstuff/bytesex.c Fri Sep 6 18:27:56 2002
+++ libstuff/bytesex.c Mon Aug 25 13:17:40 2003
@@ -25,13 +25,13 @@
#include <mach-o/nlist.h>
#include <mach-o/reloc.h>
#include <mach-o/ranlib.h>
-diff -ubr libstuff/checkout.c libstuff/checkout.c
+diff -rub libstuff/checkout.c libstuff/checkout.c
--- libstuff/checkout.c Fri Sep 6 18:27:57 2002
+++ libstuff/checkout.c Mon Aug 25 13:17:40 2003
@@ -132,9 +132,11 @@
* string table
* strings for external symbols
* strings for local symbols
-diff -ubr libstuff/crc32.c libstuff/crc32.c
+diff -rub libstuff/crc32.c libstuff/crc32.c
--- libstuff/crc32.c Fri Sep 6 18:27:57 2002
+++ libstuff/crc32.c Mon Aug 25 13:19:21 2003
@@ -35,6 +35,12 @@
static const u_int32_t crctab[] = {
0x0,
0x04c11db7, 0x09823b6e, 0x0d4326d9, 0x130476dc, 0x17c56b6b,
-diff -ubr libstuff/dylib_roots.c libstuff/dylib_roots.c
+diff -rub libstuff/dylib_roots.c libstuff/dylib_roots.c
--- libstuff/dylib_roots.c Fri Sep 6 18:27:58 2002
+++ libstuff/dylib_roots.c Mon Aug 25 13:17:40 2003
@@ -21,7 +21,7 @@
return;
}
lc = (struct load_command *)((char *)lc + lc->cmdsize);
-Only in libstuff: fake-mach.c
-diff -ubr libstuff/get_arch_from_host.c libstuff/get_arch_from_host.c
+Only in libstuff/: dynamic_obj
+Only in libstuff/: fake-mach.c
+diff -rub libstuff/get_arch_from_host.c libstuff/get_arch_from_host.c
--- libstuff/get_arch_from_host.c Tue Jan 14 23:35:27 2003
+++ libstuff/get_arch_from_host.c Mon Aug 25 13:17:40 2003
@@ -181,6 +181,14 @@
default:
if(family_arch_flag != NULL){
family_arch_flag->name = "ppc";
-Only in libstuff: gpul_notes
-diff -ubr libstuff/notes libstuff/notes
+Only in libstuff/: gpul_notes
+Only in libstuff/: libstuff.a
+Only in libstuff/: libstuff.dylib
+Only in libstuff/: libstuff_p.a
+diff -rub libstuff/notes libstuff/notes
--- libstuff/notes Tue Jan 14 23:35:27 2003
+++ libstuff/notes Mon Aug 25 12:12:33 2003
@@ -5,6 +5,69 @@
Changes for the 5.11 release (the cctools-440 release):
- Fixed the warnings about extra tokens at end of #endif directive in ofile.c
(Radar bug #3072042).
-diff -ubr libstuff/ofile.c libstuff/ofile.c
+diff -rub libstuff/ofile.c libstuff/ofile.c
--- libstuff/ofile.c Tue Jan 14 23:35:27 2003
-+++ libstuff/ofile.c Mon Aug 25 23:49:59 2003
-@@ -27,6 +27,7 @@
++++ libstuff/ofile.c Tue Sep 2 20:15:34 2003
+@@ -21,12 +21,14 @@
+ *
+ * @APPLE_LICENSE_HEADER_END@
+ */
++#include "machine/endian.h"
+ #ifdef SHLIB
+ #include "shlib.h"
+ #endif
#include <libc.h>
#include <mach/mach.h>
#include "stuff/openstep_mach.h"
#include <stdarg.h>
#include <limits.h>
#include <errno.h>
-@@ -35,12 +36,12 @@
+@@ -35,12 +37,12 @@
#include <sys/file.h>
#include <mach-o/fat.h>
#include <mach-o/loader.h>
#include <mach-o/nlist.h>
#include <mach-o/reloc.h>
#include "stuff/bool.h"
-@@ -91,6 +92,12 @@
+@@ -91,6 +93,12 @@
unsigned long *member_name_size);
static enum check_type check_Mach_O(
struct ofile *ofile);
#ifndef OFI
/*
-@@ -229,7 +236,8 @@
+@@ -229,7 +237,8 @@
else if(process_non_objects == TRUE ||
ofile.arch_type == OFILE_Mach_O){
if(ofile.arch_type == OFILE_Mach_O &&
if(dylib_flat == TRUE){
processor(&ofile, arch_name, cookie);
}
-@@ -349,7 +357,8 @@
+@@ -349,7 +358,8 @@
else if(process_non_objects == TRUE ||
ofile.arch_type == OFILE_Mach_O){
if(ofile.arch_type == OFILE_Mach_O &&
if(dylib_flat == TRUE){
processor(&ofile, NULL, cookie);
}
-@@ -445,7 +454,8 @@
+@@ -445,7 +455,8 @@
else if(process_non_objects == TRUE ||
ofile.arch_type == OFILE_Mach_O){
if(ofile.arch_type == OFILE_Mach_O &&
if(dylib_flat == TRUE){
processor(&ofile, ofile.arch_flag.name, cookie);
}
-@@ -557,9 +567,9 @@
+@@ -557,9 +568,9 @@
}
#ifdef OTOOL
if(ofile.mh->magic == SWAP_LONG(MH_MAGIC)){
arch_flags[i].cpusubtype ||
family == TRUE)){
arch_found = TRUE;
-@@ -580,7 +590,8 @@
+@@ -580,7 +591,8 @@
if(arch_found == FALSE)
return;
}
if(dylib_flat == TRUE){
processor(&ofile, NULL, cookie);
}
-@@ -658,19 +669,15 @@
+@@ -658,19 +670,15 @@
{
int fd;
struct stat stat_buf;
#ifdef OFI
return(NSObjectFileImageAccess);
#else
-@@ -700,6 +707,35 @@
+@@ -700,6 +708,35 @@
printf("Modification time = %ld\n", (long int)stat_buf.st_mtime);
#endif /* OTOOL */
/* fill in the start of the ofile structure */
ofile->file_name = savestr(file_name);
if(ofile->file_name == NULL)
-@@ -1176,7 +1212,7 @@
+@@ -939,7 +976,7 @@
+ }
+ }
+ }
+- /* see if this file is Mach-O file */
++
+ else if(size >= sizeof(struct mach_header) &&
+ (magic == MH_MAGIC || magic == SWAP_LONG(MH_MAGIC))){
+ ofile->file_type = OFILE_Mach_O;
+@@ -1176,7 +1213,7 @@
}
#ifdef OTOOL
error("fat file: %s offset to architecture %s extends past end "
"of file", ofile->file_name, ofile->arch_flag.name);
return(FALSE);
-@@ -1327,7 +1363,7 @@
+@@ -1327,7 +1364,7 @@
return(FALSE);
}
#ifdef OTOOL
archive_error(ofile, "offset to first member extends past the end "
"of the file");
return(FALSE);
-@@ -1832,7 +1868,7 @@
+@@ -1832,7 +1869,7 @@
/*
* ofile_first_module() set up the ofile structure (the dylib_module field)
*/
__private_extern__
enum bool
-@@ -1856,7 +1892,8 @@
+@@ -1856,7 +1893,8 @@
if(ofile->file_type == OFILE_FAT){
if(ofile->arch_type != OFILE_Mach_O &&
error("ofile_first_module() called on fat file: %s with a "
"non-MH_DYLIB architecture or no architecture selected\n",
ofile->file_name);
-@@ -1864,7 +1901,8 @@
+@@ -1864,7 +1902,8 @@
}
}
else if(ofile->arch_type != OFILE_Mach_O &&
error("ofile_first_module() called and file type of %s is "
"non-MH_DYLIB\n", ofile->file_name);
return(FALSE);
-@@ -1902,20 +1940,22 @@
+@@ -1902,20 +1941,22 @@
m = *ofile->dylib_module;
if(swapped)
swap_dylib_module(&m, 1, host_byte_sex);
struct symtab_command *st;
struct dysymtab_command *dyst;
struct load_command *lc;
-@@ -1926,7 +1966,8 @@
+@@ -1926,7 +1967,8 @@
if(ofile->file_type == OFILE_FAT){
if(ofile->arch_type != OFILE_Mach_O &&
error("ofile_next_module() called on fat file: %s with a "
"non-MH_DYLIB architecture or no architecture selected\n",
ofile->file_name);
-@@ -1934,7 +1975,8 @@
+@@ -1934,7 +1976,8 @@
}
}
else if(ofile->arch_type != OFILE_Mach_O &&
error("ofile_next_module() called and file type of %s is "
"non-MH_DYLIB\n", ofile->file_name);
return(FALSE);
-@@ -1959,7 +2001,8 @@
+@@ -1959,7 +2002,8 @@
return(FALSE);
}
return(FALSE);
ofile->dylib_module++;
-@@ -1969,13 +2012,17 @@
+@@ -1969,13 +2013,17 @@
m = *ofile->dylib_module;
if(swapped)
swap_dylib_module(&m, 1, host_byte_sex);
*/
__private_extern__
enum bool
-@@ -2000,7 +2047,8 @@
+@@ -2000,7 +2048,8 @@
if(ofile->file_type == OFILE_FAT){
if(ofile->arch_type != OFILE_Mach_O &&
error("ofile_specific_module() called on fat file: %s with a "
"non-MH_DYLIB architecture or no architecture selected\n",
ofile->file_name);
-@@ -2008,7 +2056,8 @@
+@@ -2008,7 +2057,8 @@
}
}
else if(ofile->arch_type != OFILE_Mach_O &&
error("ofile_specific_module() called and file type of %s is "
"non-MH_DYLIB\n", ofile->file_name);
return(FALSE);
-@@ -2047,8 +2096,10 @@
+@@ -2047,8 +2097,10 @@
m = *p;
if(swapped)
swap_dylib_module(&m, 1, host_byte_sex);
ofile->dylib_module_name = strings + m.module_name;
return(TRUE);
}
-@@ -2520,10 +2571,12 @@
+@@ -2520,10 +2572,12 @@
return(CHECK_BAD);
}
if(ofile->file_type == OFILE_FAT){
}
/*
* Make a pass through the load commands checking them to the level
-@@ -3595,55 +3648,73 @@
+@@ -3595,55 +3649,73 @@
}
}
if(st == NULL){
}
}
}
-@@ -3655,6 +3726,109 @@
+@@ -3655,6 +3727,109 @@
}
/* looks good return ok */
return(CHECK_GOOD);
#endif /* OTOOL */
}
-diff -ubr libstuff/ofile_get_word.c libstuff/ofile_get_word.c
+diff -rub libstuff/ofile_get_word.c libstuff/ofile_get_word.c
--- libstuff/ofile_get_word.c Fri Sep 6 18:28:00 2002
+++ libstuff/ofile_get_word.c Mon Aug 25 13:17:40 2003
@@ -34,7 +34,7 @@
struct load_command *lc;
struct segment_command *sg;
struct section *s;
-diff -ubr libstuff/print.c libstuff/print.c
+diff -rub libstuff/print.c libstuff/print.c
--- libstuff/print.c Tue Apr 30 00:37:20 2002
+++ libstuff/print.c Mon Aug 25 13:17:40 2003
@@ -21,8 +21,8 @@
/*
* All printing of all messages for ofile functions goes through this function.
-diff -ubr libstuff/reloc.c libstuff/reloc.c
+Only in libstuff/: profile_obj
+diff -rub libstuff/reloc.c libstuff/reloc.c
--- libstuff/reloc.c Tue Jan 14 23:35:27 2003
+++ libstuff/reloc.c Mon Aug 25 13:17:40 2003
@@ -106,6 +106,7 @@
r_type == PPC_RELOC_HA16_SECTDIFF)
return(TRUE);
break;
-diff -ubr libstuff/round.c libstuff/round.c
+diff -rub libstuff/round.c libstuff/round.c
--- libstuff/round.c Tue Apr 30 00:37:20 2002
+++ libstuff/round.c Mon Aug 25 13:17:40 2003
@@ -26,9 +26,9 @@
unsigned long r)
{
r--;
-diff -ubr libstuff/swap_headers.c libstuff/swap_headers.c
+Only in libstuff/: shlib_obj
+Only in libstuff/: static_obj
+diff -rub libstuff/swap_headers.c libstuff/swap_headers.c
--- libstuff/swap_headers.c Tue Jan 14 23:35:27 2003
+++ libstuff/swap_headers.c Mon Aug 25 13:17:40 2003
@@ -22,13 +22,13 @@
#include "stuff/bool.h"
#include "stuff/bytesex.h"
#include "stuff/errors.h"
-Only in libstuff: symbol_list.c
-diff -ubr libstuff/writeout.c libstuff/writeout.c
+Only in libstuff/: symbol_list.c
+diff -rub libstuff/writeout.c libstuff/writeout.c
--- libstuff/writeout.c Fri Sep 6 18:28:00 2002
+++ libstuff/writeout.c Mon Aug 25 13:17:40 2003
@@ -511,7 +511,7 @@
-Only in misc: CVS
-diff -ubr misc/Makefile misc/Makefile
+Only in misc/: CVS
+diff -rub misc/Makefile misc/Makefile
--- misc/Makefile Tue Jan 14 23:35:29 2003
-+++ misc/Makefile Mon Aug 25 22:06:23 2003
++++ misc/Makefile Sat Sep 6 20:17:36 2003
@@ -2,11 +2,11 @@
OFLAG = -O
RC_OS = macos
- CFLAGS = $(OFLAG) -g -Wall -Wno-precomp $(X_CFLAGS) \
+ ifeq "Linux" "$(shell uname)"
+ CFLAGS = $(OFLAG) -g -Wall $(X_CFLAGS) \
-+ -I$(SRCROOT) -I$(SRCROOT)/../include -I$(OFILE_DIR) -D__ppc__ -I/usr/include -I../../macosx-include
++ -I$(SRCROOT) -I$(SRCROOT)/../include -I$(OFILE_DIR) -D__LITTLE_ENDIAN__ -U__BIG_ENDIAN__ -D__ppc__ -I/usr/include -I../../macosx-include
+ else
+ CFLAGS = $(OFLAG) -g -Wall $(X_CFLAGS) \
-I$(SRCROOT) -I$(SRCROOT)/../include -I$(OFILE_DIR)
shlib_clean:
-rm -f \
-Only in misc: ar.c
-Only in misc: atom.c
-Only in misc: check_dylib.c
-Only in misc: check_hints.c
-Only in misc: checksyms.c
-Only in misc: cmpdylib.c
-Only in misc: dylib_pcsampler.c
-Only in misc: file.c
-Only in misc: indr.c
-Only in misc: inout.c
-Only in misc: install_name_tool.c
-Only in misc: kern_tool.c
-Only in misc: libtool.c
-Only in misc: lipo.c
-Only in misc: main.c
-Only in misc: nm.c
-diff -ubr misc/notes misc/notes
+Only in misc/: ar.c
+Only in misc/: atom.c
+Only in misc/: check_dylib.c
+Only in misc/: check_hints.c
+Only in misc/: checksyms.c
+Only in misc/: cmpdylib.c
+Only in misc/: dylib_pcsampler.c
+Only in misc/: file.c
+Only in misc/: indr.c
+Only in misc/: inout.c
+Only in misc/: install_name_tool.c
+Only in misc/: kern_tool.c
+Only in misc/: libtool.c
+Only in misc/: lipo.c
+Only in misc/: main.c
+Only in misc/: nm.c
+diff -rub misc/notes misc/notes
--- misc/notes Tue Jan 14 23:35:29 2003
+++ misc/notes Mon Aug 25 12:12:34 2003
@@ -7,6 +7,148 @@
Changes for the 5.11 release (the cctools-440 release):
- Fixed the warnings about extra tokens at end of #endif directive in
check_hints.c, strip.c and make_defs.h (Radar bug #3072042).
-Only in misc: pagestuff.c
-Only in misc: redo_prebinding.c
-Only in misc: seg_addr_table.c
-diff -ubr misc/seg_hack.c misc/seg_hack.c
+Only in misc/: pagestuff.c
+Only in misc/: redo_prebinding.c
+Only in misc/: seg_addr_table.c
+Only in misc/: seg_hack
+Only in misc/: seg_hack.NEW
+diff -rub misc/seg_hack.c misc/seg_hack.c
--- misc/seg_hack.c Fri Sep 6 18:28:06 2002
+++ misc/seg_hack.c Mon Aug 25 12:12:34 2003
@@ -58,7 +58,7 @@
char *input, *output;
struct arch *archs;
unsigned long narchs;
-Only in misc: segedit.c
-Only in misc: size.c
-Only in misc: strings.c
-diff -ubr misc/strip.c misc/strip.c
+Only in misc/: seg_hack.o
+Only in misc/: seg_hack.private.o
+Only in misc/: segedit.c
+Only in misc/: size.c
+Only in misc/: strings.c
+Only in misc/: strip.NEW
+diff -rub misc/strip.c misc/strip.c
--- misc/strip.c Tue Jan 14 23:35:30 2003
+++ misc/strip.c Mon Aug 25 22:02:32 2003
@@ -38,11 +38,13 @@
global_name[j+1] == 'F'){
global_name[j+1] = 'f';
}
-Only in misc: vers_string
+Only in misc/: strip.o
+Only in misc/: strip.private.o
+Only in misc/: vers.c
+Only in misc/: vers.o
+Only in misc/: vers_string
projects / org.ibex.core.git / commitdiff