Added Self to Write After Approval

[deliverable/binutils-gdb.git] / bfd / coff-ppc.c

diff --git a/bfd/coff-ppc.c b/bfd/coff-ppc.c
index 6d5e7814b71ab232415ead205b0bc2b93d496233..f2bdfe57a905708ad227f7e0e804d92a9c7bfc2f 100644 (file)
--- a/bfd/coff-ppc.c
+++ b/bfd/coff-ppc.c
@@ -1,11 +1,12 @@
 /* BFD back-end for PowerPC Microsoft Portable Executable files.
 /* BFD back-end for PowerPC Microsoft Portable Executable files.

-   Copyright 1990, 91, 92, 93, 94, 95, 96, 97, 98, 1999
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+   2000, 2001

    Free Software Foundation, Inc.
 
    Original version pieced together by Kim Knuttila (krk@cygnus.com)
 
    There is nothing new under the sun. This file draws a lot on other
    Free Software Foundation, Inc.
 
    Original version pieced together by Kim Knuttila (krk@cygnus.com)
 
    There is nothing new under the sun. This file draws a lot on other

-   coff files, in particular, those for the rs/6000, alpha, mips, and 
+   coff files, in particular, those for the rs/6000, alpha, mips, and

    intel backends, and the PE work for the arm.
 
 This file is part of BFD, the Binary File Descriptor library.
    intel backends, and the PE work for the arm.
 
 This file is part of BFD, the Binary File Descriptor library.


@@ -29,11 +30,10 @@ Boston, MA 02111-1307, USA.  */
    - objdump works
    - relocs generated by gas
    - ld will link files, but they do not run.
    - objdump works
    - relocs generated by gas
    - ld will link files, but they do not run.

-   - dlltool will not produce correct output in some .reloc cases, and will 
+   - dlltool will not produce correct output in some .reloc cases, and will

      not produce the right glue code for dll function calls.
 */
 
      not produce the right glue code for dll function calls.
 */
 

-

 #include "bfd.h"
 #include "sysdep.h"
 
 #include "bfd.h"
 #include "sysdep.h"
 


@@ -75,7 +75,6 @@ extern void dump_toc PARAMS ((PTR));
 #define MARK_AS_WRITTEN(x)  ((x) |= 1)
 #define MAKE_ADDR_AGAIN(x)  ((x) &= ~1)
 
 #define MARK_AS_WRITTEN(x)  ((x) |= 1)
 #define MAKE_ADDR_AGAIN(x)  ((x) &= ~1)
 

-

 /* Turn on this check if you suspect something amiss in the hash tables */
 #ifdef DEBUG_HASH
 
 /* Turn on this check if you suspect something amiss in the hash tables */
 #ifdef DEBUG_HASH
 


@@ -87,13 +86,12 @@ extern void dump_toc PARAMS ((PTR));
 #define HASH_CHECK(addr) \
  if (strcmp(addr->eye_catcher, EYE) != 0) \
   { \
 #define HASH_CHECK(addr) \
  if (strcmp(addr->eye_catcher, EYE) != 0) \
   { \

-    fprintf(stderr,\
+    fprintf (stderr,\

     _("File %s, line %d, Hash check failure, bad eye %8s\n"), \
     __FILE__, __LINE__, addr->eye_catcher); \
     _("File %s, line %d, Hash check failure, bad eye %8s\n"), \
     __FILE__, __LINE__, addr->eye_catcher); \

-    abort(); \
+    abort (); \

  }
 
  }
 

-

 #else
 
 #define HASH_CHECK_DCL
 #else
 
 #define HASH_CHECK_DCL


@@ -105,7 +103,7 @@ extern void dump_toc PARAMS ((PTR));
 /* In order not to add an int to every hash table item for every coff
    linker, we define our own hash table, derived from the coff one */
 
 /* In order not to add an int to every hash table item for every coff
    linker, we define our own hash table, derived from the coff one */
 

-/* PE linker hash table entries. */
+/* PE linker hash table entries.  */

 
 struct ppc_coff_link_hash_entry
 {
 
 struct ppc_coff_link_hash_entry
 {


@@ -120,7 +118,6 @@ struct ppc_coff_link_hash_entry
   HASH_CHECK_DCL
 };
 
   HASH_CHECK_DCL
 };
 

-

 /* PE linker hash table.  */
 
 struct ppc_coff_link_hash_table
 /* PE linker hash table.  */
 
 struct ppc_coff_link_hash_table


@@ -154,14 +151,14 @@ ppc_coff_link_hash_newfunc (entry, table, string)
      struct bfd_hash_table *table;
      const char *string;
 {
      struct bfd_hash_table *table;
      const char *string;
 {

-  struct ppc_coff_link_hash_entry *ret = 
+  struct ppc_coff_link_hash_entry *ret =

     (struct ppc_coff_link_hash_entry *) entry;
 
   /* Allocate the structure if it has not already been allocated by a
      subclass.  */
   if (ret == (struct ppc_coff_link_hash_entry *) NULL)
     ret = (struct ppc_coff_link_hash_entry *)
     (struct ppc_coff_link_hash_entry *) entry;
 
   /* Allocate the structure if it has not already been allocated by a
      subclass.  */
   if (ret == (struct ppc_coff_link_hash_entry *) NULL)
     ret = (struct ppc_coff_link_hash_entry *)

-      bfd_hash_allocate (table, 
+      bfd_hash_allocate (table,

                         sizeof (struct ppc_coff_link_hash_entry));
 
   if (ret == (struct ppc_coff_link_hash_entry *) NULL)
                         sizeof (struct ppc_coff_link_hash_entry));
 
   if (ret == (struct ppc_coff_link_hash_entry *) NULL)


@@ -169,7 +166,7 @@ ppc_coff_link_hash_newfunc (entry, table, string)
 
   /* Call the allocation method of the superclass.  */
   ret = ((struct ppc_coff_link_hash_entry *)
 
   /* Call the allocation method of the superclass.  */
   ret = ((struct ppc_coff_link_hash_entry *)

-        _bfd_coff_link_hash_newfunc ((struct bfd_hash_entry *) ret, 
+        _bfd_coff_link_hash_newfunc ((struct bfd_hash_entry *) ret,

                                      table, string));
 
   if (ret)
                                      table, string));
 
   if (ret)


@@ -205,9 +202,9 @@ ppc_coff_link_hash_table_create (abfd)
      bfd *abfd;
 {
   struct ppc_coff_link_hash_table *ret;
      bfd *abfd;
 {
   struct ppc_coff_link_hash_table *ret;

+  bfd_size_type amt = sizeof (struct ppc_coff_link_hash_table);

 
 

-  ret = ((struct ppc_coff_link_hash_table *)
-        bfd_alloc (abfd, sizeof (struct ppc_coff_link_hash_table)));
+  ret = (struct ppc_coff_link_hash_table *) bfd_alloc (abfd, amt);

   if (ret == NULL)
     return NULL;
   if (! ppc_coff_link_hash_table_init (ret, abfd,
   if (ret == NULL)
     return NULL;
   if (! ppc_coff_link_hash_table_init (ret, abfd,


@@ -222,7 +219,6 @@ ppc_coff_link_hash_table_create (abfd)
 /* Now, tailor coffcode.h to use our hash stuff */
 
 #define coff_bfd_link_hash_table_create ppc_coff_link_hash_table_create
 /* Now, tailor coffcode.h to use our hash stuff */
 
 #define coff_bfd_link_hash_table_create ppc_coff_link_hash_table_create

-

 \f
 /* The nt loader points the toc register to &toc + 32768, in order to */
 /* use the complete range of a 16-bit displacement. We have to adjust */
 \f
 /* The nt loader points the toc register to &toc + 32768, in order to */
 /* use the complete range of a 16-bit displacement. We have to adjust */


@@ -238,7 +234,7 @@ ppc_coff_link_hash_table_create (abfd)
    from smaller values.  Start with zero, widen, *then* decrement.  */
 #define MINUS_ONE      (((bfd_vma)0) - 1)
 
    from smaller values.  Start with zero, widen, *then* decrement.  */
 #define MINUS_ONE      (((bfd_vma)0) - 1)
 

-/* these should definitely go in a header file somewhere... */
+/* these should definitely go in a header file somewhere...  */

 
 /* NOP */
 #define IMAGE_REL_PPC_ABSOLUTE          0x0000
 
 /* NOP */
 #define IMAGE_REL_PPC_ABSOLUTE          0x0000


@@ -320,7 +316,6 @@ ppc_coff_link_hash_table_create (abfd)
 #define EXTRACT_FLAGS(x) ((x) & IMAGE_REL_PPC_FLAGMASK)
 #define EXTRACT_JUNK(x)  \
            ((x) & ~(IMAGE_REL_PPC_TYPEMASK | IMAGE_REL_PPC_FLAGMASK))
 #define EXTRACT_FLAGS(x) ((x) & IMAGE_REL_PPC_FLAGMASK)
 #define EXTRACT_JUNK(x)  \
            ((x) & ~(IMAGE_REL_PPC_TYPEMASK | IMAGE_REL_PPC_FLAGMASK))

-

 \f
 /* static helper functions to make relocation work */
 /* (Work In Progress) */
 \f
 /* static helper functions to make relocation work */
 /* (Work In Progress) */


@@ -348,7 +343,6 @@ static bfd_reloc_status_type ppc_pair_reloc PARAMS ((bfd *abfd,
                                                     asection *section,
                                                     bfd *output_bfd,
                                                     char **error));
                                                     asection *section,
                                                     bfd *output_bfd,
                                                     char **error));

-

 \f
 static bfd_reloc_status_type ppc_toc16_reloc PARAMS ((bfd *abfd,
                                                      arelent *reloc,
 \f
 static bfd_reloc_status_type ppc_toc16_reloc PARAMS ((bfd *abfd,
                                                      arelent *reloc,


@@ -391,10 +385,7 @@ static bfd_reloc_status_type ppc_imglue_reloc PARAMS ((bfd *abfd,
                                                       bfd *output_bfd,
                                                       char **error));
 
                                                       bfd *output_bfd,
                                                       char **error));
 

-
-

 static boolean in_reloc_p PARAMS((bfd *abfd, reloc_howto_type *howto));
 static boolean in_reloc_p PARAMS((bfd *abfd, reloc_howto_type *howto));

-

 \f
 /* FIXME: It'll take a while to get through all of these. I only need a few to
    get us started, so those I'll make sure work. Those marked FIXME are either
 \f
 /* FIXME: It'll take a while to get through all of these. I only need a few to
    get us started, so those I'll make sure work. Those marked FIXME are either


@@ -418,7 +409,7 @@ static boolean in_reloc_p PARAMS((bfd *abfd, reloc_howto_type *howto));
 /*                    the address of the SYM will be inserted at link time.  */
 /*   TOCREL16       : 16 bit displacement field referring to a slot in       */
 /*                    toc.                                                   */
 /*                    the address of the SYM will be inserted at link time.  */
 /*   TOCREL16       : 16 bit displacement field referring to a slot in       */
 /*                    toc.                                                   */

-/*   TOCREL14       : 16 bit displacement field, similar to REL14 or ADDR14. */
+/*   TOCREL14       : 16 bit displacement field, similar to REL14 or ADDR14.  */

 /*   ADDR32NB       : 32 bit address relative to the virtual origin.         */
 /*                    (On the alpha, this is always a linker generated thunk)*/
 /*                    (i.e. 32bit addr relative to the image base)           */
 /*   ADDR32NB       : 32 bit address relative to the virtual origin.         */
 /*                    (On the alpha, this is always a linker generated thunk)*/
 /*                    (i.e. 32bit addr relative to the image base)           */


@@ -438,32 +429,32 @@ static reloc_howto_type ppc_coff_howto_table[] =
 {
   /* IMAGE_REL_PPC_ABSOLUTE 0x0000   NOP */
   /* Unused: */
 {
   /* IMAGE_REL_PPC_ABSOLUTE 0x0000   NOP */
   /* Unused: */

-  HOWTO (IMAGE_REL_PPC_ABSOLUTE, /* type */                                 
-        0,                      /* rightshift */                           
-        0,                      /* size (0 = byte, 1 = short, 2 = long) */ 
-        0,                      /* bitsize */                   
-        false,                  /* pc_relative */                          
-        0,                      /* bitpos */                               
+  HOWTO (IMAGE_REL_PPC_ABSOLUTE, /* type */
+        0,                      /* rightshift */
+        0,                      /* size (0 = byte, 1 = short, 2 = long) */
+        0,                      /* bitsize */
+        false,                  /* pc_relative */
+        0,                      /* bitpos */

         complain_overflow_dont, /* dont complain_on_overflow */
         complain_overflow_dont, /* dont complain_on_overflow */

-        0,                      /* special_function */                     
+        0,                      /* special_function */

         "ABSOLUTE",             /* name */
         "ABSOLUTE",             /* name */

-        false,                  /* partial_inplace */                      
-        0x00,                   /* src_mask */                             
-        0x00,                   /* dst_mask */                             
+        false,                  /* partial_inplace */
+        0x00,                   /* src_mask */
+        0x00,                   /* dst_mask */

         false),                 /* pcrel_offset */
         false),                 /* pcrel_offset */

-  
+

   /* IMAGE_REL_PPC_ADDR64 0x0001  64-bit address */
   /* Unused: */
   /* IMAGE_REL_PPC_ADDR64 0x0001  64-bit address */
   /* Unused: */

-  HOWTO(IMAGE_REL_PPC_ADDR64,    /* type */                                 
-       0,                       /* rightshift */                           
-       3,                       /* size (0 = byte, 1 = short, 2 = long) */ 
-       64,                      /* bitsize */                   
-       false,                   /* pc_relative */                          
-       0,                       /* bitpos */                               
+  HOWTO(IMAGE_REL_PPC_ADDR64,    /* type */
+       0,                       /* rightshift */
+       3,                       /* size (0 = byte, 1 = short, 2 = long) */
+       64,                      /* bitsize */
+       false,                   /* pc_relative */
+       0,                       /* bitpos */

        complain_overflow_bitfield,      /* complain_on_overflow */
        complain_overflow_bitfield,      /* complain_on_overflow */

-       0,                       /* special_function */                     
+       0,                       /* special_function */

        "ADDR64",               /* name */
        "ADDR64",               /* name */

-       true,                    /* partial_inplace */                      
+       true,                    /* partial_inplace */

        MINUS_ONE,               /* src_mask */
        MINUS_ONE,               /* dst_mask */
        false),                 /* pcrel_offset */
        MINUS_ONE,               /* src_mask */
        MINUS_ONE,               /* dst_mask */
        false),                 /* pcrel_offset */


@@ -471,314 +462,311 @@ static reloc_howto_type ppc_coff_howto_table[] =
   /* IMAGE_REL_PPC_ADDR32 0x0002  32-bit address */
   /* Used: */
   HOWTO (IMAGE_REL_PPC_ADDR32, /* type */
   /* IMAGE_REL_PPC_ADDR32 0x0002  32-bit address */
   /* Used: */
   HOWTO (IMAGE_REL_PPC_ADDR32, /* type */

-        0,                     /* rightshift */                           
-        2,                     /* size (0 = byte, 1 = short, 2 = long) */ 
-        32,                    /* bitsize */                   
-        false,                 /* pc_relative */                          
-        0,                     /* bitpos */                               
+        0,                     /* rightshift */
+        2,                     /* size (0 = byte, 1 = short, 2 = long) */
+        32,                    /* bitsize */
+        false,                 /* pc_relative */
+        0,                     /* bitpos */

         complain_overflow_bitfield, /* complain_on_overflow */
         complain_overflow_bitfield, /* complain_on_overflow */

-        0,                     /* special_function */                     
+        0,                     /* special_function */

         "ADDR32",              /* name */
         "ADDR32",              /* name */

-        true,                  /* partial_inplace */                      
-        0xffffffff,            /* src_mask */                             
-        0xffffffff,            /* dst_mask */                             
+        true,                  /* partial_inplace */
+        0xffffffff,            /* src_mask */
+        0xffffffff,            /* dst_mask */

         false),                /* pcrel_offset */
         false),                /* pcrel_offset */

-  
+

   /* IMAGE_REL_PPC_ADDR24 0x0003  26-bit address, shifted left 2 (branch absolute) */
   /* the LI field is in bit 6 through bit 29 is 24 bits, + 2 for the shift */
   /* Of course, That's the IBM approved bit numbering, which is not what */
   /* IMAGE_REL_PPC_ADDR24 0x0003  26-bit address, shifted left 2 (branch absolute) */
   /* the LI field is in bit 6 through bit 29 is 24 bits, + 2 for the shift */
   /* Of course, That's the IBM approved bit numbering, which is not what */

-  /* anyone else uses.... The li field is in bit 2 thru 25 */ 
+  /* anyone else uses.... The li field is in bit 2 thru 25 */

   /* Used: */
   HOWTO (IMAGE_REL_PPC_ADDR24,  /* type */
   /* Used: */
   HOWTO (IMAGE_REL_PPC_ADDR24,  /* type */

-        0,                     /* rightshift */                           
-        2,                     /* size (0 = byte, 1 = short, 2 = long) */ 
+        0,                     /* rightshift */
+        2,                     /* size (0 = byte, 1 = short, 2 = long) */

         26,                    /* bitsize */
         26,                    /* bitsize */

-        false,                 /* pc_relative */                          
-        0,                     /* bitpos */                               
+        false,                 /* pc_relative */
+        0,                     /* bitpos */

         complain_overflow_bitfield, /* complain_on_overflow */
         complain_overflow_bitfield, /* complain_on_overflow */

-        0,                     /* special_function */                     
+        0,                     /* special_function */

         "ADDR24",              /* name */
         "ADDR24",              /* name */

-        true,                  /* partial_inplace */                      
-        0x07fffffc,            /* src_mask */                             
-        0x07fffffc,            /* dst_mask */                             
+        true,                  /* partial_inplace */
+        0x07fffffc,            /* src_mask */
+        0x07fffffc,            /* dst_mask */

         false),                /* pcrel_offset */
         false),                /* pcrel_offset */

-  
+

   /* IMAGE_REL_PPC_ADDR16 0x0004  16-bit address */
   /* Used: */
   /* IMAGE_REL_PPC_ADDR16 0x0004  16-bit address */
   /* Used: */

-  HOWTO (IMAGE_REL_PPC_ADDR16,  /* type */             
-        0,                     /* rightshift */                           
-        1,                     /* size (0 = byte, 1 = short, 2 = long) */ 
-        16,                    /* bitsize */                   
-        false,                 /* pc_relative */                          
-        0,                     /* bitpos */                               
+  HOWTO (IMAGE_REL_PPC_ADDR16,  /* type */
+        0,                     /* rightshift */
+        1,                     /* size (0 = byte, 1 = short, 2 = long) */
+        16,                    /* bitsize */
+        false,                 /* pc_relative */
+        0,                     /* bitpos */

         complain_overflow_signed, /* complain_on_overflow */
         complain_overflow_signed, /* complain_on_overflow */

-        0,                     /* special_function */                     
+        0,                     /* special_function */

         "ADDR16",              /* name */
         "ADDR16",              /* name */

-        true,                  /* partial_inplace */                      
-        0xffff,                /* src_mask */                             
-        0xffff,                /* dst_mask */                             
+        true,                  /* partial_inplace */
+        0xffff,                /* src_mask */
+        0xffff,                /* dst_mask */

         false),                /* pcrel_offset */
         false),                /* pcrel_offset */

-  
+

   /* IMAGE_REL_PPC_ADDR14 0x0005 */
   /*  16-bit address, shifted left 2 (load doubleword) */
   /* FIXME: the mask is likely wrong, and the bit position may be as well */
   /* Unused: */
   /* IMAGE_REL_PPC_ADDR14 0x0005 */
   /*  16-bit address, shifted left 2 (load doubleword) */
   /* FIXME: the mask is likely wrong, and the bit position may be as well */
   /* Unused: */

-  HOWTO (IMAGE_REL_PPC_ADDR14,  /* type */             
-        1,                     /* rightshift */                           
-        1,                     /* size (0 = byte, 1 = short, 2 = long) */ 
-        16,                    /* bitsize */                   
-        false,                 /* pc_relative */                          
-        0,                     /* bitpos */                               
+  HOWTO (IMAGE_REL_PPC_ADDR14,  /* type */
+        1,                     /* rightshift */
+        1,                     /* size (0 = byte, 1 = short, 2 = long) */
+        16,                    /* bitsize */
+        false,                 /* pc_relative */
+        0,                     /* bitpos */

         complain_overflow_signed, /* complain_on_overflow */
         complain_overflow_signed, /* complain_on_overflow */

-        0,                     /* special_function */                     
+        0,                     /* special_function */

         "ADDR16",              /* name */
         "ADDR16",              /* name */

-        true,                  /* partial_inplace */                      
-        0xffff,                /* src_mask */                             
-        0xffff,                /* dst_mask */                             
+        true,                  /* partial_inplace */
+        0xffff,                /* src_mask */
+        0xffff,                /* dst_mask */

         false),                /* pcrel_offset */
         false),                /* pcrel_offset */

-  
+

   /* IMAGE_REL_PPC_REL24 0x0006 */
   /*   26-bit PC-relative offset, shifted left 2 (branch relative) */
   /* Used: */
   HOWTO (IMAGE_REL_PPC_REL24,   /* type */
   /* IMAGE_REL_PPC_REL24 0x0006 */
   /*   26-bit PC-relative offset, shifted left 2 (branch relative) */
   /* Used: */
   HOWTO (IMAGE_REL_PPC_REL24,   /* type */

-        0,                     /* rightshift */                           
-        2,                     /* size (0 = byte, 1 = short, 2 = long) */ 
-        26,                    /* bitsize */                   
-        true,                  /* pc_relative */                          
-        0,                     /* bitpos */                               
+        0,                     /* rightshift */
+        2,                     /* size (0 = byte, 1 = short, 2 = long) */
+        26,                    /* bitsize */
+        true,                  /* pc_relative */
+        0,                     /* bitpos */

         complain_overflow_signed, /* complain_on_overflow */
         complain_overflow_signed, /* complain_on_overflow */

-        0,                     /* special_function */                     
+        0,                     /* special_function */

         "REL24",               /* name */
         "REL24",               /* name */

-        true,                  /* partial_inplace */                      
-        0x3fffffc,             /* src_mask */                             
-        0x3fffffc,             /* dst_mask */                             
+        true,                  /* partial_inplace */
+        0x3fffffc,             /* src_mask */
+        0x3fffffc,             /* dst_mask */

         false),                /* pcrel_offset */
         false),                /* pcrel_offset */

-  
+

   /* IMAGE_REL_PPC_REL14 0x0007 */
   /*   16-bit PC-relative offset, shifted left 2 (br cond relative) */
   /* FIXME: the mask is likely wrong, and the bit position may be as well */
   /* FIXME: how does it know how far to shift? */
   /* Unused: */
   /* IMAGE_REL_PPC_REL14 0x0007 */
   /*   16-bit PC-relative offset, shifted left 2 (br cond relative) */
   /* FIXME: the mask is likely wrong, and the bit position may be as well */
   /* FIXME: how does it know how far to shift? */
   /* Unused: */

-  HOWTO (IMAGE_REL_PPC_ADDR14,  /* type */             
-        1,                     /* rightshift */                           
-        1,                     /* size (0 = byte, 1 = short, 2 = long) */ 
-        16,                    /* bitsize */                   
-        false,                 /* pc_relative */                          
-        0,                     /* bitpos */                               
+  HOWTO (IMAGE_REL_PPC_ADDR14,  /* type */
+        1,                     /* rightshift */
+        1,                     /* size (0 = byte, 1 = short, 2 = long) */
+        16,                    /* bitsize */
+        false,                 /* pc_relative */
+        0,                     /* bitpos */

         complain_overflow_signed, /* complain_on_overflow */
         complain_overflow_signed, /* complain_on_overflow */

-        0,                     /* special_function */                     
+        0,                     /* special_function */

         "ADDR16",              /* name */
         "ADDR16",              /* name */

-        true,                  /* partial_inplace */                      
-        0xffff,                /* src_mask */                             
-        0xffff,                /* dst_mask */                             
+        true,                  /* partial_inplace */
+        0xffff,                /* src_mask */
+        0xffff,                /* dst_mask */

         true),                 /* pcrel_offset */
         true),                 /* pcrel_offset */

-  
+

   /* IMAGE_REL_PPC_TOCREL16 0x0008 */
   /*   16-bit offset from TOC base */
   /* Used: */
   /* IMAGE_REL_PPC_TOCREL16 0x0008 */
   /*   16-bit offset from TOC base */
   /* Used: */

-  HOWTO (IMAGE_REL_PPC_TOCREL16,/* type */             
-        0,                     /* rightshift */                           
-        1,                     /* size (0 = byte, 1 = short, 2 = long) */ 
-        16,                    /* bitsize */                   
-        false,                 /* pc_relative */                          
-        0,                     /* bitpos */                               
+  HOWTO (IMAGE_REL_PPC_TOCREL16,/* type */
+        0,                     /* rightshift */
+        1,                     /* size (0 = byte, 1 = short, 2 = long) */
+        16,                    /* bitsize */
+        false,                 /* pc_relative */
+        0,                     /* bitpos */

         complain_overflow_dont, /* complain_on_overflow */
         complain_overflow_dont, /* complain_on_overflow */

-        ppc_toc16_reloc,       /* special_function */                     
+        ppc_toc16_reloc,       /* special_function */

         "TOCREL16",            /* name */
         "TOCREL16",            /* name */

-        false,                 /* partial_inplace */                      
-        0xffff,                /* src_mask */                             
-        0xffff,                /* dst_mask */                             
+        false,                 /* partial_inplace */
+        0xffff,                /* src_mask */
+        0xffff,                /* dst_mask */

         false),                /* pcrel_offset */
         false),                /* pcrel_offset */

-  
+

   /* IMAGE_REL_PPC_TOCREL14 0x0009 */
   /*   16-bit offset from TOC base, shifted left 2 (load doubleword) */
   /* Unused: */
   /* IMAGE_REL_PPC_TOCREL14 0x0009 */
   /*   16-bit offset from TOC base, shifted left 2 (load doubleword) */
   /* Unused: */

-  HOWTO (IMAGE_REL_PPC_TOCREL14,/* type */             
-        1,                     /* rightshift */                           
-        1,                     /* size (0 = byte, 1 = short, 2 = long) */ 
-        16,                    /* bitsize */                   
-        false,                 /* pc_relative */                          
-        0,                     /* bitpos */                               
+  HOWTO (IMAGE_REL_PPC_TOCREL14,/* type */
+        1,                     /* rightshift */
+        1,                     /* size (0 = byte, 1 = short, 2 = long) */
+        16,                    /* bitsize */
+        false,                 /* pc_relative */
+        0,                     /* bitpos */

         complain_overflow_signed, /* complain_on_overflow */
         complain_overflow_signed, /* complain_on_overflow */

-        0,                     /* special_function */                     
+        0,                     /* special_function */

         "TOCREL14",            /* name */
         "TOCREL14",            /* name */

-        false,                 /* partial_inplace */                      
-        0xffff,                /* src_mask */                             
-        0xffff,                /* dst_mask */                             
+        false,                 /* partial_inplace */
+        0xffff,                /* src_mask */
+        0xffff,                /* dst_mask */

         false),                /* pcrel_offset */
         false),                /* pcrel_offset */

-  
+

   /* IMAGE_REL_PPC_ADDR32NB 0x000A */
   /*   32-bit addr w/ image base */
   /* Unused: */
   /* IMAGE_REL_PPC_ADDR32NB 0x000A */
   /*   32-bit addr w/ image base */
   /* Unused: */

-  HOWTO (IMAGE_REL_PPC_ADDR32NB,/* type */             
-        0,                     /* rightshift */                           
-        2,                     /* size (0 = byte, 1 = short, 2 = long) */ 
-        32,                    /* bitsize */                   
-        false,                 /* pc_relative */                          
-        0,                     /* bitpos */                               
+  HOWTO (IMAGE_REL_PPC_ADDR32NB,/* type */
+        0,                     /* rightshift */
+        2,                     /* size (0 = byte, 1 = short, 2 = long) */
+        32,                    /* bitsize */
+        false,                 /* pc_relative */
+        0,                     /* bitpos */

         complain_overflow_signed, /* complain_on_overflow */
         complain_overflow_signed, /* complain_on_overflow */

-        0,                     /* special_function */                     
+        0,                     /* special_function */

         "ADDR32NB",            /* name */
         "ADDR32NB",            /* name */

-        true,                  /* partial_inplace */                      
-        0xffffffff,            /* src_mask */                             
-        0xffffffff,            /* dst_mask */                             
+        true,                  /* partial_inplace */
+        0xffffffff,            /* src_mask */
+        0xffffffff,            /* dst_mask */

         false),                 /* pcrel_offset */
         false),                 /* pcrel_offset */

-  
+

   /* IMAGE_REL_PPC_SECREL 0x000B */
   /*   va of containing section (as in an image sectionhdr) */
   /* Unused: */
   /* IMAGE_REL_PPC_SECREL 0x000B */
   /*   va of containing section (as in an image sectionhdr) */
   /* Unused: */

-  HOWTO (IMAGE_REL_PPC_SECREL,/* type */             
-        0,                     /* rightshift */                           
-        2,                     /* size (0 = byte, 1 = short, 2 = long) */ 
-        32,                    /* bitsize */                   
-        false,                 /* pc_relative */                          
-        0,                     /* bitpos */                               
+  HOWTO (IMAGE_REL_PPC_SECREL,/* type */
+        0,                     /* rightshift */
+        2,                     /* size (0 = byte, 1 = short, 2 = long) */
+        32,                    /* bitsize */
+        false,                 /* pc_relative */
+        0,                     /* bitpos */

         complain_overflow_signed, /* complain_on_overflow */
         complain_overflow_signed, /* complain_on_overflow */

-        ppc_secrel_reloc,      /* special_function */                     
+        ppc_secrel_reloc,      /* special_function */

         "SECREL",              /* name */
         "SECREL",              /* name */

-        true,                  /* partial_inplace */                      
-        0xffffffff,            /* src_mask */                             
-        0xffffffff,            /* dst_mask */                             
+        true,                  /* partial_inplace */
+        0xffffffff,            /* src_mask */
+        0xffffffff,            /* dst_mask */

         true),                 /* pcrel_offset */
 
   /* IMAGE_REL_PPC_SECTION 0x000C */
   /*   sectionheader number */
   /* Unused: */
         true),                 /* pcrel_offset */
 
   /* IMAGE_REL_PPC_SECTION 0x000C */
   /*   sectionheader number */
   /* Unused: */

-  HOWTO (IMAGE_REL_PPC_SECTION,/* type */             
-        0,                     /* rightshift */                           
-        2,                     /* size (0 = byte, 1 = short, 2 = long) */ 
-        32,                    /* bitsize */                   
-        false,                 /* pc_relative */                          
-        0,                     /* bitpos */                               
+  HOWTO (IMAGE_REL_PPC_SECTION,/* type */
+        0,                     /* rightshift */
+        2,                     /* size (0 = byte, 1 = short, 2 = long) */
+        32,                    /* bitsize */
+        false,                 /* pc_relative */
+        0,                     /* bitpos */

         complain_overflow_signed, /* complain_on_overflow */
         complain_overflow_signed, /* complain_on_overflow */

-        ppc_section_reloc,     /* special_function */                     
+        ppc_section_reloc,     /* special_function */

         "SECTION",             /* name */
         "SECTION",             /* name */

-        true,                  /* partial_inplace */                      
-        0xffffffff,            /* src_mask */                             
-        0xffffffff,            /* dst_mask */                             
+        true,                  /* partial_inplace */
+        0xffffffff,            /* src_mask */
+        0xffffffff,            /* dst_mask */

         true),                 /* pcrel_offset */
 
   /* IMAGE_REL_PPC_IFGLUE 0x000D */
   /*   substitute TOC restore instruction iff symbol is glue code */
   /* Used: */
         true),                 /* pcrel_offset */
 
   /* IMAGE_REL_PPC_IFGLUE 0x000D */
   /*   substitute TOC restore instruction iff symbol is glue code */
   /* Used: */

-  HOWTO (IMAGE_REL_PPC_IFGLUE,/* type */             
-        0,                     /* rightshift */                           
-        2,                     /* size (0 = byte, 1 = short, 2 = long) */ 
-        32,                    /* bitsize */                   
-        false,                 /* pc_relative */                          
-        0,                     /* bitpos */                               
+  HOWTO (IMAGE_REL_PPC_IFGLUE,/* type */
+        0,                     /* rightshift */
+        2,                     /* size (0 = byte, 1 = short, 2 = long) */
+        32,                    /* bitsize */
+        false,                 /* pc_relative */
+        0,                     /* bitpos */

         complain_overflow_signed, /* complain_on_overflow */
         complain_overflow_signed, /* complain_on_overflow */

-        0,                     /* special_function */                     
+        0,                     /* special_function */

         "IFGLUE",              /* name */
         "IFGLUE",              /* name */

-        true,                  /* partial_inplace */                      
-        0xffffffff,            /* src_mask */                             
-        0xffffffff,            /* dst_mask */                             
+        true,                  /* partial_inplace */
+        0xffffffff,            /* src_mask */
+        0xffffffff,            /* dst_mask */

         false),                /* pcrel_offset */
 
   /* IMAGE_REL_PPC_IMGLUE 0x000E */
   /*   symbol is glue code; virtual address is TOC restore instruction */
   /* Unused: */
         false),                /* pcrel_offset */
 
   /* IMAGE_REL_PPC_IMGLUE 0x000E */
   /*   symbol is glue code; virtual address is TOC restore instruction */
   /* Unused: */

-  HOWTO (IMAGE_REL_PPC_IMGLUE,/* type */             
-        0,                     /* rightshift */                           
-        2,                     /* size (0 = byte, 1 = short, 2 = long) */ 
-        32,                    /* bitsize */                   
-        false,                 /* pc_relative */                          
-        0,                     /* bitpos */                               
+  HOWTO (IMAGE_REL_PPC_IMGLUE,/* type */
+        0,                     /* rightshift */
+        2,                     /* size (0 = byte, 1 = short, 2 = long) */
+        32,                    /* bitsize */
+        false,                 /* pc_relative */
+        0,                     /* bitpos */

         complain_overflow_dont, /* complain_on_overflow */
         complain_overflow_dont, /* complain_on_overflow */

-        ppc_imglue_reloc,      /* special_function */                     
+        ppc_imglue_reloc,      /* special_function */

         "IMGLUE",              /* name */
         "IMGLUE",              /* name */

-        false,                 /* partial_inplace */                      
-        0xffffffff,            /* src_mask */                             
-        0xffffffff,            /* dst_mask */                             
+        false,                 /* partial_inplace */
+        0xffffffff,            /* src_mask */
+        0xffffffff,            /* dst_mask */

         false),                 /* pcrel_offset */
 
   /* IMAGE_REL_PPC_SECREL16 0x000F */
   /*   va of containing section (limited to 16 bits) */
   /* Unused: */
         false),                 /* pcrel_offset */
 
   /* IMAGE_REL_PPC_SECREL16 0x000F */
   /*   va of containing section (limited to 16 bits) */
   /* Unused: */

-  HOWTO (IMAGE_REL_PPC_SECREL16,/* type */             
-        0,                     /* rightshift */                           
-        1,                     /* size (0 = byte, 1 = short, 2 = long) */ 
-        16,                    /* bitsize */                   
-        false,                 /* pc_relative */                          
-        0,                     /* bitpos */                               
+  HOWTO (IMAGE_REL_PPC_SECREL16,/* type */
+        0,                     /* rightshift */
+        1,                     /* size (0 = byte, 1 = short, 2 = long) */
+        16,                    /* bitsize */
+        false,                 /* pc_relative */
+        0,                     /* bitpos */

         complain_overflow_signed, /* complain_on_overflow */
         complain_overflow_signed, /* complain_on_overflow */

-        0,                     /* special_function */                     
+        0,                     /* special_function */

         "SECREL16",            /* name */
         "SECREL16",            /* name */

-        true,                  /* partial_inplace */                      
-        0xffff,                /* src_mask */                             
-        0xffff,                /* dst_mask */                             
+        true,                  /* partial_inplace */
+        0xffff,                /* src_mask */
+        0xffff,                /* dst_mask */

         true),                 /* pcrel_offset */
 
   /* IMAGE_REL_PPC_REFHI             0x0010 */
   /* Unused: */
         true),                 /* pcrel_offset */
 
   /* IMAGE_REL_PPC_REFHI             0x0010 */
   /* Unused: */

-  HOWTO (IMAGE_REL_PPC_REFHI,   /* type */             
-        0,                     /* rightshift */                           
-        1,                     /* size (0 = byte, 1 = short, 2 = long) */ 
-        16,                    /* bitsize */                   
-        false,                 /* pc_relative */                          
-        0,                     /* bitpos */                               
+  HOWTO (IMAGE_REL_PPC_REFHI,   /* type */
+        0,                     /* rightshift */
+        1,                     /* size (0 = byte, 1 = short, 2 = long) */
+        16,                    /* bitsize */
+        false,                 /* pc_relative */
+        0,                     /* bitpos */

         complain_overflow_signed, /* complain_on_overflow */
         complain_overflow_signed, /* complain_on_overflow */

-        ppc_refhi_reloc,       /* special_function */                     
+        ppc_refhi_reloc,       /* special_function */

         "REFHI",               /* name */
         "REFHI",               /* name */

-        true,                  /* partial_inplace */                      
-        0xffffffff,            /* src_mask */                             
-        0xffffffff,            /* dst_mask */                             
+        true,                  /* partial_inplace */
+        0xffffffff,            /* src_mask */
+        0xffffffff,            /* dst_mask */

         false),                 /* pcrel_offset */
 
   /* IMAGE_REL_PPC_REFLO             0x0011 */
   /* Unused: */
         false),                 /* pcrel_offset */
 
   /* IMAGE_REL_PPC_REFLO             0x0011 */
   /* Unused: */

-  HOWTO (IMAGE_REL_PPC_REFLO,   /* type */             
-        0,                     /* rightshift */                           
-        1,                     /* size (0 = byte, 1 = short, 2 = long) */ 
-        16,                    /* bitsize */                   
-        false,                 /* pc_relative */                          
-        0,                     /* bitpos */                               
+  HOWTO (IMAGE_REL_PPC_REFLO,   /* type */
+        0,                     /* rightshift */
+        1,                     /* size (0 = byte, 1 = short, 2 = long) */
+        16,                    /* bitsize */
+        false,                 /* pc_relative */
+        0,                     /* bitpos */

         complain_overflow_signed, /* complain_on_overflow */
         complain_overflow_signed, /* complain_on_overflow */

-        ppc_refhi_reloc,       /* special_function */                     
+        ppc_refhi_reloc,       /* special_function */

         "REFLO",               /* name */
         "REFLO",               /* name */

-        true,                  /* partial_inplace */                      
-        0xffffffff,            /* src_mask */                             
-        0xffffffff,            /* dst_mask */                             
+        true,                  /* partial_inplace */
+        0xffffffff,            /* src_mask */
+        0xffffffff,            /* dst_mask */

         false),                /* pcrel_offset */
 
   /* IMAGE_REL_PPC_PAIR              0x0012 */
   /* Unused: */
         false),                /* pcrel_offset */
 
   /* IMAGE_REL_PPC_PAIR              0x0012 */
   /* Unused: */

-  HOWTO (IMAGE_REL_PPC_PAIR,    /* type */             
-        0,                     /* rightshift */                           
-        1,                     /* size (0 = byte, 1 = short, 2 = long) */ 
-        16,                    /* bitsize */                   
-        false,                 /* pc_relative */                          
-        0,                     /* bitpos */                               
+  HOWTO (IMAGE_REL_PPC_PAIR,    /* type */
+        0,                     /* rightshift */
+        1,                     /* size (0 = byte, 1 = short, 2 = long) */
+        16,                    /* bitsize */
+        false,                 /* pc_relative */
+        0,                     /* bitpos */

         complain_overflow_signed, /* complain_on_overflow */
         complain_overflow_signed, /* complain_on_overflow */

-        ppc_pair_reloc,        /* special_function */                     
+        ppc_pair_reloc,        /* special_function */

         "PAIR",                /* name */
         "PAIR",                /* name */

-        true,                  /* partial_inplace */                      
-        0xffffffff,            /* src_mask */                             
-        0xffffffff,            /* dst_mask */                             
+        true,                  /* partial_inplace */
+        0xffffffff,            /* src_mask */
+        0xffffffff,            /* dst_mask */

         false),                /* pcrel_offset */
 
   /* IMAGE_REL_PPC_TOCREL16_DEFN 0x0013 */
   /*   16-bit offset from TOC base, without causing a definition */
   /* Used: */
         false),                /* pcrel_offset */
 
   /* IMAGE_REL_PPC_TOCREL16_DEFN 0x0013 */
   /*   16-bit offset from TOC base, without causing a definition */
   /* Used: */

-  HOWTO ( (IMAGE_REL_PPC_TOCREL16 | IMAGE_REL_PPC_TOCDEFN), /* type */ 
-        0,                     /* rightshift */                           
-        1,                     /* size (0 = byte, 1 = short, 2 = long) */ 
-        16,                    /* bitsize */                   
-        false,                 /* pc_relative */                          
-        0,                     /* bitpos */                               
+  HOWTO ( (IMAGE_REL_PPC_TOCREL16 | IMAGE_REL_PPC_TOCDEFN), /* type */
+        0,                     /* rightshift */
+        1,                     /* size (0 = byte, 1 = short, 2 = long) */
+        16,                    /* bitsize */
+        false,                 /* pc_relative */
+        0,                     /* bitpos */

         complain_overflow_dont, /* complain_on_overflow */
         complain_overflow_dont, /* complain_on_overflow */

-        0,                     /* special_function */                     
+        0,                     /* special_function */

         "TOCREL16, TOCDEFN",   /* name */
         "TOCREL16, TOCDEFN",   /* name */

-        false,                 /* partial_inplace */                      
-        0xffff,                /* src_mask */                             
-        0xffff,                /* dst_mask */                             
+        false,                 /* partial_inplace */
+        0xffff,                /* src_mask */
+        0xffff,                /* dst_mask */

         false),                /* pcrel_offset */
 
 };
         false),                /* pcrel_offset */
 
 };

-
-

 \f
 \f

-

 /* Some really cheezy macros that can be turned on to test stderr :-) */
 
 #ifdef DEBUG_RELOC
 /* Some really cheezy macros that can be turned on to test stderr :-) */
 
 #ifdef DEBUG_RELOC


@@ -788,19 +776,19 @@ static reloc_howto_type ppc_coff_howto_table[] =
    if (i == 0)                                               \
      {                                                       \
        i = 1;                                                \
    if (i == 0)                                               \
      {                                                       \
        i = 1;                                                \

-       fprintf(stderr,_("Unimplemented Relocation -- %s\n"),x); \
+       fprintf (stderr,_("Unimplemented Relocation -- %s\n"),x); \

      }                                                       \
 }
 
 #define DUMP_RELOC(n,r)                              \
 {                                                    \
      }                                                       \
 }
 
 #define DUMP_RELOC(n,r)                              \
 {                                                    \

-   fprintf(stderr,"%s sym %d, addr %d, addend %d\n", \
+   fprintf (stderr,"%s sym %d, addr %d, addend %d\n", \

           n, (*(r->sym_ptr_ptr))->name,             \
           r->address, r->addend);                   \
 }
 
           n, (*(r->sym_ptr_ptr))->name,             \
           r->address, r->addend);                   \
 }
 

-/* Given a reloc name, n, and a pointer to an internal_reloc, 
-   dump out interesting information on the contents 
+/* Given a reloc name, n, and a pointer to an internal_reloc,
+   dump out interesting information on the contents

 
 #define n_name         _n._n_name
 #define n_zeroes       _n._n_n._n_zeroes
 
 #define n_name         _n._n_name
 #define n_zeroes       _n._n_n._n_zeroes


@@ -810,7 +798,7 @@ static reloc_howto_type ppc_coff_howto_table[] =
 
 #define DUMP_RELOC2(n,r)                     \
 {                                            \
 
 #define DUMP_RELOC2(n,r)                     \
 {                                            \

-   fprintf(stderr,"%s sym %d, r_vaddr %d %s\n", \
+   fprintf (stderr,"%s sym %d, r_vaddr %d %s\n", \

           n, r->r_symndx, r->r_vaddr,\
           (((r->r_type) & IMAGE_REL_PPC_TOCDEFN) == 0) \
           ?" ":" TOCDEFN"  );      \
           n, r->r_symndx, r->r_vaddr,\
           (((r->r_type) & IMAGE_REL_PPC_TOCDEFN) == 0) \
           ?" ":" TOCDEFN"  );      \


@@ -821,8 +809,6 @@ static reloc_howto_type ppc_coff_howto_table[] =
 #define DUMP_RELOC(n,r)
 #define DUMP_RELOC2(n,r)
 #endif
 #define DUMP_RELOC(n,r)
 #define DUMP_RELOC2(n,r)
 #endif

-
-

 \f
 /* toc construction and management routines */
 
 \f
 /* toc construction and management routines */
 


@@ -847,7 +833,7 @@ enum ref_category
 {
   priv,
   pub,
 {
   priv,
   pub,

-  data
+  tocdata

 };
 
 struct list_ele
 };
 
 struct list_ele


@@ -863,18 +849,19 @@ extern struct list_ele *head;
 extern struct list_ele *tail;
 
 static void record_toc
 extern struct list_ele *tail;
 
 static void record_toc

-  PARAMS ((asection *, int, enum ref_category, const char *));
+  PARAMS ((asection *, bfd_signed_vma, enum ref_category, const char *));

 
 static void
 record_toc (toc_section, our_toc_offset, cat, name)
      asection *toc_section;
 
 static void
 record_toc (toc_section, our_toc_offset, cat, name)
      asection *toc_section;

-     int our_toc_offset;
+     bfd_signed_vma our_toc_offset;

      enum ref_category cat;
      const char *name;
 {
   /* add this entry to our toc addr-offset-name list */
      enum ref_category cat;
      const char *name;
 {
   /* add this entry to our toc addr-offset-name list */

-  struct list_ele *t;
-  t = (struct list_ele *) bfd_malloc (sizeof (struct list_ele));
+  bfd_size_type amt = sizeof (struct list_ele);
+  struct list_ele *t = (struct list_ele *) bfd_malloc (amt);
+

   if (t == NULL)
     abort ();
   t->next = 0;
   if (t == NULL)
     abort ();
   t->next = 0;


@@ -924,26 +911,26 @@ ppc_record_toc_entry(abfd, info, sec, sym, toc_kind)
       HASH_CHECK(h);
     }
 
       HASH_CHECK(h);
     }
 

-  if (h == 0) 
-    { 
+  if (h == 0)
+    {

       local_syms = obj_coff_local_toc_table(abfd);
       if (local_syms == 0)
        {
          unsigned int i;
       local_syms = obj_coff_local_toc_table(abfd);
       if (local_syms == 0)
        {
          unsigned int i;

+         bfd_size_type amt;

          /* allocate a table */
          /* allocate a table */

-         local_syms = 
-           (int *) bfd_zalloc (abfd, 
-                               obj_raw_syment_count(abfd) * sizeof(int));
+         amt = (bfd_size_type) obj_raw_syment_count (abfd) * sizeof (int);
+         local_syms = (int *) bfd_zalloc (abfd, amt);

          if (local_syms == 0)
            return false;
          if (local_syms == 0)
            return false;

-         obj_coff_local_toc_table(abfd) = local_syms;
-         for (i = 0; i < obj_raw_syment_count(abfd); ++i)
+         obj_coff_local_toc_table (abfd) = local_syms;
+         for (i = 0; i < obj_raw_syment_count (abfd); ++i)

            {
            {

-             SET_UNALLOCATED(local_syms[i]);
+             SET_UNALLOCATED (local_syms[i]);

            }
        }
 
            }
        }
 

-      if (IS_UNALLOCATED(local_syms[sym])) 
+      if (IS_UNALLOCATED(local_syms[sym]))

        {
          local_syms[sym] = global_toc_size;
          global_toc_size += 4;
        {
          local_syms[sym] = global_toc_size;
          global_toc_size += 4;


@@ -1002,20 +989,19 @@ ppc_mark_symbol_as_glue(abfd, sym, rel)
 
 #endif /* COFF_IMAGE_WITH_PE */
 \f
 
 #endif /* COFF_IMAGE_WITH_PE */
 \f

-

 /* Return true if this relocation should
 /* Return true if this relocation should

-   appear in the output .reloc section. */
+   appear in the output .reloc section.  */

 
 static boolean in_reloc_p(abfd, howto)
      bfd * abfd ATTRIBUTE_UNUSED;
      reloc_howto_type *howto;
 {
 
 static boolean in_reloc_p(abfd, howto)
      bfd * abfd ATTRIBUTE_UNUSED;
      reloc_howto_type *howto;
 {

-  return 
-    (! howto->pc_relative) 
+  return
+    (! howto->pc_relative)

       && (howto->type != IMAGE_REL_PPC_ADDR32NB)
       && (howto->type != IMAGE_REL_PPC_TOCREL16)
       && (howto->type != IMAGE_REL_PPC_IMGLUE)
       && (howto->type != IMAGE_REL_PPC_ADDR32NB)
       && (howto->type != IMAGE_REL_PPC_TOCREL16)
       && (howto->type != IMAGE_REL_PPC_IMGLUE)

-      && (howto->type != IMAGE_REL_PPC_IFGLUE) 
+      && (howto->type != IMAGE_REL_PPC_IFGLUE)

       && (howto->type != IMAGE_REL_PPC_SECREL)
       && (howto->type != IMAGE_REL_PPC_SECTION)
       && (howto->type != IMAGE_REL_PPC_SECREL16)
       && (howto->type != IMAGE_REL_PPC_SECREL)
       && (howto->type != IMAGE_REL_PPC_SECTION)
       && (howto->type != IMAGE_REL_PPC_SECREL16)


@@ -1023,7 +1009,7 @@ static boolean in_reloc_p(abfd, howto)
       && (howto->type != IMAGE_REL_PPC_REFLO)
       && (howto->type != IMAGE_REL_PPC_PAIR)
       && (howto->type != IMAGE_REL_PPC_TOCREL16_DEFN) ;
       && (howto->type != IMAGE_REL_PPC_REFLO)
       && (howto->type != IMAGE_REL_PPC_PAIR)
       && (howto->type != IMAGE_REL_PPC_TOCREL16_DEFN) ;

-}     
+}

 
 #if 0
 
 
 #if 0
 


@@ -1050,39 +1036,38 @@ pe_ppc_reloc (abfd, reloc_entry, symbol_in, data, input_section, output_bfd,
   unsigned long sym_value;
   unsigned short r_type;
   unsigned long addr = reloc_entry->address ; /*+ input_section->vma*/
   unsigned long sym_value;
   unsigned short r_type;
   unsigned long addr = reloc_entry->address ; /*+ input_section->vma*/

-       
+

   r_type = reloc_entry->howto->type;
 
   r_type = reloc_entry->howto->type;
 

-  if (output_bfd) 
+  if (output_bfd)

     {
       /* Partial linking - do nothing */
       reloc_entry->address += input_section->output_offset;
     {
       /* Partial linking - do nothing */
       reloc_entry->address += input_section->output_offset;

-      return bfd_reloc_ok; 
+      return bfd_reloc_ok;

     }
 
   if (symbol_in != NULL
       && bfd_is_und_section (symbol_in->section))
     {
       /* Keep the state machine happy in case we're called again */
     }
 
   if (symbol_in != NULL
       && bfd_is_und_section (symbol_in->section))
     {
       /* Keep the state machine happy in case we're called again */

-      if (r_type == IMAGE_REL_PPC_REFHI) 
+      if (r_type == IMAGE_REL_PPC_REFHI)

        {
          part1_consth_active = true;
          part1_consth_value  = 0;
        }
       return(bfd_reloc_undefined);
     }
        {
          part1_consth_active = true;
          part1_consth_value  = 0;
        }
       return(bfd_reloc_undefined);
     }

-  
-  if ((part1_consth_active) && (r_type != IMAGE_REL_PPC_PAIR)) 
+
+  if ((part1_consth_active) && (r_type != IMAGE_REL_PPC_PAIR))

     {
       part1_consth_active = false;
       *error_message = (char *) _("Missing PAIR");
       return(bfd_reloc_dangerous);
     }
 
     {
       part1_consth_active = false;
       *error_message = (char *) _("Missing PAIR");
       return(bfd_reloc_dangerous);
     }
 

-

   sym_value = get_symbol_value(symbol_in);
   sym_value = get_symbol_value(symbol_in);

-  
-  return(bfd_reloc_ok);        
+
+  return(bfd_reloc_ok);

 }
 
 #endif /* 0 */
 }
 
 #endif /* 0 */


@@ -1108,13 +1093,13 @@ coff_ppc_relocate_section (output_bfd, info, input_bfd, input_section,
   asection *toc_section = 0;
   bfd_vma relocation;
   reloc_howto_type *howto = 0;
   asection *toc_section = 0;
   bfd_vma relocation;
   reloc_howto_type *howto = 0;

-  
+

   /* If we are performing a relocateable link, we don't need to do a
      thing.  The caller will take care of adjusting the reloc
      addresses and symbol indices.  */
   if (info->relocateable)
     return true;
   /* If we are performing a relocateable link, we don't need to do a
      thing.  The caller will take care of adjusting the reloc
      addresses and symbol indices.  */
   if (info->relocateable)
     return true;

-  
+

   hihalf = false;
   hihalf_val = 0;
 
   hihalf = false;
   hihalf_val = 0;
 


@@ -1133,7 +1118,7 @@ coff_ppc_relocate_section (output_bfd, info, input_bfd, input_section,
 
       unsigned short r_type  = EXTRACT_TYPE (rel->r_type);
       unsigned short r_flags = EXTRACT_FLAGS(rel->r_type);
 
       unsigned short r_type  = EXTRACT_TYPE (rel->r_type);
       unsigned short r_flags = EXTRACT_FLAGS(rel->r_type);

-  
+

       symndx = rel->r_symndx;
       loc = contents + rel->r_vaddr - input_section->vma;
 
       symndx = rel->r_symndx;
       loc = contents + rel->r_vaddr - input_section->vma;
 


@@ -1147,9 +1132,9 @@ coff_ppc_relocate_section (output_bfd, info, input_bfd, input_section,
        }
       else
        {
        }
       else
        {

-         h = (struct ppc_coff_link_hash_entry *) 
+         h = (struct ppc_coff_link_hash_entry *)

            (obj_coff_sym_hashes (input_bfd)[symndx]);
            (obj_coff_sym_hashes (input_bfd)[symndx]);

-         if (h != 0) 
+         if (h != 0)

            {
              HASH_CHECK(h);
            }
            {
              HASH_CHECK(h);
            }


@@ -1159,8 +1144,8 @@ coff_ppc_relocate_section (output_bfd, info, input_bfd, input_section,
 
       if (r_type == IMAGE_REL_PPC_IMGLUE && h == 0)
        {
 
       if (r_type == IMAGE_REL_PPC_IMGLUE && h == 0)
        {

-         /* An IMGLUE reloc must have a name. Something is very wrong. */
-         abort();
+         /* An IMGLUE reloc must have a name. Something is very wrong.  */
+         abort ();

        }
 
       sec = NULL;
        }
 
       sec = NULL;


@@ -1197,42 +1182,42 @@ coff_ppc_relocate_section (output_bfd, info, input_bfd, input_section,
            {
              if (! ((*info->callbacks->undefined_symbol)
                     (info, h->root.root.root.string, input_bfd, input_section,
            {
              if (! ((*info->callbacks->undefined_symbol)
                     (info, h->root.root.root.string, input_bfd, input_section,

-                     rel->r_vaddr - input_section->vma)))
+                     rel->r_vaddr - input_section->vma, true)))

                return false;
            }
        }
 
       rstat = bfd_reloc_ok;
                return false;
            }
        }
 
       rstat = bfd_reloc_ok;

-      
+

       /* Each case must do its own relocation, setting rstat appropriately */
       switch (r_type)
        {
        default:
          (*_bfd_error_handler)
            (_("%s: unsupported relocation type 0x%02x"),
       /* Each case must do its own relocation, setting rstat appropriately */
       switch (r_type)
        {
        default:
          (*_bfd_error_handler)
            (_("%s: unsupported relocation type 0x%02x"),

-            bfd_get_filename (input_bfd), r_type);
+            bfd_archive_filename (input_bfd), r_type);

          bfd_set_error (bfd_error_bad_value);
          return false;
        case IMAGE_REL_PPC_TOCREL16:
          {
          bfd_set_error (bfd_error_bad_value);
          return false;
        case IMAGE_REL_PPC_TOCREL16:
          {

-           bfd_vma our_toc_offset;
+           bfd_signed_vma our_toc_offset;

            int fixit;
 
            DUMP_RELOC2(howto->name, rel);
 
            int fixit;
 
            DUMP_RELOC2(howto->name, rel);
 

-           if (toc_section == 0) 
+           if (toc_section == 0)

              {
              {

-               toc_section = bfd_get_section_by_name (bfd_of_toc_owner, 
+               toc_section = bfd_get_section_by_name (bfd_of_toc_owner,

                                                       TOC_SECTION_NAME);
 
                                                       TOC_SECTION_NAME);
 

-               if ( toc_section == NULL ) 
+               if ( toc_section == NULL )

                  {
                  {

-                   /* There is no toc section. Something is very wrong. */
-                   abort();
+                   /* There is no toc section. Something is very wrong.  */
+                   abort ();

                  }
              }
 
                  }
              }
 

-           /* 
+           /*

             *  Amazing bit tricks present. As we may have seen earlier, we
             *  use the 1 bit to tell us whether or not a toc offset has been
             *  allocated. Now that they've all been allocated, we will use
             *  Amazing bit tricks present. As we may have seen earlier, we
             *  use the 1 bit to tell us whether or not a toc offset has been
             *  allocated. Now that they've all been allocated, we will use


@@ -1253,7 +1238,7 @@ coff_ppc_relocate_section (output_bfd, info, input_bfd, input_section,
 
                if (IS_WRITTEN(our_toc_offset))
                  {
 
                if (IS_WRITTEN(our_toc_offset))
                  {

-                   /* if it has been written out, it is marked with the 
+                   /* if it has been written out, it is marked with the

                       1 bit. Fix up our offset, but do not write it out
                       again.
                     */
                       1 bit. Fix up our offset, but do not write it out
                       again.
                     */


@@ -1262,13 +1247,10 @@ coff_ppc_relocate_section (output_bfd, info, input_bfd, input_section,
                else
                  {
                    /* write out the toc entry */
                else
                  {
                    /* write out the toc entry */

-                   record_toc(toc_section, 
-                              our_toc_offset, 
-                              priv, 
-                              strdup(name));
+                   record_toc (toc_section, our_toc_offset, priv,
+                               strdup (name));

 
 

-                   bfd_put_32(output_bfd,
-                              val,
+                   bfd_put_32 (output_bfd, val,

                               toc_section->contents + our_toc_offset);
 
                    MARK_AS_WRITTEN(local_toc_table[symndx]);
                               toc_section->contents + our_toc_offset);
 
                    MARK_AS_WRITTEN(local_toc_table[symndx]);


@@ -1280,43 +1262,44 @@ coff_ppc_relocate_section (output_bfd, info, input_bfd, input_section,
                const char *name = h->root.root.root.string;
                our_toc_offset = h->toc_offset;
 
                const char *name = h->root.root.root.string;
                our_toc_offset = h->toc_offset;
 

-               if ((r_flags & IMAGE_REL_PPC_TOCDEFN) 
+               if ((r_flags & IMAGE_REL_PPC_TOCDEFN)

                    == IMAGE_REL_PPC_TOCDEFN )
                  {
                    == IMAGE_REL_PPC_TOCDEFN )
                  {

-                   /* This is unbelievable cheese. Some knowledgable asm 
-                      hacker has decided to use r2 as a base for loading 
-                      a value. He/She does this by setting the tocdefn bit, 
-                      and not supplying a toc definition. The behaviour is 
-                      then to use the difference between the value of the 
-                      symbol and the actual location of the toc as the toc 
-                      index. 
+                   /* This is unbelievable cheese. Some knowledgable asm
+                      hacker has decided to use r2 as a base for loading
+                      a value. He/She does this by setting the tocdefn bit,
+                      and not supplying a toc definition. The behaviour is
+                      then to use the difference between the value of the
+                      symbol and the actual location of the toc as the toc
+                      index.

 
                       In fact, what is usually happening is, because the
                       Import Address Table is mapped immediately following
                       the toc, some trippy library code trying for speed on
 
                       In fact, what is usually happening is, because the
                       Import Address Table is mapped immediately following
                       the toc, some trippy library code trying for speed on

-                      dll linkage, takes advantage of that and considers 
+                      dll linkage, takes advantage of that and considers

                       the IAT to be part of the toc, thus saving a load.
                    */
 
                       the IAT to be part of the toc, thus saving a load.
                    */
 

-                   our_toc_offset = val - 
-                     (toc_section->output_section->vma + 
-                      toc_section->output_offset);
+                   our_toc_offset = val - (toc_section->output_section->vma
+                                           + toc_section->output_offset);

 
                    /* The size must still fit in a 16bit displacment */
 
                    /* The size must still fit in a 16bit displacment */

-                   if (our_toc_offset >= 65535)
+                   if ((bfd_vma) our_toc_offset >= 65535)

                      {
                        (*_bfd_error_handler)
                      {
                        (*_bfd_error_handler)

-                         (_("%s: Relocation for %s of %x exceeds Toc size limit"), 
-                          bfd_get_filename (input_bfd), name, our_toc_offset);
+                         (_("%s: Relocation for %s of %lx exceeds Toc size limit"),
+                          bfd_archive_filename (input_bfd), name,
+                          (unsigned long) our_toc_offset);

                        bfd_set_error (bfd_error_bad_value);
                        return false;
                      }
 
                        bfd_set_error (bfd_error_bad_value);
                        return false;
                      }
 

-                   record_toc(toc_section, our_toc_offset, pub, strdup(name));
+                   record_toc (toc_section, our_toc_offset, pub,
+                               strdup (name));

                  }
                else if (IS_WRITTEN(our_toc_offset))
                  {
                  }
                else if (IS_WRITTEN(our_toc_offset))
                  {

-                   /* if it has been written out, it is marked with the 
+                   /* if it has been written out, it is marked with the

                       1 bit. Fix up our offset, but do not write it out
                       again.
                     */
                       1 bit. Fix up our offset, but do not write it out
                       again.
                     */


@@ -1324,11 +1307,11 @@ coff_ppc_relocate_section (output_bfd, info, input_bfd, input_section,
                  }
                else
                  {
                  }
                else
                  {

-                   record_toc(toc_section, our_toc_offset, pub, strdup(name));
+                   record_toc(toc_section, our_toc_offset, pub,
+                              strdup (name));

 
                    /* write out the toc entry */
 
                    /* write out the toc entry */

-                   bfd_put_32(output_bfd,
-                              val,
+                   bfd_put_32 (output_bfd, val,

                               toc_section->contents + our_toc_offset);
 
                    MARK_AS_WRITTEN(h->toc_offset);
                               toc_section->contents + our_toc_offset);
 
                    MARK_AS_WRITTEN(h->toc_offset);


@@ -1338,52 +1321,48 @@ coff_ppc_relocate_section (output_bfd, info, input_bfd, input_section,
                  }
              }
 
                  }
              }
 

-           if (fixit && info->base_file) 
+           if (fixit && info->base_file)

              {
                /* So if this is non pcrelative, and is referenced
                   to a section or a common symbol, then it needs a reloc */
 
                /* relocation to a symbol in a section which
              {
                /* So if this is non pcrelative, and is referenced
                   to a section or a common symbol, then it needs a reloc */
 
                /* relocation to a symbol in a section which

-                  isn't absolute - we output the address here 
+                  isn't absolute - we output the address here

                   to a file */
 
                   to a file */
 

-               bfd_vma addr =  toc_section->output_section->vma
-                 + toc_section->output_offset + our_toc_offset;
-                   
+               bfd_vma addr = (toc_section->output_section->vma
+                               + toc_section->output_offset + our_toc_offset);
+

                if (coff_data(output_bfd)->pe)
                  addr -= pe_data(output_bfd)->pe_opthdr.ImageBase;
 
                fwrite (&addr, 1,4, (FILE *) info->base_file);
              }
 
                if (coff_data(output_bfd)->pe)
                  addr -= pe_data(output_bfd)->pe_opthdr.ImageBase;
 
                fwrite (&addr, 1,4, (FILE *) info->base_file);
              }
 

-

            /* FIXME: this test is conservative */
            /* FIXME: this test is conservative */

-           if ( (r_flags & IMAGE_REL_PPC_TOCDEFN) != IMAGE_REL_PPC_TOCDEFN &&
-               our_toc_offset > toc_section->_raw_size)
+           if ((r_flags & IMAGE_REL_PPC_TOCDEFN) != IMAGE_REL_PPC_TOCDEFN
+               && (bfd_vma) our_toc_offset > toc_section->_raw_size)

              {
                (*_bfd_error_handler)
              {
                (*_bfd_error_handler)

-                 (_("%s: Relocation exceeds allocated TOC (%x)"), 
-                  bfd_get_filename (input_bfd),
-                  toc_section->_raw_size);
+                 (_("%s: Relocation exceeds allocated TOC (%lx)"),
+                  bfd_archive_filename (input_bfd),
+                  (unsigned long) toc_section->_raw_size);

                bfd_set_error (bfd_error_bad_value);
                return false;
              }
 
            /* Now we know the relocation for this toc reference */
            relocation =  our_toc_offset + TOC_LOAD_ADJUSTMENT;
                bfd_set_error (bfd_error_bad_value);
                return false;
              }
 
            /* Now we know the relocation for this toc reference */
            relocation =  our_toc_offset + TOC_LOAD_ADJUSTMENT;

-           rstat = _bfd_relocate_contents (howto,
-                                           input_bfd, 
-                                           relocation, 
-                                           loc);
+           rstat = _bfd_relocate_contents (howto, input_bfd, relocation, loc);

          }
          break;
        case IMAGE_REL_PPC_IFGLUE:
          {
            /* To solve this, we need to know whether or not the symbol */
          }
          break;
        case IMAGE_REL_PPC_IFGLUE:
          {
            /* To solve this, we need to know whether or not the symbol */

-           /* appearing on the call instruction is a glue function or not. */
+           /* appearing on the call instruction is a glue function or not.  */

            /* A glue function must announce itself via a IMGLUE reloc, and */
            /* the reloc contains the required toc restore instruction */
            /* A glue function must announce itself via a IMGLUE reloc, and */
            /* the reloc contains the required toc restore instruction */

-         
+

            bfd_vma x;
            const char *my_name;
            DUMP_RELOC2(howto->name, rel);
            bfd_vma x;
            const char *my_name;
            DUMP_RELOC2(howto->name, rel);


@@ -1391,18 +1370,18 @@ coff_ppc_relocate_section (output_bfd, info, input_bfd, input_section,
            if (h != 0)
              {
                my_name = h->root.root.root.string;
            if (h != 0)
              {
                my_name = h->root.root.root.string;

-               if (h->symbol_is_glue == 1) 
+               if (h->symbol_is_glue == 1)

                  {
                  {

-                   x = bfd_get_32(input_bfd, loc);
-                   bfd_put_32(input_bfd, h->glue_insn, loc);
+                   x = bfd_get_32 (input_bfd, loc);
+                   bfd_put_32 (input_bfd, (bfd_vma) h->glue_insn, loc);

                  }
              }
          }
          break;
        case IMAGE_REL_PPC_SECREL:
          /* Unimplemented: codeview debugging information */
                  }
              }
          }
          break;
        case IMAGE_REL_PPC_SECREL:
          /* Unimplemented: codeview debugging information */

-         /* For fast access to the header of the section 
-            containing the item. */
+         /* For fast access to the header of the section
+            containing the item.  */

          break;
        case IMAGE_REL_PPC_SECTION:
          /* Unimplemented: codeview debugging information */
          break;
        case IMAGE_REL_PPC_SECTION:
          /* Unimplemented: codeview debugging information */


@@ -1420,15 +1399,15 @@ coff_ppc_relocate_section (output_bfd, info, input_bfd, input_section,
                my_name = h->root.root.root.string;
              }
 
                my_name = h->root.root.root.string;
              }
 

-           fprintf(stderr, 
-                   _("Warning: unsupported reloc %s <file %s, section %s>\n"), 
+           fprintf (stderr,
+                   _("Warning: unsupported reloc %s <file %s, section %s>\n"),

                    howto->name,
                    howto->name,

-                   bfd_get_filename(input_bfd),
+                   bfd_archive_filename(input_bfd),

                    input_section->name);
 
                    input_section->name);
 

-           fprintf(stderr,"sym %ld (%s), r_vaddr %ld (%lx)\n", 
+           fprintf (stderr,"sym %ld (%s), r_vaddr %ld (%lx)\n",

                    rel->r_symndx, my_name, (long) rel->r_vaddr,
                    rel->r_symndx, my_name, (long) rel->r_vaddr,

-                   (unsigned long) rel->r_vaddr);  
+                   (unsigned long) rel->r_vaddr);

          }
          break;
        case IMAGE_REL_PPC_IMGLUE:
          }
          break;
        case IMAGE_REL_PPC_IMGLUE:


@@ -1436,20 +1415,19 @@ coff_ppc_relocate_section (output_bfd, info, input_bfd, input_section,
            /* There is nothing to do now. This reloc was noted in the first
               pass over the relocs, and the glue instruction extracted */
            const char *my_name;
            /* There is nothing to do now. This reloc was noted in the first
               pass over the relocs, and the glue instruction extracted */
            const char *my_name;

-           if (h->symbol_is_glue == 1) 
+           if (h->symbol_is_glue == 1)

              break;
            my_name = h->root.root.root.string;
 
            (*_bfd_error_handler)
              break;
            my_name = h->root.root.root.string;
 
            (*_bfd_error_handler)

-             (_("%s: Out of order IMGLUE reloc for %s"), 
-              bfd_get_filename (input_bfd), my_name);
+             (_("%s: Out of order IMGLUE reloc for %s"),
+              bfd_archive_filename (input_bfd), my_name);

            bfd_set_error (bfd_error_bad_value);
            return false;
          }
 
        case IMAGE_REL_PPC_ADDR32NB:
          {
            bfd_set_error (bfd_error_bad_value);
            return false;
          }
 
        case IMAGE_REL_PPC_ADDR32NB:
          {

-           struct coff_link_hash_entry *myh = 0;

            const char *name = 0;
            DUMP_RELOC2(howto->name, rel);
 
            const char *name = 0;
            DUMP_RELOC2(howto->name, rel);
 


@@ -1457,20 +1435,20 @@ coff_ppc_relocate_section (output_bfd, info, input_bfd, input_section,
              {
                /* set magic values */
                int idata5offset;
              {
                /* set magic values */
                int idata5offset;

-               struct coff_link_hash_entry *myh = 0;
+               struct coff_link_hash_entry *myh;

                myh = coff_link_hash_lookup (coff_hash_table (info),
                                             "__idata5_magic__",
                                             false, false, true);
                myh = coff_link_hash_lookup (coff_hash_table (info),
                                             "__idata5_magic__",
                                             false, false, true);

-               first_thunk_address = myh->root.u.def.value + 
-                 sec->output_section->vma + 
-                   sec->output_offset - 
+               first_thunk_address = myh->root.u.def.value +
+                 sec->output_section->vma +
+                   sec->output_offset -

                      pe_data(output_bfd)->pe_opthdr.ImageBase;
                      pe_data(output_bfd)->pe_opthdr.ImageBase;

-               
+

                idata5offset = myh->root.u.def.value;
                myh = coff_link_hash_lookup (coff_hash_table (info),
                                             "__idata6_magic__",
                                             false, false, true);
                idata5offset = myh->root.u.def.value;
                myh = coff_link_hash_lookup (coff_hash_table (info),
                                             "__idata6_magic__",
                                             false, false, true);

-               
+

                thunk_size = myh->root.u.def.value - idata5offset;
                myh = coff_link_hash_lookup (coff_hash_table (info),
                                             "__idata4_magic__",
                thunk_size = myh->root.u.def.value - idata5offset;
                myh = coff_link_hash_lookup (coff_hash_table (info),
                                             "__idata4_magic__",


@@ -1497,18 +1475,18 @@ coff_ppc_relocate_section (output_bfd, info, input_bfd, input_section,
 
                if (target != 0)
                  {
 
                if (target != 0)
                  {

-                   myh = 0;
+                   struct coff_link_hash_entry *myh;

 
                    myh = coff_link_hash_lookup (coff_hash_table (info),
                                                 target,
                                                 false, false, true);
 
                    myh = coff_link_hash_lookup (coff_hash_table (info),
                                                 target,
                                                 false, false, true);

-                   if (myh == 0) 
+                   if (myh == 0)

                      {
                      {

-                       /* Missing magic cookies. Something is very wrong. */
-                       abort();
+                       /* Missing magic cookies. Something is very wrong.  */
+                       abort ();

                      }
                      }

-                   
-                   val = myh->root.u.def.value + 
+
+                   val = myh->root.u.def.value +

                      sec->output_section->vma + sec->output_offset;
                    if (first_thunk_address == 0)
                      {
                      sec->output_section->vma + sec->output_offset;
                    if (first_thunk_address == 0)
                      {


@@ -1516,16 +1494,16 @@ coff_ppc_relocate_section (output_bfd, info, input_bfd, input_section,
                        myh = coff_link_hash_lookup (coff_hash_table (info),
                                                     "__idata5_magic__",
                                                     false, false, true);
                        myh = coff_link_hash_lookup (coff_hash_table (info),
                                                     "__idata5_magic__",
                                                     false, false, true);

-                       first_thunk_address = myh->root.u.def.value + 
-                         sec->output_section->vma + 
-                           sec->output_offset - 
+                       first_thunk_address = myh->root.u.def.value +
+                         sec->output_section->vma +
+                           sec->output_offset -

                              pe_data(output_bfd)->pe_opthdr.ImageBase;
                              pe_data(output_bfd)->pe_opthdr.ImageBase;

-                       
+

                        idata5offset = myh->root.u.def.value;
                        myh = coff_link_hash_lookup (coff_hash_table (info),
                                                     "__idata6_magic__",
                                                     false, false, true);
                        idata5offset = myh->root.u.def.value;
                        myh = coff_link_hash_lookup (coff_hash_table (info),
                                                     "__idata6_magic__",
                                                     false, false, true);

-                       
+

                        thunk_size = myh->root.u.def.value - idata5offset;
                        myh = coff_link_hash_lookup (coff_hash_table (info),
                                                     "__idata4_magic__",
                        thunk_size = myh->root.u.def.value - idata5offset;
                        myh = coff_link_hash_lookup (coff_hash_table (info),
                                                     "__idata4_magic__",


@@ -1536,8 +1514,8 @@ coff_ppc_relocate_section (output_bfd, info, input_bfd, input_section,
              }
 
            rstat = _bfd_relocate_contents (howto,
              }
 
            rstat = _bfd_relocate_contents (howto,

-                             input_bfd, 
-                             val - 
+                             input_bfd,
+                             val -

                              pe_data(output_bfd)->pe_opthdr.ImageBase,
                              loc);
          }
                              pe_data(output_bfd)->pe_opthdr.ImageBase,
                              loc);
          }


@@ -1549,8 +1527,8 @@ coff_ppc_relocate_section (output_bfd, info, input_bfd, input_section,
                  + input_section->output_offset);
 
          rstat = _bfd_relocate_contents (howto,
                  + input_section->output_offset);
 
          rstat = _bfd_relocate_contents (howto,

-                                         input_bfd, 
-                                         val, 
+                                         input_bfd,
+                                         val,

                                          loc);
          break;
        case IMAGE_REL_PPC_ADDR16:
                                          loc);
          break;
        case IMAGE_REL_PPC_ADDR16:


@@ -1558,8 +1536,8 @@ coff_ppc_relocate_section (output_bfd, info, input_bfd, input_section,
        case IMAGE_REL_PPC_ADDR32:
          DUMP_RELOC2(howto->name, rel);
          rstat = _bfd_relocate_contents (howto,
        case IMAGE_REL_PPC_ADDR32:
          DUMP_RELOC2(howto->name, rel);
          rstat = _bfd_relocate_contents (howto,

-                                         input_bfd, 
-                                         val, 
+                                         input_bfd,
+                                         val,

                                          loc);
          break;
        }
                                          loc);
          break;
        }


@@ -1571,11 +1549,11 @@ coff_ppc_relocate_section (output_bfd, info, input_bfd, input_section,
          if (sym && pe_data(output_bfd)->in_reloc_p(output_bfd, howto))
            {
              /* relocation to a symbol in a section which
          if (sym && pe_data(output_bfd)->in_reloc_p(output_bfd, howto))
            {
              /* relocation to a symbol in a section which

-                isn't absolute - we output the address here 
+                isn't absolute - we output the address here

                 to a file */
                 to a file */

-             bfd_vma addr = rel->r_vaddr 
-               - input_section->vma 
-               + input_section->output_offset 
+             bfd_vma addr = rel->r_vaddr
+               - input_section->vma
+               + input_section->output_offset

                  + input_section->output_section->vma;
 
              if (coff_data(output_bfd)->pe)
                  + input_section->output_section->vma;
 
              if (coff_data(output_bfd)->pe)


@@ -1614,7 +1592,7 @@ coff_ppc_relocate_section (output_bfd, info, input_bfd, input_section,
              }
 
            if (! ((*info->callbacks->reloc_overflow)
              }
 
            if (! ((*info->callbacks->reloc_overflow)

-                  (info, name, howto->name, 
+                  (info, name, howto->name,

                    (bfd_vma) 0, input_bfd,
                    input_section, rel->r_vaddr - input_section->vma)))
              {
                    (bfd_vma) 0, input_bfd,
                    input_section, rel->r_vaddr - input_section->vma)))
              {


@@ -1623,7 +1601,7 @@ coff_ppc_relocate_section (output_bfd, info, input_bfd, input_section,
          }
        }
 
          }
        }
 

-    }     
+    }

 
   return true;
 }
 
   return true;
 }


@@ -1659,11 +1637,11 @@ dump_toc (vfile)
   FILE *file = (FILE *) vfile;
   struct list_ele *t;
 
   FILE *file = (FILE *) vfile;
   struct list_ele *t;
 

-  fprintf(file, _(h1));
-  fprintf(file, _(h2));
-  fprintf(file, _(h3));
+  fprintf (file, _(h1));
+  fprintf (file, _(h2));
+  fprintf (file, _(h3));

 
 

-  for(t = head; t != 0; t=t->next)
+  for (t = head; t != 0; t=t->next)

     {
       const char *cat = "";
 
     {
       const char *cat = "";
 


@@ -1671,7 +1649,7 @@ dump_toc (vfile)
        cat = _("private       ");
       else if (t->cat == pub)
        cat = _("public        ");
        cat = _("private       ");
       else if (t->cat == pub)
        cat = _("public        ");

-      else if (t->cat == data)
+      else if (t->cat == tocdata)

        cat = _("data-in-toc   ");
 
       if (t->offset > global_toc_size)
        cat = _("data-in-toc   ");
 
       if (t->offset > global_toc_size)


@@ -1680,30 +1658,32 @@ dump_toc (vfile)
            cat = _("IAT reference ");
          else
            {
            cat = _("IAT reference ");
          else
            {

-             fprintf(file,
+             fprintf (file,

                      _("**** global_toc_size %ld(%lx), thunk_size %ld(%lx)\n"),
                      _("**** global_toc_size %ld(%lx), thunk_size %ld(%lx)\n"),

-                     global_toc_size, global_toc_size, thunk_size, thunk_size);
+                      global_toc_size, global_toc_size,
+                      thunk_size, thunk_size);

              cat = _("Out of bounds!");
            }
        }
 
              cat = _("Out of bounds!");
            }
        }
 

-      fprintf(file,
+      fprintf (file,

              " %04lx    (%d)", (unsigned long) t->offset, t->offset - 32768);
              " %04lx    (%d)", (unsigned long) t->offset, t->offset - 32768);

-      fprintf(file,
+      fprintf (file,

              "    %s %s\n",
              cat, t->name);
 
     }
 
              "    %s %s\n",
              cat, t->name);
 
     }
 

-  fprintf(file, "\n");
+  fprintf (file, "\n");

 }
 
 boolean
 }
 
 boolean

-ppc_allocate_toc_section (info) 
+ppc_allocate_toc_section (info)

      struct bfd_link_info *info ATTRIBUTE_UNUSED;
 {
   asection *s;
   bfd_byte *foo;
      struct bfd_link_info *info ATTRIBUTE_UNUSED;
 {
   asection *s;
   bfd_byte *foo;

+  bfd_size_type amt;

   static char test_char = '1';
 
   if ( global_toc_size == 0 ) /* FIXME: does this get me in trouble? */
   static char test_char = '1';
 
   if ( global_toc_size == 0 ) /* FIXME: does this get me in trouble? */


@@ -1711,19 +1691,20 @@ ppc_allocate_toc_section (info)
 
   if (bfd_of_toc_owner == 0)
     {
 
   if (bfd_of_toc_owner == 0)
     {

-      /* No toc owner? Something is very wrong. */
-      abort();
+      /* No toc owner? Something is very wrong.  */
+      abort ();

     }
 
   s = bfd_get_section_by_name ( bfd_of_toc_owner , TOC_SECTION_NAME);
     }
 
   s = bfd_get_section_by_name ( bfd_of_toc_owner , TOC_SECTION_NAME);

-  if (s == NULL) 
+  if (s == NULL)

     {
     {

-      /* No toc section? Something is very wrong. */
-      abort();
+      /* No toc section? Something is very wrong.  */
+      abort ();

     }
 
     }
 

-  foo = (bfd_byte *) bfd_alloc(bfd_of_toc_owner, global_toc_size);
-  memset(foo, test_char, global_toc_size);
+  amt = global_toc_size;
+  foo = (bfd_byte *) bfd_alloc (bfd_of_toc_owner, amt);
+  memset(foo, test_char, (size_t) global_toc_size);

 
   s->_raw_size = s->_cooked_size = global_toc_size;
   s->contents = foo;
 
   s->_raw_size = s->_cooked_size = global_toc_size;
   s->contents = foo;


@@ -1740,7 +1721,7 @@ ppc_process_before_allocation (abfd, info)
   struct internal_reloc *i, *rel;
 
   /* here we have a bfd that is to be included on the link. We have a hook
   struct internal_reloc *i, *rel;
 
   /* here we have a bfd that is to be included on the link. We have a hook

-     to do reloc rummaging, before section sizes are nailed down. */
+     to do reloc rummaging, before section sizes are nailed down.  */

 
   _bfd_coff_get_external_symbols(abfd);
 
 
   _bfd_coff_get_external_symbols(abfd);
 


@@ -1754,17 +1735,17 @@ ppc_process_before_allocation (abfd, info)
 
   for (; sec != 0; sec = sec->next)
   {
 
   for (; sec != 0; sec = sec->next)
   {

-    if (sec->reloc_count == 0) 
+    if (sec->reloc_count == 0)

       continue;
 
     /* load the relocs */
     /* FIXME: there may be a storage leak here */
     i=_bfd_coff_read_internal_relocs(abfd,sec,1,0,0,0);
       continue;
 
     /* load the relocs */
     /* FIXME: there may be a storage leak here */
     i=_bfd_coff_read_internal_relocs(abfd,sec,1,0,0,0);

-    
+

     if (i == 0)
     if (i == 0)

-      abort();
+      abort ();

 
 

-    for (rel=i;rel<i+sec->reloc_count;++rel) 
+    for (rel=i;rel<i+sec->reloc_count;++rel)

       {
        unsigned short r_type  = EXTRACT_TYPE (rel->r_type);
        unsigned short r_flags = EXTRACT_FLAGS(rel->r_type);
       {
        unsigned short r_type  = EXTRACT_TYPE (rel->r_type);
        unsigned short r_flags = EXTRACT_FLAGS(rel->r_type);


@@ -1772,13 +1753,13 @@ ppc_process_before_allocation (abfd, info)
 
        DUMP_RELOC2(ppc_coff_howto_table[r_type].name, rel);
 
 
        DUMP_RELOC2(ppc_coff_howto_table[r_type].name, rel);
 

-       switch(r_type) 
+       switch(r_type)

          {
          case IMAGE_REL_PPC_TOCREL16:
            /* if TOCDEFN is on, ignore as someone else has allocated the
               toc entry */
            if ( (r_flags & IMAGE_REL_PPC_TOCDEFN) != IMAGE_REL_PPC_TOCDEFN )
          {
          case IMAGE_REL_PPC_TOCREL16:
            /* if TOCDEFN is on, ignore as someone else has allocated the
               toc entry */
            if ( (r_flags & IMAGE_REL_PPC_TOCDEFN) != IMAGE_REL_PPC_TOCDEFN )

-             ok = ppc_record_toc_entry(abfd, info, sec, 
+             ok = ppc_record_toc_entry(abfd, info, sec,

                                        rel->r_symndx, default_toc);
            if (!ok)
              return false;
                                        rel->r_symndx, default_toc);
            if (!ok)
              return false;


@@ -1797,7 +1778,6 @@ ppc_process_before_allocation (abfd, info)
 
 #endif
 
 
 #endif
 

-

 static bfd_reloc_status_type
 ppc_refhi_reloc (abfd,
                 reloc_entry,
 static bfd_reloc_status_type
 ppc_refhi_reloc (abfd,
                 reloc_entry,


@@ -1876,7 +1856,6 @@ ppc_pair_reloc (abfd,
 
   return bfd_reloc_undefined;
 }
 
   return bfd_reloc_undefined;
 }

-

 \f
 static bfd_reloc_status_type
 ppc_toc16_reloc (abfd,
 \f
 static bfd_reloc_status_type
 ppc_toc16_reloc (abfd,


@@ -2011,15 +1990,12 @@ ppc_imglue_reloc (abfd,
 
   return bfd_reloc_ok;
 }
 
   return bfd_reloc_ok;
 }

-

 \f
 \f

-

 #define MAX_RELOC_INDEX  \
 #define MAX_RELOC_INDEX  \

-      (sizeof(ppc_coff_howto_table) / sizeof(ppc_coff_howto_table[0]) - 1)
-
+      (sizeof (ppc_coff_howto_table) / sizeof (ppc_coff_howto_table[0]) - 1)

 
 /* FIXME: There is a possiblity that when we read in a reloc from a file,
 
 /* FIXME: There is a possiblity that when we read in a reloc from a file,

-          that there are some bits encoded in the upper portion of the 
+          that there are some bits encoded in the upper portion of the

          type field. Not yet implemented.
 */
 static void ppc_coff_rtype2howto PARAMS ((arelent *relent,
          type field. Not yet implemented.
 */
 static void ppc_coff_rtype2howto PARAMS ((arelent *relent,


@@ -2029,7 +2005,7 @@ static void
 ppc_coff_rtype2howto (relent, internal)
      arelent *relent;
      struct internal_reloc *internal;
 ppc_coff_rtype2howto (relent, internal)
      arelent *relent;
      struct internal_reloc *internal;

-{  
+{

 
   /* We can encode one of three things in the type field, aside from the
      type:
 
   /* We can encode one of three things in the type field, aside from the
      type:


@@ -2046,15 +2022,15 @@ ppc_coff_rtype2howto (relent, internal)
   unsigned short r_flags = EXTRACT_FLAGS(internal->r_type);
   unsigned short junk    = EXTRACT_JUNK (internal->r_type);
 
   unsigned short r_flags = EXTRACT_FLAGS(internal->r_type);
   unsigned short junk    = EXTRACT_JUNK (internal->r_type);
 

-  /* the masking process only slices off the bottom byte for r_type. */
-  if ( r_type > MAX_RELOC_INDEX ) 
-    abort();
+  /* the masking process only slices off the bottom byte for r_type.  */
+  if ( r_type > MAX_RELOC_INDEX )
+    abort ();

 
   /* check for absolute crap */
   if ( junk != 0 )
 
   /* check for absolute crap */
   if ( junk != 0 )

-    abort();
+    abort ();

 
 

-  switch(r_type) 
+  switch(r_type)

     {
     case IMAGE_REL_PPC_ADDR16:
     case IMAGE_REL_PPC_REL24:
     {
     case IMAGE_REL_PPC_ADDR16:
     case IMAGE_REL_PPC_REL24:


@@ -2079,16 +2055,16 @@ ppc_coff_rtype2howto (relent, internal)
        howto = ppc_coff_howto_table + IMAGE_REL_PPC_TOCREL16;
       break;
     default:
        howto = ppc_coff_howto_table + IMAGE_REL_PPC_TOCREL16;
       break;
     default:

-      fprintf(stderr, 
+      fprintf (stderr,

              _("Warning: Unsupported reloc %s [%d] used -- it may not work.\n"),
              ppc_coff_howto_table[r_type].name,
              r_type);
              _("Warning: Unsupported reloc %s [%d] used -- it may not work.\n"),
              ppc_coff_howto_table[r_type].name,
              r_type);

-      howto = ppc_coff_howto_table + r_type;      
+      howto = ppc_coff_howto_table + r_type;

       break;
     }
       break;
     }

-  
+

   relent->howto = howto;
   relent->howto = howto;

-  
+

 }
 
 static reloc_howto_type *
 }
 
 static reloc_howto_type *


@@ -2117,15 +2093,15 @@ coff_ppc_rtype_to_howto (abfd, sec, rel, h, sym, addendp)
   unsigned short r_flags = EXTRACT_FLAGS(rel->r_type);
   unsigned short junk    = EXTRACT_JUNK (rel->r_type);
 
   unsigned short r_flags = EXTRACT_FLAGS(rel->r_type);
   unsigned short junk    = EXTRACT_JUNK (rel->r_type);
 

-  /* the masking process only slices off the bottom byte for r_type. */
-  if ( r_type > MAX_RELOC_INDEX ) 
-    abort();
-  
+  /* the masking process only slices off the bottom byte for r_type.  */
+  if ( r_type > MAX_RELOC_INDEX )
+    abort ();
+

   /* check for absolute crap */
   if ( junk != 0 )
   /* check for absolute crap */
   if ( junk != 0 )

-    abort();
-    
-  switch(r_type) 
+    abort ();
+
+  switch(r_type)

     {
     case IMAGE_REL_PPC_ADDR32NB:
       DUMP_RELOC2(ppc_coff_howto_table[r_type].name, rel);
     {
     case IMAGE_REL_PPC_ADDR32NB:
       DUMP_RELOC2(ppc_coff_howto_table[r_type].name, rel);


@@ -2154,18 +2130,17 @@ coff_ppc_rtype_to_howto (abfd, sec, rel, h, sym, addendp)
       howto = ppc_coff_howto_table + r_type;
       break;
     default:
       howto = ppc_coff_howto_table + r_type;
       break;
     default:

-      fprintf(stderr, 
+      fprintf (stderr,

              _("Warning: Unsupported reloc %s [%d] used -- it may not work.\n"),
              ppc_coff_howto_table[r_type].name,
              r_type);
       howto = ppc_coff_howto_table + r_type;
       break;
     }
              _("Warning: Unsupported reloc %s [%d] used -- it may not work.\n"),
              ppc_coff_howto_table[r_type].name,
              r_type);
       howto = ppc_coff_howto_table + r_type;
       break;
     }

-  
+

   return howto;
 }
 
   return howto;
 }
 

-

 /* a cheesy little macro to make the code a little more readable */
 #define HOW2MAP(bfd_rtype,ppc_rtype)  \
  case bfd_rtype: return &ppc_coff_howto_table[ppc_rtype]
 /* a cheesy little macro to make the code a little more readable */
 #define HOW2MAP(bfd_rtype,ppc_rtype)  \
  case bfd_rtype: return &ppc_coff_howto_table[ppc_rtype]


@@ -2189,47 +2164,62 @@ ppc_coff_reloc_type_lookup (abfd, code)
       HOW2MAP(BFD_RELOC_16_GOTOFF,    IMAGE_REL_PPC_TOCREL16_DEFN);
       HOW2MAP(BFD_RELOC_32,           IMAGE_REL_PPC_ADDR32);
       HOW2MAP(BFD_RELOC_RVA,          IMAGE_REL_PPC_ADDR32NB);
       HOW2MAP(BFD_RELOC_16_GOTOFF,    IMAGE_REL_PPC_TOCREL16_DEFN);
       HOW2MAP(BFD_RELOC_32,           IMAGE_REL_PPC_ADDR32);
       HOW2MAP(BFD_RELOC_RVA,          IMAGE_REL_PPC_ADDR32NB);

-    default: 
+    default:

       return NULL;
     }
   /*NOTREACHED*/
 }
 
 #undef HOW2MAP
       return NULL;
     }
   /*NOTREACHED*/
 }
 
 #undef HOW2MAP

-

 \f
 \f

-/* Tailor coffcode.h -- macro heaven. */
+/* Tailor coffcode.h -- macro heaven.  */

 
 #define RTYPE2HOWTO(cache_ptr, dst)  ppc_coff_rtype2howto (cache_ptr, dst)
 
 
 #define RTYPE2HOWTO(cache_ptr, dst)  ppc_coff_rtype2howto (cache_ptr, dst)
 

-#ifndef COFF_IMAGE_WITH_PE
-static void ppc_coff_swap_sym_in_hook PARAMS ((bfd *, PTR, PTR));
-#endif
-

 /* We use the special COFF backend linker, with our own special touch.  */
 
 #define coff_bfd_reloc_type_lookup   ppc_coff_reloc_type_lookup
 #define coff_rtype_to_howto          coff_ppc_rtype_to_howto
 #define coff_relocate_section        coff_ppc_relocate_section
 /* We use the special COFF backend linker, with our own special touch.  */
 
 #define coff_bfd_reloc_type_lookup   ppc_coff_reloc_type_lookup
 #define coff_rtype_to_howto          coff_ppc_rtype_to_howto
 #define coff_relocate_section        coff_ppc_relocate_section

-#define coff_bfd_final_link          ppc_bfd_coff_final_link 
+#define coff_bfd_final_link          ppc_bfd_coff_final_link

 
 #ifndef COFF_IMAGE_WITH_PE
 
 #ifndef COFF_IMAGE_WITH_PE

+/* FIXME: This no longer works.  */
+#if 0

 #define coff_swap_sym_in_hook        ppc_coff_swap_sym_in_hook
 #endif
 #define coff_swap_sym_in_hook        ppc_coff_swap_sym_in_hook
 #endif

+#endif

 
 #define SELECT_RELOC(internal, howto) {internal.r_type=howto->type;}
 
 #define COFF_PAGE_SIZE                       0x1000
 
 
 #define SELECT_RELOC(internal, howto) {internal.r_type=howto->type;}
 
 #define COFF_PAGE_SIZE                       0x1000
 

+/* FIXME: This controls some code that used to be in peicode.h and is
+   now in peigen.c.  It will not control the code in peigen.c.  If
+   anybody wants to get this working, you will need to fix that.  */

 #define POWERPC_LE_PE
 
 #define POWERPC_LE_PE
 

-#include "coffcode.h"
+#define COFF_SECTION_ALIGNMENT_ENTRIES \
+{ COFF_SECTION_NAME_EXACT_MATCH (".idata$2"), \
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 0 }, \
+{ COFF_SECTION_NAME_EXACT_MATCH (".idata$3"), \
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 0 }, \
+{ COFF_SECTION_NAME_EXACT_MATCH (".idata$4"), \
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 2 }, \
+{ COFF_SECTION_NAME_EXACT_MATCH (".idata$5"), \
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 2 }, \
+{ COFF_SECTION_NAME_EXACT_MATCH (".idata$6"), \
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 1 }, \
+{ COFF_SECTION_NAME_EXACT_MATCH (".reloc"), \
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 1 }

 
 

+#include "coffcode.h"

 \f
 \f

-

 #ifndef COFF_IMAGE_WITH_PE
 #ifndef COFF_IMAGE_WITH_PE

+/* FIXME: This no longer works.  */
+#if 0

 /* FIXME:
 /* FIXME:

-   What we're trying to do here is allocate a toc section (early), and attach 
+   What we're trying to do here is allocate a toc section (early), and attach

    it to the last bfd to be processed. This avoids the problem of having a toc
    written out before all files have been processed. This code allocates
    a toc section for every file, and records the last one seen. There are
    it to the last bfd to be processed. This avoids the problem of having a toc
    written out before all files have been processed. This code allocates
    a toc section for every file, and records the last one seen. There are


@@ -2241,6 +2231,7 @@ static void ppc_coff_swap_sym_in_hook PARAMS ((bfd *, PTR, PTR));
    3. Doing it on a "swap in" hook depends on when the "swap in" is called,
       and how often, etc. It's not clear to me that there isn't a hole here.
 */
    3. Doing it on a "swap in" hook depends on when the "swap in" is called,
       and how often, etc. It's not clear to me that there isn't a hole here.
 */

+static void ppc_coff_swap_sym_in_hook PARAMS ((bfd *, PTR, PTR));

 
 static void
 ppc_coff_swap_sym_in_hook (abfd, ext1, in1)
 
 static void
 ppc_coff_swap_sym_in_hook (abfd, ext1, in1)


@@ -2259,7 +2250,7 @@ ppc_coff_swap_sym_in_hook (abfd, ext1, in1)
       register asection *s;
 
       s = bfd_get_section_by_name ( abfd , TOC_SECTION_NAME);
       register asection *s;
 
       s = bfd_get_section_by_name ( abfd , TOC_SECTION_NAME);

-      if (s != NULL) 
+      if (s != NULL)

        {
          return;
        }
        {
          return;
        }


@@ -2273,7 +2264,7 @@ ppc_coff_swap_sym_in_hook (abfd, ext1, in1)
          || !bfd_set_section_alignment (abfd, s, 2))
        {
          /* FIXME: set appropriate bfd error */
          || !bfd_set_section_alignment (abfd, s, 2))
        {
          /* FIXME: set appropriate bfd error */

-         abort();
+         abort ();

        }
 
       /* save the bfd for later allocation */
        }
 
       /* save the bfd for later allocation */


@@ -2283,6 +2274,7 @@ ppc_coff_swap_sym_in_hook (abfd, ext1, in1)
   return;
 }
 #endif
   return;
 }
 #endif

+#endif

 
 #ifndef COFF_IMAGE_WITH_PE
 
 
 #ifndef COFF_IMAGE_WITH_PE
 


@@ -2306,18 +2298,16 @@ ppc_get_last()
 }
 
 /* this piece of machinery exists only to guarantee that the bfd that holds
 }
 
 /* this piece of machinery exists only to guarantee that the bfd that holds

-   the toc section is written last. 
+   the toc section is written last.

 
    This does depend on bfd_make_section attaching a new section to the
 
    This does depend on bfd_make_section attaching a new section to the

-   end of the section list for the bfd. 
+   end of the section list for the bfd.

 
 

-   This is otherwise intended to be functionally the same as 
-   cofflink.c:_bfd_coff_final_link(). It is specifically different only 
-   where the POWERPC_LE_PE macro modifies the code. It is left in as a 
+   This is otherwise intended to be functionally the same as
+   cofflink.c:_bfd_coff_final_link(). It is specifically different only
+   where the POWERPC_LE_PE macro modifies the code. It is left in as a

    precise form of comment. krk@cygnus.com
 */
    precise form of comment. krk@cygnus.com
 */

-#define POWERPC_LE_PE
-

 
 /* Do the final link step.  */
 
 
 /* Do the final link step.  */
 


@@ -2331,11 +2321,11 @@ ppc_bfd_coff_final_link (abfd, info)
   boolean debug_merge_allocated;
   asection *o;
   struct bfd_link_order *p;
   boolean debug_merge_allocated;
   asection *o;
   struct bfd_link_order *p;

-  size_t max_sym_count;
-  size_t max_lineno_count;
-  size_t max_reloc_count;
-  size_t max_output_reloc_count;
-  size_t max_contents_size;
+  bfd_size_type max_sym_count;
+  bfd_size_type max_lineno_count;
+  bfd_size_type max_reloc_count;
+  bfd_size_type max_output_reloc_count;
+  bfd_size_type max_contents_size;

   file_ptr rel_filepos;
   unsigned int relsz;
   file_ptr line_filepos;
   file_ptr rel_filepos;
   unsigned int relsz;
   file_ptr line_filepos;


@@ -2343,6 +2333,7 @@ ppc_bfd_coff_final_link (abfd, info)
   bfd *sub;
   bfd_byte *external_relocs = NULL;
   char strbuf[STRING_SIZE_SIZE];
   bfd *sub;
   bfd_byte *external_relocs = NULL;
   char strbuf[STRING_SIZE_SIZE];

+  bfd_size_type amt;

 
   symesz = bfd_coff_symesz (abfd);
 
 
   symesz = bfd_coff_symesz (abfd);
 


@@ -2443,10 +2434,9 @@ ppc_bfd_coff_final_link (abfd, info)
 
       /* We use section_count + 1, rather than section_count, because
          the target_index fields are 1 based.  */
 
       /* We use section_count + 1, rather than section_count, because
          the target_index fields are 1 based.  */

-      finfo.section_info =
-       ((struct coff_link_section_info *)
-        bfd_malloc ((abfd->section_count + 1)
-                    * sizeof (struct coff_link_section_info)));
+      amt = abfd->section_count + 1;
+      amt *= sizeof (struct coff_link_section_info);
+      finfo.section_info = (struct coff_link_section_info *) bfd_malloc (amt);

       if (finfo.section_info == NULL)
        goto error_return;
       for (i = 0; i <= abfd->section_count; i++)
       if (finfo.section_info == NULL)
        goto error_return;
       for (i = 0; i <= abfd->section_count; i++)


@@ -2487,13 +2477,14 @@ ppc_bfd_coff_final_link (abfd, info)
             but only when doing a relocateable link, which is not the
             common case.  */
          BFD_ASSERT (info->relocateable);
             but only when doing a relocateable link, which is not the
             common case.  */
          BFD_ASSERT (info->relocateable);

+         amt = o->reloc_count;
+         amt *= sizeof (struct internal_reloc);

          finfo.section_info[o->target_index].relocs =
          finfo.section_info[o->target_index].relocs =

-           ((struct internal_reloc *)
-            bfd_malloc (o->reloc_count * sizeof (struct internal_reloc)));
+           (struct internal_reloc *) bfd_malloc (amt);
+         amt = o->reloc_count;
+         amt *= sizeof (struct coff_link_hash_entry *);

          finfo.section_info[o->target_index].rel_hashes =
          finfo.section_info[o->target_index].rel_hashes =

-           ((struct coff_link_hash_entry **)
-            bfd_malloc (o->reloc_count
-                    * sizeof (struct coff_link_hash_entry *)));
+           (struct coff_link_hash_entry **) bfd_malloc (amt);

          if (finfo.section_info[o->target_index].relocs == NULL
              || finfo.section_info[o->target_index].rel_hashes == NULL)
            goto error_return;
          if (finfo.section_info[o->target_index].relocs == NULL
              || finfo.section_info[o->target_index].rel_hashes == NULL)
            goto error_return;


@@ -2516,7 +2507,7 @@ ppc_bfd_coff_final_link (abfd, info)
   max_sym_count = 0;
   for (sub = info->input_bfds; sub != NULL; sub = sub->link_next)
     {
   max_sym_count = 0;
   for (sub = info->input_bfds; sub != NULL; sub = sub->link_next)
     {

-      size_t sz;
+      bfd_size_type sz;

 
       sub->output_has_begun = false;
       sz = obj_raw_syment_count (sub);
 
       sub->output_has_begun = false;
       sz = obj_raw_syment_count (sub);


@@ -2525,22 +2516,23 @@ ppc_bfd_coff_final_link (abfd, info)
     }
 
   /* Allocate some buffers used while linking.  */
     }
 
   /* Allocate some buffers used while linking.  */

-  finfo.internal_syms = ((struct internal_syment *)
-                        bfd_malloc (max_sym_count
-                                    * sizeof (struct internal_syment)));
-  finfo.sec_ptrs = (asection **) bfd_malloc (max_sym_count
-                                            * sizeof (asection *));
-  finfo.sym_indices = (long *) bfd_malloc (max_sym_count * sizeof (long));
-  finfo.outsyms = ((bfd_byte *)
-                  bfd_malloc ((size_t) ((max_sym_count + 1) * symesz)));
-  finfo.linenos = (bfd_byte *) bfd_malloc (max_lineno_count
-                                      * bfd_coff_linesz (abfd));
+  amt = max_sym_count * sizeof (struct internal_syment);
+  finfo.internal_syms = (struct internal_syment *) bfd_malloc (amt);
+  amt = max_sym_count * sizeof (asection *);
+  finfo.sec_ptrs = (asection **) bfd_malloc (amt);
+  amt = max_sym_count * sizeof (long);
+  finfo.sym_indices = (long *) bfd_malloc (amt);
+  amt = (max_sym_count + 1) * symesz;
+  finfo.outsyms = (bfd_byte *) bfd_malloc (amt);
+  amt = max_lineno_count * bfd_coff_linesz (abfd);
+  finfo.linenos = (bfd_byte *) bfd_malloc (amt);

   finfo.contents = (bfd_byte *) bfd_malloc (max_contents_size);
   finfo.external_relocs = (bfd_byte *) bfd_malloc (max_reloc_count * relsz);
   if (! info->relocateable)
   finfo.contents = (bfd_byte *) bfd_malloc (max_contents_size);
   finfo.external_relocs = (bfd_byte *) bfd_malloc (max_reloc_count * relsz);
   if (! info->relocateable)

-    finfo.internal_relocs = ((struct internal_reloc *)
-                            bfd_malloc (max_reloc_count
-                                        * sizeof (struct internal_reloc)));
+    {
+      amt = max_reloc_count * sizeof (struct internal_reloc);
+      finfo.internal_relocs = (struct internal_reloc *) bfd_malloc (amt);
+    }

   if ((finfo.internal_syms == NULL && max_sym_count > 0)
       || (finfo.sec_ptrs == NULL && max_sym_count > 0)
       || (finfo.sym_indices == NULL && max_sym_count > 0)
   if ((finfo.internal_syms == NULL && max_sym_count > 0)
       || (finfo.sec_ptrs == NULL && max_sym_count > 0)
       || (finfo.sym_indices == NULL && max_sym_count > 0)


@@ -2659,14 +2651,14 @@ ppc_bfd_coff_final_link (abfd, info)
   if (finfo.last_file_index != -1
       && (unsigned int) finfo.last_file.n_value != obj_raw_syment_count (abfd))
     {
   if (finfo.last_file_index != -1
       && (unsigned int) finfo.last_file.n_value != obj_raw_syment_count (abfd))
     {

+      file_ptr pos;
+

       finfo.last_file.n_value = obj_raw_syment_count (abfd);
       bfd_coff_swap_sym_out (abfd, (PTR) &finfo.last_file,
                             (PTR) finfo.outsyms);
       finfo.last_file.n_value = obj_raw_syment_count (abfd);
       bfd_coff_swap_sym_out (abfd, (PTR) &finfo.last_file,
                             (PTR) finfo.outsyms);

-      if (bfd_seek (abfd,
-                   (obj_sym_filepos (abfd)
-                    + finfo.last_file_index * symesz),
-                   SEEK_SET) != 0
-         || bfd_write (finfo.outsyms, symesz, 1, abfd) != symesz)
+      pos = obj_sym_filepos (abfd) + finfo.last_file_index * symesz;
+      if (bfd_seek (abfd, pos, SEEK_SET) != 0
+         || bfd_bwrite (finfo.outsyms, symesz, abfd) != symesz)

        return false;
     }
 
        return false;
     }
 


@@ -2689,8 +2681,8 @@ ppc_bfd_coff_final_link (abfd, info)
       /* Now that we have written out all the global symbols, we know
         the symbol indices to use for relocs against them, and we can
         finally write out the relocs.  */
       /* Now that we have written out all the global symbols, we know
         the symbol indices to use for relocs against them, and we can
         finally write out the relocs.  */

-      external_relocs = ((bfd_byte *)
-                        bfd_malloc (max_output_reloc_count * relsz));
+      amt = max_output_reloc_count * relsz;
+      external_relocs = (bfd_byte *) bfd_malloc (amt);

       if (external_relocs == NULL)
        goto error_return;
 
       if (external_relocs == NULL)
        goto error_return;
 


@@ -2718,9 +2710,9 @@ ppc_bfd_coff_final_link (abfd, info)
              bfd_coff_swap_reloc_out (abfd, (PTR) irel, (PTR) erel);
            }
 
              bfd_coff_swap_reloc_out (abfd, (PTR) irel, (PTR) erel);
            }
 

+         amt = relsz * o->reloc_count;

          if (bfd_seek (abfd, o->rel_filepos, SEEK_SET) != 0
          if (bfd_seek (abfd, o->rel_filepos, SEEK_SET) != 0

-             || bfd_write ((PTR) external_relocs, relsz, o->reloc_count,
-                           abfd) != relsz * o->reloc_count)
+             || bfd_bwrite ((PTR) external_relocs, amt, abfd) != amt)

            goto error_return;
        }
 
            goto error_return;
        }
 


@@ -2754,21 +2746,22 @@ ppc_bfd_coff_final_link (abfd, info)
   /* Write out the string table.  */
   if (obj_raw_syment_count (abfd) != 0)
     {
   /* Write out the string table.  */
   if (obj_raw_syment_count (abfd) != 0)
     {

-      if (bfd_seek (abfd,
-                   (obj_sym_filepos (abfd)
-                    + obj_raw_syment_count (abfd) * symesz),
-                   SEEK_SET) != 0)
+      file_ptr pos;
+
+      pos = obj_sym_filepos (abfd) + obj_raw_syment_count (abfd) * symesz;
+      if (bfd_seek (abfd, pos, SEEK_SET) != 0)

        return false;
 
 #if STRING_SIZE_SIZE == 4
        return false;
 
 #if STRING_SIZE_SIZE == 4

-      bfd_h_put_32 (abfd,
-                   _bfd_stringtab_size (finfo.strtab) + STRING_SIZE_SIZE,
-                   (bfd_byte *) strbuf);
+      H_PUT_32 (abfd,
+               _bfd_stringtab_size (finfo.strtab) + STRING_SIZE_SIZE,
+               strbuf);

 #else
 #else

- #error Change bfd_h_put_32
+ #error Change H_PUT_32 above

 #endif
 
 #endif
 

-      if (bfd_write (strbuf, 1, STRING_SIZE_SIZE, abfd) != STRING_SIZE_SIZE)
+      if (bfd_bwrite (strbuf, (bfd_size_type) STRING_SIZE_SIZE, abfd)
+         != STRING_SIZE_SIZE)

        return false;
 
       if (! _bfd_stringtab_emit (abfd, finfo.strtab))
        return false;
 
       if (! _bfd_stringtab_emit (abfd, finfo.strtab))


@@ -2823,13 +2816,12 @@ ppc_bfd_coff_final_link (abfd, info)
 }
 #endif
 \f
 }
 #endif
 \f

-

 /* Forward declaration for use by alternative_target field.  */
 #ifdef TARGET_BIG_SYM
 extern const bfd_target TARGET_BIG_SYM;
 #endif
 
 /* Forward declaration for use by alternative_target field.  */
 #ifdef TARGET_BIG_SYM
 extern const bfd_target TARGET_BIG_SYM;
 #endif
 

-/* The transfer vectors that lead the outside world to all of the above. */
+/* The transfer vectors that lead the outside world to all of the above.  */

 
 #ifdef TARGET_LITTLE_SYM
 const bfd_target TARGET_LITTLE_SYM =
 
 #ifdef TARGET_LITTLE_SYM
 const bfd_target TARGET_LITTLE_SYM =


@@ -2842,7 +2834,7 @@ const bfd_target TARGET_LITTLE_SYM =
   (HAS_RELOC | EXEC_P |                /* FIXME: object flags */
    HAS_LINENO | HAS_DEBUG |
    HAS_SYMS | HAS_LOCALS | WP_TEXT | D_PAGED),
   (HAS_RELOC | EXEC_P |                /* FIXME: object flags */
    HAS_LINENO | HAS_DEBUG |
    HAS_SYMS | HAS_LOCALS | WP_TEXT | D_PAGED),

-  
+

 #ifndef COFF_WITH_PE
   (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC), /* section flags */
 #else
 #ifndef COFF_WITH_PE
   (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC), /* section flags */
 #else


@@ -2861,14 +2853,14 @@ const bfd_target TARGET_LITTLE_SYM =
   bfd_getl64, bfd_getl_signed_64, bfd_putl64,
   bfd_getl32, bfd_getl_signed_32, bfd_putl32,
   bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* hdrs */
   bfd_getl64, bfd_getl_signed_64, bfd_putl64,
   bfd_getl32, bfd_getl_signed_32, bfd_putl32,
   bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* hdrs */

-  
+

   {_bfd_dummy_target, coff_object_p,   /* bfd_check_format */
      bfd_generic_archive_p, /* _bfd_dummy_target */ coff_object_p },
   {bfd_false, coff_mkobject, _bfd_generic_mkarchive, /* bfd_set_format */
      bfd_false},
   {bfd_false, coff_write_object_contents,      /* bfd_write_contents */
      _bfd_write_archive_contents, bfd_false},
   {_bfd_dummy_target, coff_object_p,   /* bfd_check_format */
      bfd_generic_archive_p, /* _bfd_dummy_target */ coff_object_p },
   {bfd_false, coff_mkobject, _bfd_generic_mkarchive, /* bfd_set_format */
      bfd_false},
   {bfd_false, coff_write_object_contents,      /* bfd_write_contents */
      _bfd_write_archive_contents, bfd_false},

-  
+

   BFD_JUMP_TABLE_GENERIC (coff),
   BFD_JUMP_TABLE_COPY (coff),
   BFD_JUMP_TABLE_CORE (_bfd_nocore),
   BFD_JUMP_TABLE_GENERIC (coff),
   BFD_JUMP_TABLE_COPY (coff),
   BFD_JUMP_TABLE_CORE (_bfd_nocore),


@@ -2885,7 +2877,7 @@ const bfd_target TARGET_LITTLE_SYM =
 #else
   NULL,
 #endif
 #else
   NULL,
 #endif

-  
+

   COFF_SWAP_TABLE
 };
 #endif
   COFF_SWAP_TABLE
 };
 #endif


@@ -2894,7 +2886,7 @@ const bfd_target TARGET_LITTLE_SYM =
 const bfd_target TARGET_BIG_SYM =
 {
   TARGET_BIG_NAME,
 const bfd_target TARGET_BIG_SYM =
 {
   TARGET_BIG_NAME,

-  bfd_target_coff_flavour,     
+  bfd_target_coff_flavour,

   BFD_ENDIAN_BIG,              /* data byte order is big */
   BFD_ENDIAN_BIG,              /* header byte order is big */
 
   BFD_ENDIAN_BIG,              /* data byte order is big */
   BFD_ENDIAN_BIG,              /* header byte order is big */
 


@@ -2938,14 +2930,13 @@ const bfd_target TARGET_BIG_SYM =
   BFD_JUMP_TABLE_LINK (coff),
   BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
 
   BFD_JUMP_TABLE_LINK (coff),
   BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
 

-

   /* Alternative_target.  */
 #ifdef TARGET_LITTLE_SYM
   & TARGET_LITTLE_SYM,
 #else
   NULL,
 #endif
   /* Alternative_target.  */
 #ifdef TARGET_LITTLE_SYM
   & TARGET_LITTLE_SYM,
 #else
   NULL,
 #endif

-  
+

   COFF_SWAP_TABLE
 };
 
   COFF_SWAP_TABLE
 };