* NEWS: Document new options "set/show use-deprecated-index-sections",

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

diff --git a/bfd/coff-h8300.c b/bfd/coff-h8300.c
index 3c1125c3dd8c8a6c3c5e8d296431e96dd8a04aa6..0f1de573f1c5249277fedb1de745f11fe3c3364d 100644 (file)
--- a/bfd/coff-h8300.c
+++ b/bfd/coff-h8300.c
@@ -1,72 +1,65 @@
-/* BFD back-end for Hitachi H8/300 COFF binaries.
-   Copyright 1990, 91, 92, 93, 94, 95, 96, 97, 98, 1999
+/* BFD back-end for Renesas H8/300 COFF binaries.
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2012

    Free Software Foundation, Inc.
    Written by Steve Chamberlain, <sac@cygnus.com>.
 
    Free Software Foundation, Inc.
    Written by Steve Chamberlain, <sac@cygnus.com>.
 

-This file is part of BFD, the Binary File Descriptor library.
+   This file is part of BFD, the Binary File Descriptor library.

 
 

-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.

 
 

-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.

 
 

-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */

 
 

-#include "bfd.h"

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

+#include "bfd.h"

 #include "libbfd.h"
 #include "bfdlink.h"
 #include "genlink.h"
 #include "coff/h8300.h"
 #include "coff/internal.h"
 #include "libcoff.h"
 #include "libbfd.h"
 #include "bfdlink.h"
 #include "genlink.h"
 #include "coff/h8300.h"
 #include "coff/internal.h"
 #include "libcoff.h"

+#include "libiberty.h"

 
 #define COFF_DEFAULT_SECTION_ALIGNMENT_POWER (1)
 
 /* We derive a hash table from the basic BFD hash table to
 
 #define COFF_DEFAULT_SECTION_ALIGNMENT_POWER (1)
 
 /* We derive a hash table from the basic BFD hash table to

-   hold entries in the function vector.  Aside from the 
+   hold entries in the function vector.  Aside from the

    info stored by the basic hash table, we need the offset
    of a particular entry within the hash table as well as
    the offset where we'll add the next entry.  */
 
 struct funcvec_hash_entry
    info stored by the basic hash table, we need the offset
    of a particular entry within the hash table as well as
    the offset where we'll add the next entry.  */
 
 struct funcvec_hash_entry

-{
-  /* The basic hash table entry.  */
-  struct bfd_hash_entry root;
+  {
+    /* The basic hash table entry.  */
+    struct bfd_hash_entry root;

 
 

-  /* The offset within the vectors section where
-     this entry lives.  */
-  bfd_vma offset;
-};
+    /* The offset within the vectors section where
+       this entry lives.  */
+    bfd_vma offset;
+  };

 
 struct funcvec_hash_table
 
 struct funcvec_hash_table

-{
-  /* The basic hash table.  */
-  struct bfd_hash_table root;
-
-  bfd *abfd;
+  {
+    /* The basic hash table.  */
+    struct bfd_hash_table root;

 
 

-  /* Offset at which we'll add the next entry.  */
-  unsigned int offset;
-};
+    bfd *abfd;

 
 

-static struct bfd_hash_entry *
-funcvec_hash_newfunc
-  PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *, const char *));
+    /* Offset at which we'll add the next entry.  */
+    unsigned int offset;
+  };

 
 

-static boolean
-funcvec_hash_table_init
-  PARAMS ((struct funcvec_hash_table *, bfd *,
-           struct bfd_hash_entry *(*) PARAMS ((struct bfd_hash_entry *,
-                                               struct bfd_hash_table *,
-                                               const char *))));

 
 /* To lookup a value in the function vector hash table.  */
 #define funcvec_hash_lookup(table, string, create, copy) \
 
 /* To lookup a value in the function vector hash table.  */
 #define funcvec_hash_lookup(table, string, create, copy) \


@@ -77,8 +70,7 @@ funcvec_hash_table_init
    the generic linker hash table, not the COFF backend linker hash
    table!  We use this to attach additional data structures we
    need while linking on the h8300.  */
    the generic linker hash table, not the COFF backend linker hash
    table!  We use this to attach additional data structures we
    need while linking on the h8300.  */

-struct h8300_coff_link_hash_table
-{
+struct h8300_coff_link_hash_table {

   /* The main hash table.  */
   struct generic_link_hash_table root;
 
   /* The main hash table.  */
   struct generic_link_hash_table root;
 


@@ -91,8 +83,7 @@ struct h8300_coff_link_hash_table
   struct funcvec_hash_table *funcvec_hash_table;
 };
 
   struct funcvec_hash_table *funcvec_hash_table;
 };
 

-static struct bfd_link_hash_table *h8300_coff_link_hash_table_create
-  PARAMS ((bfd *));
+static struct bfd_link_hash_table *h8300_coff_link_hash_table_create (bfd *);

 
 /* Get the H8/300 COFF linker hash table from a link_info structure.  */
 
 
 /* Get the H8/300 COFF linker hash table from a link_info structure.  */
 


@@ -103,10 +94,9 @@ static struct bfd_link_hash_table *h8300_coff_link_hash_table_create
    a new entry is added to the funcvec hash table.  */
 
 static struct bfd_hash_entry *
    a new entry is added to the funcvec hash table.  */
 
 static struct bfd_hash_entry *

-funcvec_hash_newfunc (entry, gen_table, string)
-     struct bfd_hash_entry *entry;
-     struct bfd_hash_table *gen_table;
-     const char *string;
+funcvec_hash_newfunc (struct bfd_hash_entry *entry,
+                     struct bfd_hash_table *gen_table,
+                     const char *string)

 {
   struct funcvec_hash_entry *ret;
   struct funcvec_hash_table *table;
 {
   struct funcvec_hash_entry *ret;
   struct funcvec_hash_table *table;


@@ -118,14 +108,14 @@ funcvec_hash_newfunc (entry, gen_table, string)
      subclass.  */
   if (ret == NULL)
     ret = ((struct funcvec_hash_entry *)
      subclass.  */
   if (ret == NULL)
     ret = ((struct funcvec_hash_entry *)

-           bfd_hash_allocate (gen_table,
-                              sizeof (struct funcvec_hash_entry)));
+          bfd_hash_allocate (gen_table,
+                             sizeof (struct funcvec_hash_entry)));

   if (ret == NULL)
     return NULL;
 
   /* Call the allocation method of the superclass.  */
   ret = ((struct funcvec_hash_entry *)
   if (ret == NULL)
     return NULL;
 
   /* Call the allocation method of the superclass.  */
   ret = ((struct funcvec_hash_entry *)

-         bfd_hash_newfunc ((struct bfd_hash_entry *) ret, gen_table, string));
+        bfd_hash_newfunc ((struct bfd_hash_entry *) ret, gen_table, string));

 
   if (ret == NULL)
     return NULL;
 
   if (ret == NULL)
     return NULL;


@@ -136,13 +126,20 @@ funcvec_hash_newfunc (entry, gen_table, string)
   /* Bump the offset at which we store entries in the function
      vector.  We'd like to bump up the size of the vectors section,
      but it's not easily available here.  */
   /* Bump the offset at which we store entries in the function
      vector.  We'd like to bump up the size of the vectors section,
      but it's not easily available here.  */

-  if (bfd_get_mach (table->abfd) == bfd_mach_h8300)
-    table->offset += 2;
-  else if (bfd_get_mach (table->abfd) == bfd_mach_h8300h
-          || bfd_get_mach (table->abfd) == bfd_mach_h8300s)
-    table->offset += 4;
-  else
-    return NULL;
+ switch (bfd_get_mach (table->abfd))
+   {
+   case bfd_mach_h8300:
+   case bfd_mach_h8300hn:
+   case bfd_mach_h8300sn:
+     table->offset += 2;
+     break;
+   case bfd_mach_h8300h:
+   case bfd_mach_h8300s:
+     table->offset += 4;
+     break;
+   default:
+     return NULL;
+   }

 
   /* Everything went OK.  */
   return (struct bfd_hash_entry *) ret;
 
   /* Everything went OK.  */
   return (struct bfd_hash_entry *) ret;


@@ -150,37 +147,40 @@ funcvec_hash_newfunc (entry, gen_table, string)
 
 /* Initialize the function vector hash table.  */
 
 
 /* Initialize the function vector hash table.  */
 

-static boolean
-funcvec_hash_table_init (table, abfd, newfunc)
-     struct funcvec_hash_table *table;
-     bfd *abfd;
-     struct bfd_hash_entry *(*newfunc) PARAMS ((struct bfd_hash_entry *,
-                                                struct bfd_hash_table *,
-                                                const char *));
+static bfd_boolean
+funcvec_hash_table_init (struct funcvec_hash_table *table,
+                        bfd *abfd,
+                        struct bfd_hash_entry *(*newfunc)
+                          (struct bfd_hash_entry *,
+                           struct bfd_hash_table *,
+                           const char *),
+                        unsigned int entsize)

 {
   /* Initialize our local fields, then call the generic initialization
      routine.  */
   table->offset = 0;
   table->abfd = abfd;
 {
   /* Initialize our local fields, then call the generic initialization
      routine.  */
   table->offset = 0;
   table->abfd = abfd;

-  return (bfd_hash_table_init (&table->root, newfunc));
+  return (bfd_hash_table_init (&table->root, newfunc, entsize));

 }
 
 /* Create the derived linker hash table.  We use a derived hash table
 }
 
 /* Create the derived linker hash table.  We use a derived hash table

-   basically to hold "static" information during an h8/300 coff link
+   basically to hold "static" information during an H8/300 coff link

    without using static variables.  */
 
 static struct bfd_link_hash_table *
    without using static variables.  */
 
 static struct bfd_link_hash_table *

-h8300_coff_link_hash_table_create (abfd)
-     bfd *abfd;
+h8300_coff_link_hash_table_create (bfd *abfd)

 {
   struct h8300_coff_link_hash_table *ret;
 {
   struct h8300_coff_link_hash_table *ret;

-  ret = ((struct h8300_coff_link_hash_table *)
-         bfd_alloc (abfd, sizeof (struct h8300_coff_link_hash_table)));
+  bfd_size_type amt = sizeof (struct h8300_coff_link_hash_table);
+
+  ret = (struct h8300_coff_link_hash_table *) bfd_malloc (amt);

   if (ret == NULL)
     return NULL;
   if (ret == NULL)
     return NULL;

-  if (!_bfd_link_hash_table_init (&ret->root.root, abfd, _bfd_generic_link_hash_newfunc))
+  if (!_bfd_link_hash_table_init (&ret->root.root, abfd,
+                                 _bfd_generic_link_hash_newfunc,
+                                 sizeof (struct generic_link_hash_entry)))

     {
     {

-      bfd_release (abfd, ret);
+      free (ret);

       return NULL;
     }
 
       return NULL;
     }
 


@@ -188,105 +188,98 @@ h8300_coff_link_hash_table_create (abfd)
   ret->vectors_sec = NULL;
   ret->funcvec_hash_table = NULL;
 
   ret->vectors_sec = NULL;
   ret->funcvec_hash_table = NULL;
 

-  /* OK.  Everything's intialized, return the base pointer.  */
+  /* OK.  Everything's initialized, return the base pointer.  */

   return &ret->root.root;
 }
 
   return &ret->root.root;
 }
 

-/* special handling for H8/300 relocs.
+/* Special handling for H8/300 relocs.

    We only come here for pcrel stuff and return normally if not an -r link.
    When doing -r, we can't do any arithmetic for the pcrel stuff, because
    the code in reloc.c assumes that we can manipulate the targets of
    We only come here for pcrel stuff and return normally if not an -r link.
    When doing -r, we can't do any arithmetic for the pcrel stuff, because
    the code in reloc.c assumes that we can manipulate the targets of

-   the pcrel branches.  This isn't so, since the H8/300 can do relaxing, 
+   the pcrel branches.  This isn't so, since the H8/300 can do relaxing,

    which means that the gap after the instruction may not be enough to
    which means that the gap after the instruction may not be enough to

-   contain the offset required for the branch, so we have to use the only
-   the addend until the final link */
+   contain the offset required for the branch, so we have to use only
+   the addend until the final link.  */

 
 static bfd_reloc_status_type
 
 static bfd_reloc_status_type

-special (abfd, reloc_entry, symbol, data, input_section, output_bfd,
-                error_message)
-     bfd *abfd ATTRIBUTE_UNUSED;
-     arelent *reloc_entry ATTRIBUTE_UNUSED;
-     asymbol *symbol ATTRIBUTE_UNUSED;
-     PTR data ATTRIBUTE_UNUSED;
-     asection *input_section ATTRIBUTE_UNUSED;
-     bfd *output_bfd;
-     char **error_message ATTRIBUTE_UNUSED;
+special (bfd *      abfd ATTRIBUTE_UNUSED,
+        arelent *  reloc_entry ATTRIBUTE_UNUSED,
+        asymbol *  symbol ATTRIBUTE_UNUSED,
+        void *     data ATTRIBUTE_UNUSED,
+        asection * input_section ATTRIBUTE_UNUSED,
+        bfd *      output_bfd,
+        char **    error_message ATTRIBUTE_UNUSED)

 {
   if (output_bfd == (bfd *) NULL)
     return bfd_reloc_continue;
 
 {
   if (output_bfd == (bfd *) NULL)
     return bfd_reloc_continue;
 

+  /* Adjust the reloc address to that in the output section.  */
+  reloc_entry->address += input_section->output_offset;

   return bfd_reloc_ok;
 }
 
 static reloc_howto_type howto_table[] =
 {
   return bfd_reloc_ok;
 }
 
 static reloc_howto_type howto_table[] =
 {

-  HOWTO (R_RELBYTE, 0, 0, 8, false, 0, complain_overflow_bitfield, special, "8", false, 0x000000ff, 0x000000ff, false),
-  HOWTO (R_RELWORD, 0, 1, 16, false, 0, complain_overflow_bitfield, special, "16", false, 0x0000ffff, 0x0000ffff, false),
-  HOWTO (R_RELLONG, 0, 2, 32, false, 0, complain_overflow_bitfield, special, "32", false, 0xffffffff, 0xffffffff, false),
-  HOWTO (R_PCRBYTE, 0, 0, 8, true, 0, complain_overflow_signed, special, "DISP8", false, 0x000000ff, 0x000000ff, true),
-  HOWTO (R_PCRWORD, 0, 1, 16, true, 0, complain_overflow_signed, special, "DISP16", false, 0x0000ffff, 0x0000ffff, true),
-  HOWTO (R_PCRLONG, 0, 2, 32, true, 0, complain_overflow_signed, special, "DISP32", false, 0xffffffff, 0xffffffff, true),
-  HOWTO (R_MOV16B1, 0, 1, 16, false, 0, complain_overflow_bitfield, special, "relaxable mov.b:16", false, 0x0000ffff, 0x0000ffff, false),
-  HOWTO (R_MOV16B2, 0, 1, 8, false, 0, complain_overflow_bitfield, special, "relaxed mov.b:16", false, 0x000000ff, 0x000000ff, false),
-  HOWTO (R_JMP1, 0, 1, 16, false, 0, complain_overflow_bitfield, special, "16/pcrel", false, 0x0000ffff, 0x0000ffff, false),
-  HOWTO (R_JMP2, 0, 0, 8, false, 0, complain_overflow_bitfield, special, "pcrecl/16", false, 0x000000ff, 0x000000ff, false),
-  HOWTO (R_JMPL1, 0, 2, 32, false, 0, complain_overflow_bitfield, special, "24/pcrell", false, 0x00ffffff, 0x00ffffff, false),
-  HOWTO (R_JMPL2, 0, 0, 8, false, 0, complain_overflow_bitfield, special, "pc8/24", false, 0x000000ff, 0x000000ff, false),
-  HOWTO (R_MOV24B1, 0, 1, 32, false, 0, complain_overflow_bitfield, special, "relaxable mov.b:24", false, 0xffffffff, 0xffffffff, false),
-  HOWTO (R_MOV24B2, 0, 1, 8, false, 0, complain_overflow_bitfield, special, "relaxed mov.b:24", false, 0x0000ffff, 0x0000ffff, false),
+  HOWTO (R_RELBYTE, 0, 0, 8, FALSE, 0, complain_overflow_bitfield, special, "8", FALSE, 0x000000ff, 0x000000ff, FALSE),
+  HOWTO (R_RELWORD, 0, 1, 16, FALSE, 0, complain_overflow_bitfield, special, "16", FALSE, 0x0000ffff, 0x0000ffff, FALSE),
+  HOWTO (R_RELLONG, 0, 2, 32, FALSE, 0, complain_overflow_bitfield, special, "32", FALSE, 0xffffffff, 0xffffffff, FALSE),
+  HOWTO (R_PCRBYTE, 0, 0, 8, TRUE, 0, complain_overflow_signed, special, "DISP8", FALSE, 0x000000ff, 0x000000ff, TRUE),
+  HOWTO (R_PCRWORD, 0, 1, 16, TRUE, 0, complain_overflow_signed, special, "DISP16", FALSE, 0x0000ffff, 0x0000ffff, TRUE),
+  HOWTO (R_PCRLONG, 0, 2, 32, TRUE, 0, complain_overflow_signed, special, "DISP32", FALSE, 0xffffffff, 0xffffffff, TRUE),
+  HOWTO (R_MOV16B1, 0, 1, 16, FALSE, 0, complain_overflow_bitfield, special, "relaxable mov.b:16", FALSE, 0x0000ffff, 0x0000ffff, FALSE),
+  HOWTO (R_MOV16B2, 0, 1, 8, FALSE, 0, complain_overflow_bitfield, special, "relaxed mov.b:16", FALSE, 0x000000ff, 0x000000ff, FALSE),
+  HOWTO (R_JMP1, 0, 1, 16, FALSE, 0, complain_overflow_bitfield, special, "16/pcrel", FALSE, 0x0000ffff, 0x0000ffff, FALSE),
+  HOWTO (R_JMP2, 0, 0, 8, FALSE, 0, complain_overflow_bitfield, special, "pcrecl/16", FALSE, 0x000000ff, 0x000000ff, FALSE),
+  HOWTO (R_JMPL1, 0, 2, 32, FALSE, 0, complain_overflow_bitfield, special, "24/pcrell", FALSE, 0x00ffffff, 0x00ffffff, FALSE),
+  HOWTO (R_JMPL2, 0, 0, 8, FALSE, 0, complain_overflow_bitfield, special, "pc8/24", FALSE, 0x000000ff, 0x000000ff, FALSE),
+  HOWTO (R_MOV24B1, 0, 1, 32, FALSE, 0, complain_overflow_bitfield, special, "relaxable mov.b:24", FALSE, 0xffffffff, 0xffffffff, FALSE),
+  HOWTO (R_MOV24B2, 0, 1, 8, FALSE, 0, complain_overflow_bitfield, special, "relaxed mov.b:24", FALSE, 0x0000ffff, 0x0000ffff, FALSE),

 
   /* An indirect reference to a function.  This causes the function's address
      to be added to the function vector in lo-mem and puts the address of
      the function vector's entry in the jsr instruction.  */
 
   /* An indirect reference to a function.  This causes the function's address
      to be added to the function vector in lo-mem and puts the address of
      the function vector's entry in the jsr instruction.  */

-  HOWTO (R_MEM_INDIRECT, 0, 0, 8, false, 0, complain_overflow_bitfield, special, "8/indirect", false, 0x000000ff, 0x000000ff, false),
+  HOWTO (R_MEM_INDIRECT, 0, 0, 8, FALSE, 0, complain_overflow_bitfield, special, "8/indirect", FALSE, 0x000000ff, 0x000000ff, FALSE),

 
 

-  /* Internal reloc for relaxing.  This is created when a 16bit pc-relative
-     branch is turned into an 8bit pc-relative branch.  */
-  HOWTO (R_PCRWORD_B, 0, 0, 8, true, 0, complain_overflow_bitfield, special, "relaxed bCC:16", false, 0x000000ff, 0x000000ff, false),
+  /* Internal reloc for relaxing.  This is created when a 16-bit pc-relative
+     branch is turned into an 8-bit pc-relative branch.  */
+  HOWTO (R_PCRWORD_B, 0, 0, 8, TRUE, 0, complain_overflow_bitfield, special, "relaxed bCC:16", FALSE, 0x000000ff, 0x000000ff, FALSE),

 
 

-  HOWTO (R_MOVL1, 0, 2, 32, false, 0, complain_overflow_bitfield,special, "32/24 relaxable move", false, 0xffffffff, 0xffffffff, false),
+  HOWTO (R_MOVL1, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,special, "32/24 relaxable move", FALSE, 0xffffffff, 0xffffffff, FALSE),

 
 

-  HOWTO (R_MOVL2, 0, 1, 16, false, 0, complain_overflow_bitfield, special, "32/24 relaxed move", false, 0x0000ffff, 0x0000ffff, false),
+  HOWTO (R_MOVL2, 0, 1, 16, FALSE, 0, complain_overflow_bitfield, special, "32/24 relaxed move", FALSE, 0x0000ffff, 0x0000ffff, FALSE),

 
 

-  HOWTO (R_BCC_INV, 0, 0, 8, true, 0, complain_overflow_signed, special, "DISP8 inverted", false, 0x000000ff, 0x000000ff, true),
+  HOWTO (R_BCC_INV, 0, 0, 8, TRUE, 0, complain_overflow_signed, special, "DISP8 inverted", FALSE, 0x000000ff, 0x000000ff, TRUE),

 
 

-  HOWTO (R_JMP_DEL, 0, 0, 8, true, 0, complain_overflow_signed, special, "Deleted jump", false, 0x000000ff, 0x000000ff, true),
+  HOWTO (R_JMP_DEL, 0, 0, 8, TRUE, 0, complain_overflow_signed, special, "Deleted jump", FALSE, 0x000000ff, 0x000000ff, TRUE),

 };
 
 };
 

-
-/* Turn a howto into a reloc number */
+/* Turn a howto into a reloc number.  */

 
 #define SELECT_RELOC(x,howto) \
 
 #define SELECT_RELOC(x,howto) \

-  { x.r_type = select_reloc(howto); }
+  { x.r_type = select_reloc (howto); }

 
 

-#define BADMAG(x) (H8300BADMAG(x) && H8300HBADMAG(x) && H8300SBADMAG(x))
-#define H8300 1                        /* Customize coffcode.h */
+#define BADMAG(x) (H8300BADMAG (x) && H8300HBADMAG (x) && H8300SBADMAG (x) \
+                                  && H8300HNBADMAG(x) && H8300SNBADMAG(x))
+#define H8300 1                        /* Customize coffcode.h  */

 #define __A_MAGIC_SET__
 
 #define __A_MAGIC_SET__
 

-
-
-/* Code to swap in the reloc */
-#define SWAP_IN_RELOC_OFFSET   bfd_h_get_32
-#define SWAP_OUT_RELOC_OFFSET bfd_h_put_32
+/* Code to swap in the reloc.  */
+#define SWAP_IN_RELOC_OFFSET   H_GET_32
+#define SWAP_OUT_RELOC_OFFSET  H_PUT_32

 #define SWAP_OUT_RELOC_EXTRA(abfd, src, dst) \
   dst->r_stuff[0] = 'S'; \
   dst->r_stuff[1] = 'C';
 
 #define SWAP_OUT_RELOC_EXTRA(abfd, src, dst) \
   dst->r_stuff[0] = 'S'; \
   dst->r_stuff[1] = 'C';
 

-

 static int
 static int

-select_reloc (howto)
-     reloc_howto_type *howto;
+select_reloc (reloc_howto_type *howto)

 {
   return howto->type;
 }
 
 {
   return howto->type;
 }
 

-/* Code to turn a r_type into a howto ptr, uses the above howto table
-   */
+/* Code to turn a r_type into a howto ptr, uses the above howto table.  */

 
 static void
 
 static void

-rtype2howto (internal, dst)
-     arelent *internal;
-     struct internal_reloc *dst;
+rtype2howto (arelent *internal, struct internal_reloc *dst)

 {
   switch (dst->r_type)
     {
 {
   switch (dst->r_type)
     {


@@ -356,52 +349,34 @@ rtype2howto (internal, dst)
     }
 }
 
     }
 }
 

-#define RTYPE2HOWTO(internal, relocentry) rtype2howto(internal,relocentry)
-
-
-/* Perform any necessary magic to the addend in a reloc entry */
+#define RTYPE2HOWTO(internal, relocentry) rtype2howto (internal, relocentry)

 
 

+/* Perform any necessary magic to the addend in a reloc entry.  */

 
 #define CALC_ADDEND(abfd, symbol, ext_reloc, cache_ptr) \
 
 #define CALC_ADDEND(abfd, symbol, ext_reloc, cache_ptr) \

- cache_ptr->addend =  ext_reloc.r_offset;
-
+ cache_ptr->addend = ext_reloc.r_offset;

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

- reloc_processing(relent, reloc, symbols, abfd, section)
+ reloc_processing (relent, reloc, symbols, abfd, section)

 
 static void
 
 static void

-reloc_processing (relent, reloc, symbols, abfd, section)
-     arelent * relent;
-     struct internal_reloc *reloc;
-     asymbol ** symbols;
-     bfd * abfd;
-     asection * section;
+reloc_processing (arelent *relent, struct internal_reloc *reloc,
+                 asymbol **symbols, bfd *abfd, asection *section)

 {
   relent->address = reloc->r_vaddr;
   rtype2howto (relent, reloc);
 
   if (((int) reloc->r_symndx) > 0)
 {
   relent->address = reloc->r_vaddr;
   rtype2howto (relent, reloc);
 
   if (((int) reloc->r_symndx) > 0)

-    {
-      relent->sym_ptr_ptr = symbols + obj_convert (abfd)[reloc->r_symndx];
-    }
+    relent->sym_ptr_ptr = symbols + obj_convert (abfd)[reloc->r_symndx];

   else
   else

-    {
-      relent->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr;
-    }
-
-
+    relent->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr;

 
   relent->addend = reloc->r_offset;
 
   relent->addend = reloc->r_offset;

-

   relent->address -= section->vma;
   relent->address -= section->vma;

-  /*  relent->section = 0;*/

 }
 
 }
 

-static boolean
-h8300_symbol_address_p (abfd, input_section, address)
-     bfd *abfd;
-     asection *input_section;
-     bfd_vma address;
+static bfd_boolean
+h8300_symbol_address_p (bfd *abfd, asection *input_section, bfd_vma address)

 {
   asymbol **s;
 
 {
   asymbol **s;
 


@@ -410,20 +385,20 @@ h8300_symbol_address_p (abfd, input_section, address)
 
   /* Search all the symbols for one in INPUT_SECTION with
      address ADDRESS.  */
 
   /* Search all the symbols for one in INPUT_SECTION with
      address ADDRESS.  */

-  while (*s) 
+  while (*s)

     {
       asymbol *p = *s;
     {
       asymbol *p = *s;

+

       if (p->section == input_section
          && (input_section->output_section->vma
              + input_section->output_offset
              + p->value) == address)
       if (p->section == input_section
          && (input_section->output_section->vma
              + input_section->output_offset
              + p->value) == address)

-       return true;
+       return TRUE;

       s++;
       s++;

-    }    
-  return false;
+    }
+  return FALSE;

 }
 
 }
 

-

 /* If RELOC represents a relaxable instruction/reloc, change it into
    the relaxed reloc, notify the linker that symbol addresses
    have changed (bfd_perform_slip) and return how much the current
 /* If RELOC represents a relaxable instruction/reloc, change it into
    the relaxed reloc, notify the linker that symbol addresses
    have changed (bfd_perform_slip) and return how much the current


@@ -433,20 +408,16 @@ h8300_symbol_address_p (abfd, input_section, address)
    in the howto table.  This needs to be fixed.  */
 
 static int
    in the howto table.  This needs to be fixed.  */
 
 static int

-h8300_reloc16_estimate(abfd, input_section, reloc, shrink, link_info)
-     bfd *abfd;
-     asection *input_section;
-     arelent *reloc;
-     unsigned int shrink;
-     struct bfd_link_info *link_info;
+h8300_reloc16_estimate (bfd *abfd, asection *input_section, arelent *reloc,
+                       unsigned int shrink, struct bfd_link_info *link_info)

 {
 {

-  bfd_vma value;  
+  bfd_vma value;

   bfd_vma dot;
   bfd_vma gap;
   static asection *last_input_section = NULL;
   static arelent *last_reloc = NULL;
 
   bfd_vma dot;
   bfd_vma gap;
   static asection *last_input_section = NULL;
   static arelent *last_reloc = NULL;
 

-  /* The address of the thing to be relocated will have moved back by 
+  /* The address of the thing to be relocated will have moved back by

      the size of the shrink - but we don't change reloc->address here,
      since we need it to know where the relocation lives in the source
      uncooked section.  */
      the size of the shrink - but we don't change reloc->address here,
      since we need it to know where the relocation lives in the source
      uncooked section.  */


@@ -457,14 +428,13 @@ h8300_reloc16_estimate(abfd, input_section, reloc, shrink, link_info)
 
   /* Only examine the relocs which might be relaxable.  */
   switch (reloc->howto->type)
 
   /* Only examine the relocs which might be relaxable.  */
   switch (reloc->howto->type)

-    {     
-
-    /* This is the 16/24 bit absolute branch which could become an 8 bit
-       pc-relative branch.  */
+    {
+      /* This is the 16-/24-bit absolute branch which could become an
+        8-bit pc-relative branch.  */

     case R_JMP1:
     case R_JMPL1:
       /* Get the address of the target of this branch.  */
     case R_JMP1:
     case R_JMPL1:
       /* Get the address of the target of this branch.  */

-      value = bfd_coff_reloc16_get_value(reloc, link_info, input_section);
+      value = bfd_coff_reloc16_get_value (reloc, link_info, input_section);

 
       /* Get the address of the next instruction (not the reloc).  */
       dot = (input_section->output_section->vma
 
       /* Get the address of the next instruction (not the reloc).  */
       dot = (input_section->output_section->vma


@@ -475,12 +445,18 @@ h8300_reloc16_estimate(abfd, input_section, reloc, shrink, link_info)
 
       /* Compute the distance from this insn to the branch target.  */
       gap = value - dot;
 
       /* Compute the distance from this insn to the branch target.  */
       gap = value - dot;

-  
+

       /* If the distance is within -128..+128 inclusive, then we can relax
         this jump.  +128 is valid since the target will move two bytes
         closer if we do relax this branch.  */
       /* If the distance is within -128..+128 inclusive, then we can relax
         this jump.  +128 is valid since the target will move two bytes
         closer if we do relax this branch.  */

-      if ((int)gap >= -128 && (int)gap <= 128 )
-       { 
+      if ((int) gap >= -128 && (int) gap <= 128)
+       {
+         bfd_byte code;
+
+         if (!bfd_get_section_contents (abfd, input_section, & code,
+                                        reloc->address, 1))
+           break;
+         code = bfd_get_8 (abfd, & code);

 
          /* It's possible we may be able to eliminate this branch entirely;
             if the previous instruction is a branch around this instruction,
 
          /* It's possible we may be able to eliminate this branch entirely;
             if the previous instruction is a branch around this instruction,


@@ -491,11 +467,27 @@ h8300_reloc16_estimate(abfd, input_section, reloc, shrink, link_info)
                 bCC lab1                       bCC' lab2
                 jmp lab2
                lab1:                           lab1:
                 bCC lab1                       bCC' lab2
                 jmp lab2
                lab1:                           lab1:

-       
-            This saves 4 bytes instead of two, and should be relatively
-            common.  */

 
 

-         if (gap <= 126
+            This saves 4 bytes instead of two, and should be relatively
+            common.
+
+            Only perform this optimisation for jumps (code 0x5a) not
+            subroutine calls, as otherwise it could transform:
+
+                            mov.w   r0,r0
+                            beq     .L1
+                            jsr     @_bar
+                     .L1:   rts
+                     _bar:  rts
+            into:
+                            mov.w   r0,r0
+                            bne     _bar
+                            rts
+                     _bar:  rts
+
+            which changes the call (jsr) into a branch (bne).  */
+         if (code == 0x5a
+             && gap <= 126

              && last_reloc
              && last_reloc->howto->type == R_PCRBYTE)
            {
              && last_reloc
              && last_reloc->howto->type == R_PCRBYTE)
            {


@@ -505,7 +497,7 @@ h8300_reloc16_estimate(abfd, input_section, reloc, shrink, link_info)
 
              if (last_value == dot + 2
                  && last_reloc->address + 1 == reloc->address
 
              if (last_value == dot + 2
                  && last_reloc->address + 1 == reloc->address

-                 && ! h8300_symbol_address_p (abfd, input_section, dot - 2))
+                 && !h8300_symbol_address_p (abfd, input_section, dot - 2))

                {
                  reloc->howto = howto_table + 19;
                  last_reloc->howto = howto_table + 18;
                {
                  reloc->howto = howto_table + 19;
                  last_reloc->howto = howto_table + 18;


@@ -518,118 +510,109 @@ h8300_reloc16_estimate(abfd, input_section, reloc, shrink, link_info)
            }
 
          /* Change the reloc type.  */
            }
 
          /* Change the reloc type.  */

-         reloc->howto = reloc->howto + 1;        
+         reloc->howto = reloc->howto + 1;

 
          /* This shrinks this section by two bytes.  */
          shrink += 2;
 
          /* This shrinks this section by two bytes.  */
          shrink += 2;

-         bfd_perform_slip(abfd, 2, input_section, address);
+         bfd_perform_slip (abfd, 2, input_section, address);

        }
       break;
 
        }
       break;
 

-    /* This is the 16 bit pc-relative branch which could become an 8 bit
+    /* This is the 16-bit pc-relative branch which could become an 8-bit

        pc-relative branch.  */
     case R_PCRWORD:
       /* Get the address of the target of this branch, add one to the value
        pc-relative branch.  */
     case R_PCRWORD:
       /* Get the address of the target of this branch, add one to the value

-         because the addend field in PCrel jumps is off by -1.  */
-      value = bfd_coff_reloc16_get_value(reloc, link_info, input_section) + 1;
-       
+        because the addend field in PCrel jumps is off by -1.  */
+      value = bfd_coff_reloc16_get_value (reloc, link_info, input_section) + 1;
+

       /* Get the address of the next instruction if we were to relax.  */
       dot = input_section->output_section->vma +
        input_section->output_offset + address;
       /* Get the address of the next instruction if we were to relax.  */
       dot = input_section->output_section->vma +
        input_section->output_offset + address;

-  
+

       /* Compute the distance from this insn to the branch target.  */
       gap = value - dot;
 
       /* If the distance is within -128..+128 inclusive, then we can relax
         this jump.  +128 is valid since the target will move two bytes
         closer if we do relax this branch.  */
       /* Compute the distance from this insn to the branch target.  */
       gap = value - dot;
 
       /* If the distance is within -128..+128 inclusive, then we can relax
         this jump.  +128 is valid since the target will move two bytes
         closer if we do relax this branch.  */

-      if ((int)gap >= -128 && (int)gap <= 128 )
-       { 
+      if ((int) gap >= -128 && (int) gap <= 128)
+       {

          /* Change the reloc type.  */
          reloc->howto = howto_table + 15;
 
          /* This shrinks this section by two bytes.  */
          shrink += 2;
          /* Change the reloc type.  */
          reloc->howto = howto_table + 15;
 
          /* This shrinks this section by two bytes.  */
          shrink += 2;

-         bfd_perform_slip(abfd, 2, input_section, address);
+         bfd_perform_slip (abfd, 2, input_section, address);

        }
       break;
 
        }
       break;
 

-    /* This is a 16 bit absolute address in a mov.b insn, which can
-       become an 8 bit absolute address if it's in the right range.  */
+    /* This is a 16-bit absolute address in a mov.b insn, which can
+       become an 8-bit absolute address if it's in the right range.  */

     case R_MOV16B1:
       /* Get the address of the data referenced by this mov.b insn.  */
     case R_MOV16B1:
       /* Get the address of the data referenced by this mov.b insn.  */

-      value = bfd_coff_reloc16_get_value(reloc, link_info, input_section);
-
-      /* The address is in 0xff00..0xffff inclusive on the h8300 or
-        0xffff00..0xffffff inclusive on the h8300h, then we can
-        relax this mov.b  */
-      if ((bfd_get_mach (abfd) == bfd_mach_h8300
-          && value >= 0xff00
-          && value <= 0xffff)
-         || ((bfd_get_mach (abfd) == bfd_mach_h8300h
-              || bfd_get_mach (abfd) == bfd_mach_h8300s)
-             && value >= 0xffff00
-             && value <= 0xffffff))
+      value = bfd_coff_reloc16_get_value (reloc, link_info, input_section);
+      value = bfd_h8300_pad_address (abfd, value);
+
+      /* If the address is in the top 256 bytes of the address space
+        then we can relax this instruction.  */
+      if (value >= 0xffffff00u)

        {
          /* Change the reloc type.  */
          reloc->howto = reloc->howto + 1;
 
          /* This shrinks this section by two bytes.  */
          shrink += 2;
        {
          /* Change the reloc type.  */
          reloc->howto = reloc->howto + 1;
 
          /* This shrinks this section by two bytes.  */
          shrink += 2;

-         bfd_perform_slip(abfd, 2, input_section, address);
+         bfd_perform_slip (abfd, 2, input_section, address);

        }
       break;
 
        }
       break;
 

-    /* Similarly for a 24 bit absolute address in a mov.b.  Note that
-       if we can't relax this into an 8 bit absolute, we'll fall through
-       and try to relax it into a 16bit absolute.  */
+    /* Similarly for a 24-bit absolute address in a mov.b.  Note that
+       if we can't relax this into an 8-bit absolute, we'll fall through
+       and try to relax it into a 16-bit absolute.  */

     case R_MOV24B1:
       /* Get the address of the data referenced by this mov.b insn.  */
     case R_MOV24B1:
       /* Get the address of the data referenced by this mov.b insn.  */

-      value = bfd_coff_reloc16_get_value(reloc, link_info, input_section);
-
-      /* The address is in 0xffff00..0xffffff inclusive on the h8300h,
-        then we can relax this mov.b  */
-      if ((bfd_get_mach (abfd) == bfd_mach_h8300h
-          || bfd_get_mach (abfd) == bfd_mach_h8300s)
-         && value >= 0xffff00
-         && value <= 0xffffff)
+      value = bfd_coff_reloc16_get_value (reloc, link_info, input_section);
+      value = bfd_h8300_pad_address (abfd, value);
+
+      if (value >= 0xffffff00u)

        {
          /* Change the reloc type.  */
          reloc->howto = reloc->howto + 1;
 
          /* This shrinks this section by four bytes.  */
          shrink += 4;
        {
          /* Change the reloc type.  */
          reloc->howto = reloc->howto + 1;
 
          /* This shrinks this section by four bytes.  */
          shrink += 4;

-         bfd_perform_slip(abfd, 4, input_section, address);
+         bfd_perform_slip (abfd, 4, input_section, address);

 
          /* Done with this reloc.  */
          break;
        }
 
 
          /* Done with this reloc.  */
          break;
        }
 

-      /* FALLTHROUGH and try to turn the 32/24 bit reloc into a 16 bit
+      /* FALLTHROUGH and try to turn the 24-/32-bit reloc into a 16-bit

         reloc.  */
 
         reloc.  */
 

-    /* This is a 24/32 bit absolute address in a mov insn, which can
-       become an 16 bit absolute address if it's in the right range.  */
+    /* This is a 24-/32-bit absolute address in a mov insn, which can
+       become an 16-bit absolute address if it's in the right range.  */

     case R_MOVL1:
       /* Get the address of the data referenced by this mov insn.  */
     case R_MOVL1:
       /* Get the address of the data referenced by this mov insn.  */

-      value = bfd_coff_reloc16_get_value(reloc, link_info, input_section);
+      value = bfd_coff_reloc16_get_value (reloc, link_info, input_section);
+      value = bfd_h8300_pad_address (abfd, value);

 
 

-      /* If this address is in 0x0000..0x7fff inclusive or
-         0xff8000..0xffffff inclusive, then it can be relaxed.  */
-      if (value <= 0x7fff || value >= 0xff8000)
+      /* If the address is a sign-extended 16-bit value then we can
+         relax this instruction.  */
+      if (value <= 0x7fff || value >= 0xffff8000u)

        {
          /* Change the reloc type.  */
          reloc->howto = howto_table + 17;
 
          /* This shrinks this section by two bytes.  */
          shrink += 2;
        {
          /* Change the reloc type.  */
          reloc->howto = howto_table + 17;
 
          /* This shrinks this section by two bytes.  */
          shrink += 2;

-         bfd_perform_slip(abfd, 2, input_section, address);
+         bfd_perform_slip (abfd, 2, input_section, address);

        }
       break;
 
       /* No other reloc types represent relaxing opportunities.  */
        }
       break;
 
       /* No other reloc types represent relaxing opportunities.  */

-      default:
-       break;
+    default:
+      break;

     }
 
   last_reloc = reloc;
     }
 
   last_reloc = reloc;


@@ -637,40 +620,34 @@ h8300_reloc16_estimate(abfd, input_section, reloc, shrink, link_info)
   return shrink;
 }
 
   return shrink;
 }
 

-

 /* Handle relocations for the H8/300, including relocs for relaxed
    instructions.
 
    FIXME: Not all relocations check for overflow!  */
 
 static void
 /* Handle relocations for the H8/300, including relocs for relaxed
    instructions.
 
    FIXME: Not all relocations check for overflow!  */
 
 static void

-h8300_reloc16_extra_cases (abfd, link_info, link_order, reloc, data, src_ptr,
-                          dst_ptr)
-     bfd *abfd;
-     struct bfd_link_info *link_info;
-     struct bfd_link_order *link_order;
-     arelent *reloc;
-     bfd_byte *data;
-     unsigned int *src_ptr;
-     unsigned int *dst_ptr;
+h8300_reloc16_extra_cases (bfd *abfd, struct bfd_link_info *link_info,
+                          struct bfd_link_order *link_order, arelent *reloc,
+                          bfd_byte *data, unsigned int *src_ptr,
+                          unsigned int *dst_ptr)

 {
   unsigned int src_address = *src_ptr;
   unsigned int dst_address = *dst_ptr;
   asection *input_section = link_order->u.indirect.section;
   bfd_vma value;
   bfd_vma dot;
 {
   unsigned int src_address = *src_ptr;
   unsigned int dst_address = *dst_ptr;
   asection *input_section = link_order->u.indirect.section;
   bfd_vma value;
   bfd_vma dot;

-  int gap,tmp;
+  int gap, tmp;
+  unsigned char temp_code;

 
   switch (reloc->howto->type)
     {
 
   switch (reloc->howto->type)
     {

-
-    /* Generic 8bit pc-relative relocation.  */
+    /* Generic 8-bit pc-relative relocation.  */

     case R_PCRBYTE:
       /* Get the address of the target of this branch.  */
     case R_PCRBYTE:
       /* Get the address of the target of this branch.  */

-      value = bfd_coff_reloc16_get_value(reloc, link_info, input_section);
+      value = bfd_coff_reloc16_get_value (reloc, link_info, input_section);

 
 

-      dot = (link_order->offset 
-            + dst_address 
+      dot = (input_section->output_offset
+            + dst_address

             + link_order->u.indirect.section->output_section->vma);
 
       gap = value - dot;
             + link_order->u.indirect.section->output_section->vma);
 
       gap = value - dot;


@@ -679,7 +656,8 @@ h8300_reloc16_extra_cases (abfd, link_info, link_order, reloc, data, src_ptr,
       if (gap < -128 || gap > 126)
        {
          if (! ((*link_info->callbacks->reloc_overflow)
       if (gap < -128 || gap > 126)
        {
          if (! ((*link_info->callbacks->reloc_overflow)

-                (link_info, bfd_asymbol_name (*reloc->sym_ptr_ptr),
+                (link_info, NULL,
+                 bfd_asymbol_name (*reloc->sym_ptr_ptr),

                  reloc->howto->name, reloc->addend, input_section->owner,
                  input_section, reloc->address)))
            abort ();
                  reloc->howto->name, reloc->addend, input_section->owner,
                  input_section, reloc->address)))
            abort ();


@@ -687,7 +665,6 @@ h8300_reloc16_extra_cases (abfd, link_info, link_order, reloc, data, src_ptr,
 
       /* Everything looks OK.  Apply the relocation and update the
         src/dst address appropriately.  */
 
       /* Everything looks OK.  Apply the relocation and update the
         src/dst address appropriately.  */

-

       bfd_put_8 (abfd, gap, data + dst_address);
       dst_address++;
       src_address++;
       bfd_put_8 (abfd, gap, data + dst_address);
       dst_address++;
       src_address++;


@@ -695,14 +672,14 @@ h8300_reloc16_extra_cases (abfd, link_info, link_order, reloc, data, src_ptr,
       /* All done.  */
       break;
 
       /* All done.  */
       break;
 

-    /* Generic 16bit pc-relative relocation.  */
+    /* Generic 16-bit pc-relative relocation.  */

     case R_PCRWORD:
       /* Get the address of the target of this branch.  */
     case R_PCRWORD:
       /* Get the address of the target of this branch.  */

-      value = bfd_coff_reloc16_get_value(reloc, link_info, input_section);
+      value = bfd_coff_reloc16_get_value (reloc, link_info, input_section);

 
       /* Get the address of the instruction (not the reloc).  */
 
       /* Get the address of the instruction (not the reloc).  */

-      dot = (link_order->offset 
-            + dst_address 
+      dot = (input_section->output_offset
+            + dst_address

             + link_order->u.indirect.section->output_section->vma + 1);
 
       gap = value - dot;
             + link_order->u.indirect.section->output_section->vma + 1);
 
       gap = value - dot;


@@ -711,7 +688,8 @@ h8300_reloc16_extra_cases (abfd, link_info, link_order, reloc, data, src_ptr,
       if (gap > 32766 || gap < -32768)
        {
          if (! ((*link_info->callbacks->reloc_overflow)
       if (gap > 32766 || gap < -32768)
        {
          if (! ((*link_info->callbacks->reloc_overflow)

-                (link_info, bfd_asymbol_name (*reloc->sym_ptr_ptr),
+                (link_info, NULL,
+                 bfd_asymbol_name (*reloc->sym_ptr_ptr),

                  reloc->howto->name, reloc->addend, input_section->owner,
                  input_section, reloc->address)))
            abort ();
                  reloc->howto->name, reloc->addend, input_section->owner,
                  input_section, reloc->address)))
            abort ();


@@ -719,66 +697,47 @@ h8300_reloc16_extra_cases (abfd, link_info, link_order, reloc, data, src_ptr,
 
       /* Everything looks OK.  Apply the relocation and update the
         src/dst address appropriately.  */
 
       /* Everything looks OK.  Apply the relocation and update the
         src/dst address appropriately.  */

-
-      bfd_put_16 (abfd, gap, data + dst_address);
+      bfd_put_16 (abfd, (bfd_vma) gap, data + dst_address);

       dst_address += 2;
       src_address += 2;
 
       /* All done.  */
       break;
 
       dst_address += 2;
       src_address += 2;
 
       /* All done.  */
       break;
 

-    /* Generic 8bit absolute relocation.  */
+    /* Generic 8-bit absolute relocation.  */

     case R_RELBYTE:
       /* Get the address of the object referenced by this insn.  */
       value = bfd_coff_reloc16_get_value (reloc, link_info, input_section);
 
     case R_RELBYTE:
       /* Get the address of the object referenced by this insn.  */
       value = bfd_coff_reloc16_get_value (reloc, link_info, input_section);
 

-      /* Sanity check.  */
-      if (value <= 0xff
-         || (value >= 0x0000ff00 && value <= 0x0000ffff)
-         || (value >= 0x00ffff00 && value <= 0x00ffffff)
-         || (value >= 0xffffff00 && value <= 0xffffffff))
-       {
-         /* Everything looks OK.  Apply the relocation and update the
-            src/dst address appropriately.  */
-
-         bfd_put_8 (abfd, value & 0xff, data + dst_address);
-         dst_address += 1;
-         src_address += 1;
-       }
-      else
-       {
-         if (! ((*link_info->callbacks->reloc_overflow)
-                (link_info, bfd_asymbol_name (*reloc->sym_ptr_ptr),
-                 reloc->howto->name, reloc->addend, input_section->owner,
-                 input_section, reloc->address)))
-           abort ();
-       }
+      bfd_put_8 (abfd, value & 0xff, data + dst_address);
+      dst_address += 1;
+      src_address += 1;

 
       /* All done.  */
       break;
 
 
       /* All done.  */
       break;
 

-    /* Various simple 16bit absolute relocations.  */
+    /* Various simple 16-bit absolute relocations.  */

     case R_MOV16B1:
     case R_JMP1:
     case R_RELWORD:
     case R_MOV16B1:
     case R_JMP1:
     case R_RELWORD:

-      value = bfd_coff_reloc16_get_value(reloc, link_info, input_section);
+      value = bfd_coff_reloc16_get_value (reloc, link_info, input_section);

       bfd_put_16 (abfd, value, data + dst_address);
       dst_address += 2;
       src_address += 2;
       break;
 
       bfd_put_16 (abfd, value, data + dst_address);
       dst_address += 2;
       src_address += 2;
       break;
 

-    /* Various simple 24/32bit absolute relocations.  */
+    /* Various simple 24-/32-bit absolute relocations.  */

     case R_MOV24B1:
     case R_MOVL1:
     case R_RELLONG:
       /* Get the address of the target of this branch.  */
     case R_MOV24B1:
     case R_MOVL1:
     case R_RELLONG:
       /* Get the address of the target of this branch.  */

-      value = bfd_coff_reloc16_get_value (reloc, link_info, input_section),
+      value = bfd_coff_reloc16_get_value (reloc, link_info, input_section);

       bfd_put_32 (abfd, value, data + dst_address);
       dst_address += 4;
       src_address += 4;
       break;
 
       bfd_put_32 (abfd, value, data + dst_address);
       dst_address += 4;
       src_address += 4;
       break;
 

-    /* Another 24/32bit absolute relocation.  */
+    /* Another 24-/32-bit absolute relocation.  */

     case R_JMPL1:
       /* Get the address of the target of this branch.  */
       value = bfd_coff_reloc16_get_value (reloc, link_info, input_section);
     case R_JMPL1:
       /* Get the address of the target of this branch.  */
       value = bfd_coff_reloc16_get_value (reloc, link_info, input_section);


@@ -790,40 +749,50 @@ h8300_reloc16_extra_cases (abfd, link_info, link_order, reloc, data, src_ptr,
       src_address += 4;
       break;
 
       src_address += 4;
       break;
 

-    /* A 16bit abolute relocation that was formerlly a 24/32bit
-       absolute relocation.  */
+      /* This is a 24-/32-bit absolute address in one of the following
+        instructions:
+
+          "band", "bclr", "biand", "bild", "bior", "bist", "bixor",
+          "bld", "bnot", "bor", "bset", "bst", "btst", "bxor", "ldc.w",
+          "stc.w" and "mov.[bwl]"
+
+        We may relax this into an 16-bit absolute address if it's in
+        the right range.  */

     case R_MOVL2:
       value = bfd_coff_reloc16_get_value (reloc, link_info, input_section);
     case R_MOVL2:
       value = bfd_coff_reloc16_get_value (reloc, link_info, input_section);

+      value = bfd_h8300_pad_address (abfd, value);

 
       /* Sanity check.  */
 
       /* Sanity check.  */

-      if (value < 0x8000 || value > 0xff8000)
+      if (value <= 0x7fff || value >= 0xffff8000u)

        {
        {

-         /* Insert the 16bit value into the proper location.  */
+         /* Insert the 16-bit value into the proper location.  */

          bfd_put_16 (abfd, value, data + dst_address);
 
          bfd_put_16 (abfd, value, data + dst_address);
 

-         /* Fix the opcode.  For all the move insns, we simply
-            need to turn off bit 0x20 in the previous byte.  */
-          data[dst_address - 1] &= ~0x20;
+         /* Fix the opcode.  For all the instructions that belong to
+            this relaxation, we simply need to turn off bit 0x20 in
+            the previous byte.  */
+         data[dst_address - 1] &= ~0x20;

          dst_address += 2;
          src_address += 4;
        }
       else
        {
          if (! ((*link_info->callbacks->reloc_overflow)
          dst_address += 2;
          src_address += 4;
        }
       else
        {
          if (! ((*link_info->callbacks->reloc_overflow)

-                (link_info, bfd_asymbol_name (*reloc->sym_ptr_ptr),
+                (link_info, NULL,
+                 bfd_asymbol_name (*reloc->sym_ptr_ptr),

                  reloc->howto->name, reloc->addend, input_section->owner,
                  input_section, reloc->address)))
            abort ();
                  reloc->howto->name, reloc->addend, input_section->owner,
                  input_section, reloc->address)))
            abort ();

-        }
+       }

       break;
 
       break;
 

-    /* A 16bit absolute branch that is now an 8-bit pc-relative branch.  */
+    /* A 16-bit absolute branch that is now an 8-bit pc-relative branch.  */

     case R_JMP2:
       /* Get the address of the target of this branch.  */
       value = bfd_coff_reloc16_get_value (reloc, link_info, input_section);
 
       /* Get the address of the next instruction.  */
     case R_JMP2:
       /* Get the address of the target of this branch.  */
       value = bfd_coff_reloc16_get_value (reloc, link_info, input_section);
 
       /* Get the address of the next instruction.  */

-      dot = (link_order->offset
+      dot = (input_section->output_offset

             + dst_address
             + link_order->u.indirect.section->output_section->vma + 1);
 
             + dst_address
             + link_order->u.indirect.section->output_section->vma + 1);
 


@@ -833,7 +802,8 @@ h8300_reloc16_extra_cases (abfd, link_info, link_order, reloc, data, src_ptr,
       if (gap < -128 || gap > 126)
        {
          if (! ((*link_info->callbacks->reloc_overflow)
       if (gap < -128 || gap > 126)
        {
          if (! ((*link_info->callbacks->reloc_overflow)

-                (link_info, bfd_asymbol_name (*reloc->sym_ptr_ptr),
+                (link_info, NULL,
+                 bfd_asymbol_name (*reloc->sym_ptr_ptr),

                  reloc->howto->name, reloc->addend, input_section->owner,
                  input_section, reloc->address)))
            abort ();
                  reloc->howto->name, reloc->addend, input_section->owner,
                  input_section, reloc->address)))
            abort ();


@@ -847,7 +817,7 @@ h8300_reloc16_extra_cases (abfd, link_info, link_order, reloc, data, src_ptr,
          bfd_put_8 (abfd, 0x55, data + dst_address - 1);
          break;
        case 0x5a:
          bfd_put_8 (abfd, 0x55, data + dst_address - 1);
          break;
        case 0x5a:

-         /* jmp ->bra */
+         /* jmp -> bra */

          bfd_put_8 (abfd, 0x40, data + dst_address - 1);
          break;
 
          bfd_put_8 (abfd, 0x40, data + dst_address - 1);
          break;
 


@@ -855,7 +825,7 @@ h8300_reloc16_extra_cases (abfd, link_info, link_order, reloc, data, src_ptr,
          abort ();
        }
 
          abort ();
        }
 

-      /* Write out the 8bit value.  */
+      /* Write out the 8-bit value.  */

       bfd_put_8 (abfd, gap, data + dst_address);
 
       dst_address += 1;
       bfd_put_8 (abfd, gap, data + dst_address);
 
       dst_address += 1;


@@ -863,13 +833,13 @@ h8300_reloc16_extra_cases (abfd, link_info, link_order, reloc, data, src_ptr,
 
       break;
 
 
       break;
 

-    /* A 16bit pc-relative branch that is now an 8-bit pc-relative branch.  */
+    /* A 16-bit pc-relative branch that is now an 8-bit pc-relative branch.  */

     case R_PCRWORD_B:
       /* Get the address of the target of this branch.  */
       value = bfd_coff_reloc16_get_value (reloc, link_info, input_section);
 
       /* Get the address of the instruction (not the reloc).  */
     case R_PCRWORD_B:
       /* Get the address of the target of this branch.  */
       value = bfd_coff_reloc16_get_value (reloc, link_info, input_section);
 
       /* Get the address of the instruction (not the reloc).  */

-      dot = (link_order->offset
+      dot = (input_section->output_offset

             + dst_address
             + link_order->u.indirect.section->output_section->vma - 1);
 
             + dst_address
             + link_order->u.indirect.section->output_section->vma - 1);
 


@@ -879,7 +849,8 @@ h8300_reloc16_extra_cases (abfd, link_info, link_order, reloc, data, src_ptr,
       if (gap < -128 || gap > 126)
        {
          if (! ((*link_info->callbacks->reloc_overflow)
       if (gap < -128 || gap > 126)
        {
          if (! ((*link_info->callbacks->reloc_overflow)

-                (link_info, bfd_asymbol_name (*reloc->sym_ptr_ptr),
+                (link_info, NULL,
+                 bfd_asymbol_name (*reloc->sym_ptr_ptr),

                  reloc->howto->name, reloc->addend, input_section->owner,
                  input_section, reloc->address)))
            abort ();
                  reloc->howto->name, reloc->addend, input_section->owner,
                  input_section, reloc->address)))
            abort ();


@@ -890,38 +861,46 @@ h8300_reloc16_extra_cases (abfd, link_info, link_order, reloc, data, src_ptr,
        {
        case 0x58:
          /* bCC:16 -> bCC:8 */
        {
        case 0x58:
          /* bCC:16 -> bCC:8 */

-         /* Get the condition code from the original insn.  */
+         /* Get the second byte of the original insn, which contains
+            the condition code.  */

          tmp = data[dst_address - 1];
          tmp = data[dst_address - 1];

+
+         /* Compute the fisrt byte of the relaxed instruction.  The
+            original sequence 0x58 0xX0 is relaxed to 0x4X, where X
+            represents the condition code.  */

          tmp &= 0xf0;
          tmp >>= 4;
          tmp &= 0xf0;
          tmp >>= 4;

-
-         /* Now or in the high nibble of the opcode.  */

          tmp |= 0x40;
 
          /* Write it.  */
          bfd_put_8 (abfd, tmp, data + dst_address - 2);
          break;
 
          tmp |= 0x40;
 
          /* Write it.  */
          bfd_put_8 (abfd, tmp, data + dst_address - 2);
          break;
 

+       case 0x5c:
+         /* bsr:16 -> bsr:8 */
+         bfd_put_8 (abfd, 0x55, data + dst_address - 2);
+         break;
+

        default:
          abort ();
        }
 
        default:
          abort ();
        }
 

-       /* Output the target.  */
-       bfd_put_8 (abfd, gap, data + dst_address - 1);
+      /* Output the target.  */
+      bfd_put_8 (abfd, gap, data + dst_address - 1);

 
 

-       /* We don't advance dst_address -- the 8bit reloc is applied at
-          dst_address - 1, so the next insn should begin at dst_address.  */
-       src_address += 2;
+      /* We don't advance dst_address -- the 8-bit reloc is applied at
+        dst_address - 1, so the next insn should begin at dst_address.  */
+      src_address += 2;

 
 

-       break;
-      
-    /* Similarly for a 24bit absolute that is now 8 bits.  */
+      break;
+
+    /* Similarly for a 24-bit absolute that is now 8 bits.  */

     case R_JMPL2:
       /* Get the address of the target of this branch.  */
       value = bfd_coff_reloc16_get_value (reloc, link_info, input_section);
 
       /* Get the address of the instruction (not the reloc).  */
     case R_JMPL2:
       /* Get the address of the target of this branch.  */
       value = bfd_coff_reloc16_get_value (reloc, link_info, input_section);
 
       /* Get the address of the instruction (not the reloc).  */

-      dot = (link_order->offset
+      dot = (input_section->output_offset

             + dst_address
             + link_order->u.indirect.section->output_section->vma + 2);
 
             + dst_address
             + link_order->u.indirect.section->output_section->vma + 2);
 


@@ -948,22 +927,51 @@ h8300_reloc16_extra_cases (abfd, link_info, link_order, reloc, data, src_ptr,
 
       break;
 
 
       break;
 

-    /* A 16bit absolute mov.b that is now an 8bit absolute mov.b.  */
+      /* This is a 16-bit absolute address in one of the following
+        instructions:
+
+          "band", "bclr", "biand", "bild", "bior", "bist", "bixor",
+          "bld", "bnot", "bor", "bset", "bst", "btst", "bxor", and
+          "mov.b"
+
+        We may relax this into an 8-bit absolute address if it's in
+        the right range.  */

     case R_MOV16B2:
       value = bfd_coff_reloc16_get_value (reloc, link_info, input_section);
 
     case R_MOV16B2:
       value = bfd_coff_reloc16_get_value (reloc, link_info, input_section);
 

-      /* Sanity check.  */
+      /* All instructions with R_H8_DIR16B2 start with 0x6a.  */

       if (data[dst_address - 2] != 0x6a)
        abort ();
 
       if (data[dst_address - 2] != 0x6a)
        abort ();
 

+      temp_code = data[src_address - 1];
+
+      /* If this is a mov.b instruction, clear the lower nibble, which
+        contains the source/destination register number.  */
+      if ((temp_code & 0x10) != 0x10)
+       temp_code &= 0xf0;
+

       /* Fix up the opcode.  */
       /* Fix up the opcode.  */

-      switch (data[src_address-1] & 0xf0)
+      switch (temp_code)

        {
        case 0x00:
        {
        case 0x00:

-         data[dst_address - 2] = (data[src_address-1] & 0xf) | 0x20;
+         /* This is mov.b @aa:16,Rd.  */
+         data[dst_address - 2] = (data[src_address - 1] & 0xf) | 0x20;

          break;
        case 0x80:
          break;
        case 0x80:

-         data[dst_address - 2] = (data[src_address-1] & 0xf) | 0x30;
+         /* This is mov.b Rs,@aa:16.  */
+         data[dst_address - 2] = (data[src_address - 1] & 0xf) | 0x30;
+         break;
+       case 0x18:
+         /* This is a bit-maniputation instruction that stores one
+            bit into memory, one of "bclr", "bist", "bnot", "bset",
+            and "bst".  */
+         data[dst_address - 2] = 0x7f;
+         break;
+       case 0x10:
+         /* This is a bit-maniputation instruction that loads one bit
+            from memory, one of "band", "biand", "bild", "bior",
+            "bixor", "bld", "bor", "btst", and "bxor".  */
+         data[dst_address - 2] = 0x7e;

          break;
        default:
          abort ();
          break;
        default:
          abort ();


@@ -973,22 +981,51 @@ h8300_reloc16_extra_cases (abfd, link_info, link_order, reloc, data, src_ptr,
       src_address += 2;
       break;
 
       src_address += 2;
       break;
 

-    /* Similarly for a 24bit mov.b  */
+      /* This is a 24-bit absolute address in one of the following
+        instructions:
+
+          "band", "bclr", "biand", "bild", "bior", "bist", "bixor",
+          "bld", "bnot", "bor", "bset", "bst", "btst", "bxor", and
+          "mov.b"
+
+        We may relax this into an 8-bit absolute address if it's in
+        the right range.  */

     case R_MOV24B2:
       value = bfd_coff_reloc16_get_value (reloc, link_info, input_section);
 
     case R_MOV24B2:
       value = bfd_coff_reloc16_get_value (reloc, link_info, input_section);
 

-      /* Sanity check.  */
+      /* All instructions with R_MOV24B2 start with 0x6a.  */

       if (data[dst_address - 2] != 0x6a)
        abort ();
 
       if (data[dst_address - 2] != 0x6a)
        abort ();
 

+      temp_code = data[src_address - 1];
+
+      /* If this is a mov.b instruction, clear the lower nibble, which
+        contains the source/destination register number.  */
+      if ((temp_code & 0x30) != 0x30)
+       temp_code &= 0xf0;
+

       /* Fix up the opcode.  */
       /* Fix up the opcode.  */

-      switch (data[src_address-1] & 0xf0)
+      switch (temp_code)

        {
        case 0x20:
        {
        case 0x20:

-         data[dst_address - 2] = (data[src_address-1] & 0xf) | 0x20;
+         /* This is mov.b @aa:24/32,Rd.  */
+         data[dst_address - 2] = (data[src_address - 1] & 0xf) | 0x20;

          break;
        case 0xa0:
          break;
        case 0xa0:

-         data[dst_address - 2] = (data[src_address-1] & 0xf) | 0x30;
+         /* This is mov.b Rs,@aa:24/32.  */
+         data[dst_address - 2] = (data[src_address - 1] & 0xf) | 0x30;
+         break;
+       case 0x38:
+         /* This is a bit-maniputation instruction that stores one
+            bit into memory, one of "bclr", "bist", "bnot", "bset",
+            and "bst".  */
+         data[dst_address - 2] = 0x7f;
+         break;
+       case 0x30:
+         /* This is a bit-maniputation instruction that loads one bit
+            from memory, one of "band", "biand", "bild", "bior",
+            "bixor", "bld", "bor", "btst", and "bxor".  */
+         data[dst_address - 2] = 0x7e;

          break;
        default:
          abort ();
          break;
        default:
          abort ();


@@ -1000,10 +1037,10 @@ h8300_reloc16_extra_cases (abfd, link_info, link_order, reloc, data, src_ptr,
 
     case R_BCC_INV:
       /* Get the address of the target of this branch.  */
 
     case R_BCC_INV:
       /* Get the address of the target of this branch.  */

-      value = bfd_coff_reloc16_get_value(reloc, link_info, input_section);
+      value = bfd_coff_reloc16_get_value (reloc, link_info, input_section);

 
 

-      dot = (link_order->offset 
-            + dst_address 
+      dot = (input_section->output_offset
+            + dst_address

             + link_order->u.indirect.section->output_section->vma) + 1;
 
       gap = value - dot;
             + link_order->u.indirect.section->output_section->vma) + 1;
 
       gap = value - dot;


@@ -1012,7 +1049,8 @@ h8300_reloc16_extra_cases (abfd, link_info, link_order, reloc, data, src_ptr,
       if (gap < -128 || gap > 126)
        {
          if (! ((*link_info->callbacks->reloc_overflow)
       if (gap < -128 || gap > 126)
        {
          if (! ((*link_info->callbacks->reloc_overflow)

-                (link_info, bfd_asymbol_name (*reloc->sym_ptr_ptr),
+                (link_info, NULL,
+                 bfd_asymbol_name (*reloc->sym_ptr_ptr),

                  reloc->howto->name, reloc->addend, input_section->owner,
                  input_section, reloc->address)))
            abort ();
                  reloc->howto->name, reloc->addend, input_section->owner,
                  input_section, reloc->address)))
            abort ();


@@ -1034,7 +1072,7 @@ h8300_reloc16_extra_cases (abfd, link_info, link_order, reloc, data, src_ptr,
       src_address += 4;
       break;
 
       src_address += 4;
       break;
 

-    /* An 8bit memory indirect instruction (jmp/jsr).
+    /* An 8-bit memory indirect instruction (jmp/jsr).

 
        There's several things that need to be done to handle
        this relocation.
 
        There's several things that need to be done to handle
        this relocation.


@@ -1051,10 +1089,28 @@ h8300_reloc16_extra_cases (abfd, link_info, link_order, reloc, data, src_ptr,
        /* We need to find the symbol so we can determine it's
           address in the function vector table.  */
        asymbol *symbol;
        /* We need to find the symbol so we can determine it's
           address in the function vector table.  */
        asymbol *symbol;

-       bfd_vma value;

        const char *name;
        const char *name;

+       struct funcvec_hash_table *ftab;

        struct funcvec_hash_entry *h;
        struct funcvec_hash_entry *h;

-       asection *vectors_sec = h8300_coff_hash_table (link_info)->vectors_sec;
+       struct h8300_coff_link_hash_table *htab;
+       asection *vectors_sec;
+
+       if (link_info->output_bfd->xvec != abfd->xvec)
+         {
+           (*_bfd_error_handler)
+             (_("cannot handle R_MEM_INDIRECT reloc when using %s output"),
+              link_info->output_bfd->xvec->name);
+
+           /* What else can we do?  This function doesn't allow return
+              of an error, and we don't want to call abort as that
+              indicates an internal error.  */
+#ifndef EXIT_FAILURE
+#define EXIT_FAILURE 1
+#endif
+           xexit (EXIT_FAILURE);
+         }
+       htab = h8300_coff_hash_table (link_info);
+       vectors_sec = htab->vectors_sec;

 
        /* First see if this is a reloc against the absolute symbol
           or against a symbol with a nonnegative value <= 0xff.  */
 
        /* First see if this is a reloc against the absolute symbol
           or against a symbol with a nonnegative value <= 0xff.  */


@@ -1076,7 +1132,8 @@ h8300_reloc16_extra_cases (abfd, link_info, link_order, reloc, data, src_ptr,
            else
              {
                if (! ((*link_info->callbacks->reloc_overflow)
            else
              {
                if (! ((*link_info->callbacks->reloc_overflow)

-                      (link_info, bfd_asymbol_name (*reloc->sym_ptr_ptr),
+                      (link_info, NULL,
+                       bfd_asymbol_name (*reloc->sym_ptr_ptr),

                        reloc->howto->name, reloc->addend, input_section->owner,
                        input_section, reloc->address)))
                  abort ();
                        reloc->howto->name, reloc->addend, input_section->owner,
                        input_section, reloc->address)))
                  abort ();


@@ -1085,7 +1142,7 @@ h8300_reloc16_extra_cases (abfd, link_info, link_order, reloc, data, src_ptr,
          }
 
        /* This is a jump/call through a function vector, and we're
          }
 
        /* This is a jump/call through a function vector, and we're

-          expected to create the function vector ourselves. 
+          expected to create the function vector ourselves.

 
           First look up this symbol in the linker hash table -- we need
           the derived linker symbol which holds this symbol's index
 
           First look up this symbol in the linker hash table -- we need
           the derived linker symbol which holds this symbol's index


@@ -1093,22 +1150,21 @@ h8300_reloc16_extra_cases (abfd, link_info, link_order, reloc, data, src_ptr,
        name = symbol->name;
        if (symbol->flags & BSF_LOCAL)
          {
        name = symbol->name;
        if (symbol->flags & BSF_LOCAL)
          {

-           char *new_name = bfd_malloc (strlen (name) + 9);
+           char *new_name = bfd_malloc ((bfd_size_type) strlen (name) + 10);
+

            if (new_name == NULL)
              abort ();
 
            if (new_name == NULL)
              abort ();
 

-           strcpy (new_name, name);
-           sprintf (new_name + strlen (name), "_%08x",
-                    (int)symbol->section);
+           sprintf (new_name, "%s_%08x", name, symbol->section->id);

            name = new_name;
          }
 
            name = new_name;
          }
 

-       h = funcvec_hash_lookup (h8300_coff_hash_table (link_info)->funcvec_hash_table,
-                                name, false, false);
+       ftab = htab->funcvec_hash_table;
+       h = funcvec_hash_lookup (ftab, name, FALSE, FALSE);

 
        /* This shouldn't ever happen.  If it does that means we've got
           data corruption of some kind.  Aborting seems like a reasonable
 
        /* This shouldn't ever happen.  If it does that means we've got
           data corruption of some kind.  Aborting seems like a reasonable

-          think to do here.  */
+          thing to do here.  */

        if (h == NULL || vectors_sec == NULL)
          abort ();
 
        if (h == NULL || vectors_sec == NULL)
          abort ();
 


@@ -1122,29 +1178,36 @@ h8300_reloc16_extra_cases (abfd, link_info, link_order, reloc, data, src_ptr,
        src_address++;
 
        /* Now create an entry in the function vector itself.  */
        src_address++;
 
        /* Now create an entry in the function vector itself.  */

-       if (bfd_get_mach (input_section->owner) == bfd_mach_h8300)
-         bfd_put_16 (abfd,
-                     bfd_coff_reloc16_get_value (reloc,
-                                                 link_info,
-                                                 input_section),
-                     vectors_sec->contents + h->offset);
-       else if (bfd_get_mach (input_section->owner) == bfd_mach_h8300h
-                || bfd_get_mach (input_section->owner) == bfd_mach_h8300s)
-         bfd_put_32 (abfd,
-                     bfd_coff_reloc16_get_value (reloc,
-                                                 link_info,
-                                                 input_section),
-                     vectors_sec->contents + h->offset);
-       else
-         abort ();
+       switch (bfd_get_mach (input_section->owner))
+         {
+         case bfd_mach_h8300:
+         case bfd_mach_h8300hn:
+         case bfd_mach_h8300sn:
+           bfd_put_16 (abfd,
+                       bfd_coff_reloc16_get_value (reloc,
+                                                   link_info,
+                                                   input_section),
+                       vectors_sec->contents + h->offset);
+           break;
+         case bfd_mach_h8300h:
+         case bfd_mach_h8300s:
+           bfd_put_32 (abfd,
+                       bfd_coff_reloc16_get_value (reloc,
+                                                   link_info,
+                                                   input_section),
+                       vectors_sec->contents + h->offset);
+           break;
+         default:
+           abort ();
+         }

 
        /* Gross.  We've already written the contents of the vector section
           before we get here...  So we write it again with the new data.  */
        bfd_set_section_contents (vectors_sec->output_section->owner,
                                  vectors_sec->output_section,
                                  vectors_sec->contents,
 
        /* Gross.  We've already written the contents of the vector section
           before we get here...  So we write it again with the new data.  */
        bfd_set_section_contents (vectors_sec->output_section->owner,
                                  vectors_sec->output_section,
                                  vectors_sec->contents,

-                                 vectors_sec->output_offset,
-                                 vectors_sec->_raw_size);
+                                 (file_ptr) vectors_sec->output_offset,
+                                 vectors_sec->size);

        break;
       }
 
        break;
       }
 


@@ -1158,7 +1221,6 @@ h8300_reloc16_extra_cases (abfd, link_info, link_order, reloc, data, src_ptr,
   *dst_ptr = dst_address;
 }
 
   *dst_ptr = dst_address;
 }
 

-

 /* Routine for the h8300 linker.
 
    This routine is necessary to handle the special R_MEM_INDIRECT
 /* Routine for the h8300 linker.
 
    This routine is necessary to handle the special R_MEM_INDIRECT


@@ -1170,57 +1232,60 @@ h8300_reloc16_extra_cases (abfd, link_info, link_order, reloc, data, src_ptr,
    from this BFD to the bfd linker hash table.  It may add a few
    selected static symbols to the bfd linker hash table.  */
 
    from this BFD to the bfd linker hash table.  It may add a few
    selected static symbols to the bfd linker hash table.  */
 

-static boolean
-h8300_bfd_link_add_symbols(abfd, info)
-     bfd *abfd;
-     struct bfd_link_info *info;
+static bfd_boolean
+h8300_bfd_link_add_symbols (bfd *abfd, struct bfd_link_info *info)

 {
   asection *sec;
   struct funcvec_hash_table *funcvec_hash_table;
 {
   asection *sec;
   struct funcvec_hash_table *funcvec_hash_table;

+  bfd_size_type amt;
+  struct h8300_coff_link_hash_table *htab;
+
+  /* Add the symbols using the generic code.  */
+  _bfd_generic_link_add_symbols (abfd, info);
+
+  if (info->output_bfd->xvec != abfd->xvec)
+    return TRUE;
+
+  htab = h8300_coff_hash_table (info);

 
   /* If we haven't created a vectors section, do so now.  */
 
   /* If we haven't created a vectors section, do so now.  */

-  if (!h8300_coff_hash_table (info)->vectors_sec)
+  if (!htab->vectors_sec)

     {
       flagword flags;
 
       /* Make sure the appropriate flags are set, including SEC_IN_MEMORY.  */
       flags = (SEC_ALLOC | SEC_LOAD
               | SEC_HAS_CONTENTS | SEC_IN_MEMORY | SEC_READONLY);
     {
       flagword flags;
 
       /* Make sure the appropriate flags are set, including SEC_IN_MEMORY.  */
       flags = (SEC_ALLOC | SEC_LOAD
               | SEC_HAS_CONTENTS | SEC_IN_MEMORY | SEC_READONLY);

-      h8300_coff_hash_table (info)->vectors_sec = bfd_make_section (abfd,
-                                                                   ".vectors");
+      htab->vectors_sec = bfd_make_section_with_flags (abfd, ".vectors",
+                                                      flags);

 
       /* If the section wasn't created, or we couldn't set the flags,
 
       /* If the section wasn't created, or we couldn't set the flags,

-        quit quickly now, rather than dieing a painful death later.  */
-      if (! h8300_coff_hash_table (info)->vectors_sec
-         || ! bfd_set_section_flags (abfd,
-                                     h8300_coff_hash_table(info)->vectors_sec,
-                                     flags))
-       return false;
+        quit quickly now, rather than dying a painful death later.  */
+      if (!htab->vectors_sec)
+       return FALSE;

 
       /* Also create the vector hash table.  */
 
       /* Also create the vector hash table.  */

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

 
       if (!funcvec_hash_table)
 
       if (!funcvec_hash_table)

-       return false;
+       return FALSE;

 
       /* And initialize the funcvec hash table.  */
       if (!funcvec_hash_table_init (funcvec_hash_table, abfd,
 
       /* And initialize the funcvec hash table.  */
       if (!funcvec_hash_table_init (funcvec_hash_table, abfd,

-                                   funcvec_hash_newfunc))
+                                   funcvec_hash_newfunc,
+                                   sizeof (struct funcvec_hash_entry)))

        {
          bfd_release (abfd, funcvec_hash_table);
        {
          bfd_release (abfd, funcvec_hash_table);

-         return false;
+         return FALSE;

        }
 
       /* Store away a pointer to the funcvec hash table.  */
        }
 
       /* Store away a pointer to the funcvec hash table.  */

-      h8300_coff_hash_table (info)->funcvec_hash_table = funcvec_hash_table;
+      htab->funcvec_hash_table = funcvec_hash_table;

     }
 
   /* Load up the function vector hash table.  */
     }
 
   /* Load up the function vector hash table.  */

-  funcvec_hash_table = h8300_coff_hash_table (info)->funcvec_hash_table;
-
-  /* Add the symbols using the generic code.  */
-  _bfd_generic_link_add_symbols (abfd, info);
+  funcvec_hash_table = htab->funcvec_hash_table;

 
   /* Now scan the relocs for all the sections in this bfd; create
      additional space in the .vectors section as needed.  */
 
   /* Now scan the relocs for all the sections in this bfd; create
      additional space in the .vectors section as needed.  */


@@ -1235,9 +1300,9 @@ h8300_bfd_link_add_symbols(abfd, info)
       if (reloc_size <= 0)
        continue;
 
       if (reloc_size <= 0)
        continue;
 

-      relocs = (arelent **)bfd_malloc ((size_t)reloc_size);
+      relocs = (arelent **) bfd_malloc ((bfd_size_type) reloc_size);

       if (!relocs)
       if (!relocs)

-       return false;
+       return FALSE;

 
       /* The symbols should have been read in by _bfd_generic link_add_symbols
         call abovec, so we can cheat and use the pointer to them that was
 
       /* The symbols should have been read in by _bfd_generic link_add_symbols
         call abovec, so we can cheat and use the pointer to them that was


@@ -1266,46 +1331,53 @@ h8300_bfd_link_add_symbols(abfd, info)
              && symbol != bfd_abs_section_ptr->symbol)
 
            {
              && symbol != bfd_abs_section_ptr->symbol)
 
            {

+             struct funcvec_hash_table *ftab;

              struct funcvec_hash_entry *h;
 
              name = symbol->name;
              if (symbol->flags & BSF_LOCAL)
                {
              struct funcvec_hash_entry *h;
 
              name = symbol->name;
              if (symbol->flags & BSF_LOCAL)
                {

-                 char *new_name = bfd_malloc (strlen (name) + 9);
+                 char *new_name;

 
 

+                 new_name = bfd_malloc ((bfd_size_type) strlen (name) + 10);

                  if (new_name == NULL)
                    abort ();
 
                  if (new_name == NULL)
                    abort ();
 

-                 strcpy (new_name, name);
-                 sprintf (new_name + strlen (name), "_%08x",
-                          (int)symbol->section);
+                 sprintf (new_name, "%s_%08x", name, symbol->section->id);

                  name = new_name;
                }
 
              /* Look this symbol up in the function vector hash table.  */
                  name = new_name;
                }
 
              /* Look this symbol up in the function vector hash table.  */

-             h = funcvec_hash_lookup (h8300_coff_hash_table (info)->funcvec_hash_table,
-                                      name, false, false);
-
+             ftab = htab->funcvec_hash_table;
+             h = funcvec_hash_lookup (ftab, name, FALSE, FALSE);

 
              /* If this symbol isn't already in the hash table, add
                 it and bump up the size of the hash table.  */
              if (h == NULL)
                {
 
              /* If this symbol isn't already in the hash table, add
                 it and bump up the size of the hash table.  */
              if (h == NULL)
                {

-                 h = funcvec_hash_lookup (h8300_coff_hash_table (info)->funcvec_hash_table,
-                                          name, true, true);
+                 h = funcvec_hash_lookup (ftab, name, TRUE, TRUE);

                  if (h == NULL)
                    {
                      free (relocs);
                  if (h == NULL)
                    {
                      free (relocs);

-                     return false;
+                     return FALSE;

                    }
 
                  /* Bump the size of the vectors section.  Each vector
                     takes 2 bytes on the h8300 and 4 bytes on the h8300h.  */
                    }
 
                  /* Bump the size of the vectors section.  Each vector
                     takes 2 bytes on the h8300 and 4 bytes on the h8300h.  */

-                 if (bfd_get_mach (abfd) == bfd_mach_h8300)
-                   h8300_coff_hash_table (info)->vectors_sec->_raw_size += 2;
-                 else if (bfd_get_mach (abfd) == bfd_mach_h8300h
-                          || bfd_get_mach (abfd) == bfd_mach_h8300s)
-                   h8300_coff_hash_table (info)->vectors_sec->_raw_size += 4;
+                 switch (bfd_get_mach (abfd))
+                   {
+                   case bfd_mach_h8300:
+                   case bfd_mach_h8300hn:
+                   case bfd_mach_h8300sn:
+                     htab->vectors_sec->size += 2;
+                     break;
+                   case bfd_mach_h8300h:
+                   case bfd_mach_h8300s:
+                     htab->vectors_sec->size += 4;
+                     break;
+                   default:
+                     abort ();
+                   }

                }
            }
        }
                }
            }
        }


@@ -1316,18 +1388,18 @@ h8300_bfd_link_add_symbols(abfd, info)
 
   /* Now actually allocate some space for the function vector.  It's
      wasteful to do this more than once, but this is easier.  */
 
   /* Now actually allocate some space for the function vector.  It's
      wasteful to do this more than once, but this is easier.  */

-  if (h8300_coff_hash_table (info)->vectors_sec->_raw_size != 0)
+  sec = htab->vectors_sec;
+  if (sec->size != 0)

     {
       /* Free the old contents.  */
     {
       /* Free the old contents.  */

-      if (h8300_coff_hash_table (info)->vectors_sec->contents)
-       free (h8300_coff_hash_table (info)->vectors_sec->contents);
+      if (sec->contents)
+       free (sec->contents);

 
       /* Allocate new contents.  */
 
       /* Allocate new contents.  */

-      h8300_coff_hash_table (info)->vectors_sec->contents
-       = bfd_malloc (h8300_coff_hash_table (info)->vectors_sec->_raw_size);
+      sec->contents = bfd_malloc (sec->size);

     }
 
     }
 

-  return true;
+  return TRUE;

 }
 
 #define coff_reloc16_extra_cases h8300_reloc16_extra_cases
 }
 
 #define coff_reloc16_extra_cases h8300_reloc16_extra_cases


@@ -1336,8 +1408,12 @@ h8300_bfd_link_add_symbols(abfd, info)
 #define coff_bfd_link_hash_table_create h8300_coff_link_hash_table_create
 
 #define COFF_LONG_FILENAMES
 #define coff_bfd_link_hash_table_create h8300_coff_link_hash_table_create
 
 #define COFF_LONG_FILENAMES

-#include "coffcode.h"

 
 

+#ifndef bfd_pe_print_pdata
+#define bfd_pe_print_pdata     NULL
+#endif
+
+#include "coffcode.h"

 
 #undef coff_bfd_get_relocated_section_contents
 #undef coff_bfd_relax_section
 
 #undef coff_bfd_get_relocated_section_contents
 #undef coff_bfd_relax_section


@@ -1345,5 +1421,4 @@ h8300_bfd_link_add_symbols(abfd, info)
   bfd_coff_reloc16_get_relocated_section_contents
 #define coff_bfd_relax_section bfd_coff_reloc16_relax_section
 
   bfd_coff_reloc16_get_relocated_section_contents
 #define coff_bfd_relax_section bfd_coff_reloc16_relax_section
 

-
-CREATE_BIG_COFF_TARGET_VEC (h8300coff_vec, "coff-h8300", BFD_IS_RELAXABLE, 0, '_', NULL)
+CREATE_BIG_COFF_TARGET_VEC (h8300coff_vec, "coff-h8300", BFD_IS_RELAXABLE, 0, '_', NULL, COFF_SWAP_TABLE)