2003/09/07 05:30:41

[org.ibex.core.git] / upstream / darwin-linker / patches / include.patch

diff --git a/upstream/darwin-linker/patches/include.patch b/upstream/darwin-linker/patches/include.patch
index 75f9ba6..b3be282 100644 (file)
--- a/upstream/darwin-linker/patches/include.patch
+++ b/upstream/darwin-linker/patches/include.patch
@@ -1,6 +1,6 @@
-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 @@
@@ -60,7 +60,7 @@ diff -ubr include/Makefile include/Makefile
  
 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 @@
@@ -72,7 +72,7 @@ diff -ubr include/architecture/i386/fpu.h include/architecture/i386/fpu.h
  
  /*
   * 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 @@
@@ -85,7 +85,7 @@ diff -ubr include/architecture/i386/frame.h include/architecture/i386/frame.h
  /*
   * 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 @@
@@ -97,7 +97,7 @@ diff -ubr include/architecture/m88k/fp_regs.h include/architecture/m88k/fp_regs.
  
  /*
   * 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 @@
@@ -112,16 +112,16 @@ diff -ubr include/architecture/m88k/reg_help.h include/architecture/m88k/reg_hel
 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 @@
@@ -136,7 +136,7 @@ diff -ubr include/mach/m88k/thread_status.h include/mach/m88k/thread_status.h
  /**************************************************************************
   * 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 @@
@@ -161,7 +161,7 @@ diff -ubr include/mach/machine.h include/mach/machine.h
 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 @@
@@ -280,7 +280,7 @@ diff -ubr include/mach-o/dyld.h include/mach-o/dyld.h
      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 @@
@@ -316,7 +316,7 @@ diff -ubr include/mach-o/dyld_gdb.h include/mach-o/dyld_gdb.h
  
  /* 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 @@
@@ -332,7 +332,7 @@ diff -ubr include/mach-o/hppa/swap.h include/mach-o/hppa/swap.h
      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 @@
@@ -346,7 +346,7 @@ diff -ubr include/mach-o/i860/swap.h include/mach-o/i860/swap.h
  
  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 @@
@@ -394,7 +394,7 @@ diff -ubr include/mach-o/kld.h include/mach-o/kld.h
 +    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 @@
@@ -532,7 +532,7 @@ diff -ubr include/mach-o/loader.h include/mach-o/loader.h
       * 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 @@
@@ -547,7 +547,7 @@ diff -ubr include/mach-o/m68k/swap.h include/mach-o/m68k/swap.h
  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 @@
@@ -561,7 +561,7 @@ diff -ubr include/mach-o/m88k/swap.h include/mach-o/m88k/swap.h
  
  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 @@
@@ -592,7 +592,7 @@ diff -ubr include/mach-o/nlist.h include/mach-o/nlist.h
  
  /*
 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 @@
@@ -627,7 +627,7 @@ diff -ubr include/mach-o/ppc/reloc.h include/mach-o/ppc/reloc.h
 +    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 @@
@@ -640,7 +640,7 @@ diff -ubr include/mach-o/rld.h include/mach-o/rld.h
  
  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 @@
@@ -654,7 +654,7 @@ diff -ubr include/mach-o/sparc/swap.h include/mach-o/sparc/swap.h
  
  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 @@
@@ -665,7 +665,7 @@ diff -ubr include/mach-o/stab.h include/mach-o/stab.h
  #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 @@
@@ -766,7 +766,7 @@ diff -ubr include/notes include/notes
  - 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 @@
@@ -788,7 +788,7 @@ diff -ubr include/standalone/libsa.h include/standalone/libsa.h
  #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 @@
@@ -803,7 +803,7 @@ diff -ubr include/stuff/allocate.h include/stuff/allocate.h
  #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 @@
@@ -827,7 +827,7 @@ diff -ubr include/stuff/arch.h include/stuff/arch.h
  
  /*
   * 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 @@
@@ -842,7 +842,7 @@ diff -ubr include/stuff/best_arch.h include/stuff/best_arch.h
  #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 @@
@@ -855,7 +855,7 @@ diff -ubr include/stuff/bool.h include/stuff/bool.h
  #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 @@
@@ -874,7 +874,7 @@ diff -ubr include/stuff/breakout.h include/stuff/breakout.h
  
  /*
   * 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 @@
@@ -917,7 +917,7 @@ diff -ubr include/stuff/bytesex.h include/stuff/bytesex.h
  
  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 @@
@@ -936,7 +936,7 @@ diff -ubr include/stuff/errors.h include/stuff/errors.h
  
  /* 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 @@
@@ -951,7 +951,7 @@ diff -ubr include/stuff/execute.h include/stuff/execute.h
  #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 @@
@@ -966,7 +966,7 @@ diff -ubr include/stuff/hash_string.h include/stuff/hash_string.h
  #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 @@
@@ -981,7 +981,7 @@ diff -ubr include/stuff/hppa.h include/stuff/hppa.h
  #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 @@
@@ -1034,7 +1034,7 @@ diff -ubr include/stuff/ofile.h include/stuff/ofile.h
      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 @@
@@ -1053,7 +1053,7 @@ diff -ubr include/stuff/print.h include/stuff/print.h
  
  __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 @@
@@ -1074,7 +1074,7 @@ diff -ubr include/stuff/reloc.h include/stuff/reloc.h
  
  __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 @@
@@ -1097,7 +1097,7 @@ diff -ubr include/stuff/round.h include/stuff/round.h
 +    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 @@