Correct spelling of "relocatable".

[binutils.git] / bfd / coff-m88k.c

diff --git a/bfd/coff-m88k.c b/bfd/coff-m88k.c
index f78377a3a427d87390744633a7a9f640f6729656..a8b2c55e319b252c91a19068e459284a3c935cbb 100644 (file)
--- a/bfd/coff-m88k.c
+++ b/bfd/coff-m88k.c
@@ -1,5 +1,6 @@
 /* BFD back-end for Motorola 88000 COFF "Binary Compatability Standard" files.
 /* BFD back-end for Motorola 88000 COFF "Binary Compatability Standard" files.

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

    Free Software Foundation, Inc.
    Written by Cygnus Support.
 
    Free Software Foundation, Inc.
    Written by Cygnus Support.
 


@@ -27,7 +28,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "coff/internal.h"
 #include "libcoff.h"
 
 #include "coff/internal.h"
 #include "libcoff.h"
 

-static boolean m88k_is_local_label_name PARAMS ((bfd *, const char *));
+static bfd_boolean m88k_is_local_label_name PARAMS ((bfd *, const char *));

 static bfd_reloc_status_type m88k_special_reloc
   PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
 static void rtype2howto PARAMS ((arelent *, struct internal_reloc *));
 static bfd_reloc_status_type m88k_special_reloc
   PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
 static void rtype2howto PARAMS ((arelent *, struct internal_reloc *));


@@ -36,14 +37,14 @@ static void reloc_processing
 
 #define COFF_DEFAULT_SECTION_ALIGNMENT_POWER (3)
 
 
 #define COFF_DEFAULT_SECTION_ALIGNMENT_POWER (3)
 

-#define GET_SCNHDR_NRELOC bfd_h_get_32
-#define GET_SCNHDR_NLNNO bfd_h_get_32
+#define GET_SCNHDR_NRELOC H_GET_32
+#define GET_SCNHDR_NLNNO  H_GET_32

 
 /* On coff-m88k, local labels start with '@'.  */
 
 #define coff_bfd_is_local_label_name m88k_is_local_label_name
 
 
 /* On coff-m88k, local labels start with '@'.  */
 
 #define coff_bfd_is_local_label_name m88k_is_local_label_name
 

-static boolean
+static bfd_boolean

 m88k_is_local_label_name (abfd, name)
      bfd *abfd ATTRIBUTE_UNUSED;
      const char *name;
 m88k_is_local_label_name (abfd, name)
      bfd *abfd ATTRIBUTE_UNUSED;
      const char *name;


@@ -51,7 +52,7 @@ m88k_is_local_label_name (abfd, name)
   return name[0] == '@';
 }
 
   return name[0] == '@';
 }
 

-static bfd_reloc_status_type 
+static bfd_reloc_status_type

 m88k_special_reloc (abfd, reloc_entry, symbol, data,
                    input_section, output_bfd, error_message)
      bfd *abfd;
 m88k_special_reloc (abfd, reloc_entry, symbol, data,
                    input_section, output_bfd, error_message)
      bfd *abfd;


@@ -115,10 +116,11 @@ m88k_special_reloc (abfd, reloc_entry, symbol, data,
          relocation <<= (bfd_vma) howto->bitpos;
 
          if (relocation)
          relocation <<= (bfd_vma) howto->bitpos;
 
          if (relocation)

-             bfd_put_16 (abfd, relocation, (unsigned char *) data + addr);
+           bfd_put_16 (abfd, (bfd_vma) relocation,
+                       (unsigned char *) data + addr);

        }
 
        }
 

-      /* If we are not producing relocateable output, return an error if
+      /* If we are not producing relocatable output, return an error if

         the symbol is not defined.  */
       if (bfd_is_und_section (symbol->section) && output_bfd == (bfd *) NULL)
        return bfd_reloc_undefined;
         the symbol is not defined.  */
       if (bfd_is_und_section (symbol->section) && output_bfd == (bfd *) NULL)
        return bfd_reloc_undefined;


@@ -144,91 +146,91 @@ m88k_special_reloc (abfd, reloc_entry, symbol, data,
   return bfd_reloc_ok;
 }
 
   return bfd_reloc_ok;
 }
 

-static reloc_howto_type howto_table[] = 
+static reloc_howto_type howto_table[] =

 {
   HOWTO (R_PCR16L,                     /* type */
         02,                            /* rightshift */
         1,                             /* size (0 = byte, 1 = short, 2 = long) */
         16,                            /* bitsize */
 {
   HOWTO (R_PCR16L,                     /* type */
         02,                            /* rightshift */
         1,                             /* size (0 = byte, 1 = short, 2 = long) */
         16,                            /* bitsize */

-        true,                          /* pc_relative */
+        TRUE,                          /* pc_relative */

         0,                             /* bitpos */
         complain_overflow_signed,      /* complain_on_overflow */
         m88k_special_reloc,            /* special_function */
         "PCR16L",                      /* name */
         0,                             /* bitpos */
         complain_overflow_signed,      /* complain_on_overflow */
         m88k_special_reloc,            /* special_function */
         "PCR16L",                      /* name */

-        false,                         /* partial_inplace */
+        FALSE,                         /* partial_inplace */

         0x0000ffff,                    /* src_mask */
         0x0000ffff,                    /* dst_mask */
         0x0000ffff,                    /* src_mask */
         0x0000ffff,                    /* dst_mask */

-        true),                         /* pcrel_offset */
+        TRUE),                         /* pcrel_offset */

 
   HOWTO (R_PCR26L,                     /* type */
         02,                            /* rightshift */
         2,                             /* size (0 = byte, 1 = short, 2 = long) */
         26,                            /* bitsize */
 
   HOWTO (R_PCR26L,                     /* type */
         02,                            /* rightshift */
         2,                             /* size (0 = byte, 1 = short, 2 = long) */
         26,                            /* bitsize */

-        true,                          /* pc_relative */
+        TRUE,                          /* pc_relative */

         0,                             /* bitpos */
         complain_overflow_signed,      /* complain_on_overflow */
         m88k_special_reloc,            /* special_function */
         "PCR26L",                      /* name */
         0,                             /* bitpos */
         complain_overflow_signed,      /* complain_on_overflow */
         m88k_special_reloc,            /* special_function */
         "PCR26L",                      /* name */

-        false,                         /* partial_inplace */
+        FALSE,                         /* partial_inplace */

         0x03ffffff,                    /* src_mask */
         0x03ffffff,                    /* dst_mask */
         0x03ffffff,                    /* src_mask */
         0x03ffffff,                    /* dst_mask */

-        true),                         /* pcrel_offset */
+        TRUE),                         /* pcrel_offset */

 
   HOWTO (R_VRT16,                      /* type */
         00,                            /* rightshift */
         1,                             /* size (0 = byte, 1 = short, 2 = long) */
         16,                            /* bitsize */
 
   HOWTO (R_VRT16,                      /* type */
         00,                            /* rightshift */
         1,                             /* size (0 = byte, 1 = short, 2 = long) */
         16,                            /* bitsize */

-        false,                         /* pc_relative */
+        FALSE,                         /* pc_relative */

         0,                             /* bitpos */
         complain_overflow_bitfield,    /* complain_on_overflow */
         m88k_special_reloc,            /* special_function */
         "VRT16",                       /* name */
         0,                             /* bitpos */
         complain_overflow_bitfield,    /* complain_on_overflow */
         m88k_special_reloc,            /* special_function */
         "VRT16",                       /* name */

-        false,                         /* partial_inplace */
+        FALSE,                         /* partial_inplace */

         0x0000ffff,                    /* src_mask */
         0x0000ffff,                    /* dst_mask */
         0x0000ffff,                    /* src_mask */
         0x0000ffff,                    /* dst_mask */

-        true),                         /* pcrel_offset */
+        TRUE),                         /* pcrel_offset */

 
   HOWTO (R_HVRT16,                     /* type */
         16,                            /* rightshift */
         1,                             /* size (0 = byte, 1 = short, 2 = long) */
         16,                            /* bitsize */
 
   HOWTO (R_HVRT16,                     /* type */
         16,                            /* rightshift */
         1,                             /* size (0 = byte, 1 = short, 2 = long) */
         16,                            /* bitsize */

-        false,                         /* pc_relative */
+        FALSE,                         /* pc_relative */

         0,                             /* bitpos */
         complain_overflow_dont,        /* complain_on_overflow */
         m88k_special_reloc,            /* special_function */
         "HVRT16",                      /* name */
         0,                             /* bitpos */
         complain_overflow_dont,        /* complain_on_overflow */
         m88k_special_reloc,            /* special_function */
         "HVRT16",                      /* name */

-        false,                         /* partial_inplace */
+        FALSE,                         /* partial_inplace */

         0x0000ffff,                    /* src_mask */
         0x0000ffff,                    /* dst_mask */
         0x0000ffff,                    /* src_mask */
         0x0000ffff,                    /* dst_mask */

-        true),                         /* pcrel_offset */
+        TRUE),                         /* pcrel_offset */

 
   HOWTO (R_LVRT16,                     /* type */
         00,                            /* rightshift */
         1,                             /* size (0 = byte, 1 = short, 2 = long) */
         16,                            /* bitsize */
 
   HOWTO (R_LVRT16,                     /* type */
         00,                            /* rightshift */
         1,                             /* size (0 = byte, 1 = short, 2 = long) */
         16,                            /* bitsize */

-        false,                         /* pc_relative */
+        FALSE,                         /* pc_relative */

         0,                             /* bitpos */
         complain_overflow_dont,        /* complain_on_overflow */
         m88k_special_reloc,            /* special_function */
         "LVRT16",                      /* name */
         0,                             /* bitpos */
         complain_overflow_dont,        /* complain_on_overflow */
         m88k_special_reloc,            /* special_function */
         "LVRT16",                      /* name */

-        false,                         /* partial_inplace */
+        FALSE,                         /* partial_inplace */

         0x0000ffff,                    /* src_mask */
         0x0000ffff,                    /* dst_mask */
         0x0000ffff,                    /* src_mask */
         0x0000ffff,                    /* dst_mask */

-        true),                         /* pcrel_offset */
+        TRUE),                         /* pcrel_offset */

 
   HOWTO (R_VRT32,                      /* type */
         00,                            /* rightshift */
         2,                             /* size (0 = byte, 1 = short, 2 = long) */
         32,                            /* bitsize */
 
   HOWTO (R_VRT32,                      /* type */
         00,                            /* rightshift */
         2,                             /* size (0 = byte, 1 = short, 2 = long) */
         32,                            /* bitsize */

-        false,                         /* pc_relative */
+        FALSE,                         /* pc_relative */

         0,                             /* bitpos */
         complain_overflow_bitfield,    /* complain_on_overflow */
         m88k_special_reloc,            /* special_function */
         "VRT32",                       /* name */
         0,                             /* bitpos */
         complain_overflow_bitfield,    /* complain_on_overflow */
         m88k_special_reloc,            /* special_function */
         "VRT32",                       /* name */

-        false,                         /* partial_inplace */
+        FALSE,                         /* partial_inplace */

         0xffffffff,                    /* src_mask */
         0xffffffff,                    /* dst_mask */
         0xffffffff,                    /* src_mask */
         0xffffffff,                    /* dst_mask */

-        true),                         /* pcrel_offset */
+        TRUE),                         /* pcrel_offset */

 };
 
 /* Code to turn an external r_type into a pointer to an entry in the
 };
 
 /* Code to turn an external r_type into a pointer to an entry in the


@@ -250,11 +252,9 @@ rtype2howto (cache_ptr, dst)
 
 #define RTYPE2HOWTO(cache_ptr, dst) rtype2howto (cache_ptr, dst)
 
 
 #define RTYPE2HOWTO(cache_ptr, dst) rtype2howto (cache_ptr, dst)
 

-

 /* Code to swap in the reloc offset */
 /* Code to swap in the reloc offset */

-#define SWAP_IN_RELOC_OFFSET  bfd_h_get_16
-#define SWAP_OUT_RELOC_OFFSET bfd_h_put_16
-
+#define SWAP_IN_RELOC_OFFSET  H_GET_16
+#define SWAP_OUT_RELOC_OFFSET H_PUT_16

 
 #define RELOC_PROCESSING(relent,reloc,symbols,abfd,section)    \
   reloc_processing(relent, reloc, symbols, abfd, section)
 
 #define RELOC_PROCESSING(relent,reloc,symbols,abfd,section)    \
   reloc_processing(relent, reloc, symbols, abfd, section)


@@ -288,4 +288,4 @@ reloc_processing (relent, reloc, symbols, abfd, section)
 
 #undef coff_write_armap
 
 
 #undef coff_write_armap
 

-CREATE_BIG_COFF_TARGET_VEC (m88kbcs_vec, "coff-m88kbcs", 0, 0, '_', NULL)
+CREATE_BIG_COFF_TARGET_VEC (m88kbcs_vec, "coff-m88kbcs", 0, 0, '_', NULL, COFF_SWAP_TABLE)