Rewrite. This is heavily based upon elf32-m68k.c, with a few things borrowed

from elf32-ppc.c. The plt entry setup matches what can be found in Motorola's
SVR4/m88k binaries.

1 files changed, 1652 insertions, 58 deletions

diff --git a/gnu/usr.bin/binutils/bfd/elf32-m88k.c b/gnu/usr.bin/binutils/bfd/elf32-m88k.c
index 1fed8335996..c960d17f946 100644
--- a/gnu/usr.bin/binutils/bfd/elf32-m88k.c
+++ b/gnu/usr.bin/binutils/bfd/elf32-m88k.c
@@ -1,6 +1,6 @@
 /* Motorola 88k series support for 32-bit ELF
-   Copyright 2006 Free Software Foundation, Inc.
-   Inspired from elf-m68k.c and elf-openrisc.c
+   Copyright 1993, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+   2004 Free Software Foundation, Inc.
 
    This file is part of BFD, the Binary File Descriptor library.
 
@@ -25,10 +25,14 @@
 #include "elf-bfd.h"
 #include "elf/m88k.h"
 
-static reloc_howto_type *elf_m88k_reloc_type_lookup
+static reloc_howto_type *reloc_type_lookup
   PARAMS ((bfd *, bfd_reloc_code_real_type));
-static void elf_m88k_info_to_howto
+static void rtype_to_howto
   PARAMS ((bfd *, arelent *, Elf_Internal_Rela *));
+static struct bfd_hash_entry *elf_m88k_link_hash_newfunc
+  PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *, const char *));
+static struct bfd_link_hash_table *elf_m88k_link_hash_table_create
+  PARAMS ((bfd *));
 static bfd_boolean elf_m88k_check_relocs
   PARAMS ((bfd *, struct bfd_link_info *, asection *,
 	   const Elf_Internal_Rela *));
@@ -38,9 +42,20 @@ static asection *elf_m88k_gc_mark_hook
 static bfd_boolean elf_m88k_gc_sweep_hook
   PARAMS ((bfd *, struct bfd_link_info *, asection *,
 	   const Elf_Internal_Rela *));
+static bfd_boolean elf_m88k_adjust_dynamic_symbol
+  PARAMS ((struct bfd_link_info *, struct elf_link_hash_entry *));
+static bfd_boolean elf_m88k_size_dynamic_sections
+  PARAMS ((bfd *, struct bfd_link_info *));
+static bfd_boolean elf_m88k_discard_copies
+  PARAMS ((struct elf_link_hash_entry *, PTR));
 static bfd_boolean elf_m88k_relocate_section
   PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
 	   Elf_Internal_Rela *, Elf_Internal_Sym *, asection **));
+static bfd_boolean elf_m88k_finish_dynamic_symbol
+  PARAMS ((bfd *, struct bfd_link_info *, struct elf_link_hash_entry *,
+	   Elf_Internal_Sym *));
+static bfd_boolean elf_m88k_finish_dynamic_sections
+  PARAMS ((bfd *, struct bfd_link_info *));
 
 static bfd_boolean elf32_m88k_set_private_flags
   PARAMS ((bfd *, flagword));
@@ -48,15 +63,17 @@ static bfd_boolean elf32_m88k_merge_private_bfd_data
   PARAMS ((bfd *, bfd *));
 static bfd_boolean elf32_m88k_print_private_bfd_data
   PARAMS ((bfd *, PTR));
+static enum elf_reloc_type_class elf32_m88k_reloc_type_class
+  PARAMS ((const Elf_Internal_Rela *));
 
-#define	UNHANDLED_HOWTO(C) \
+#define UNHANDLED_HOWTO(C) \
   HOWTO ((C), 0, 0, 0, FALSE, 0, complain_overflow_dont, NULL, __STRING(C), \
 	 FALSE, 0, 0, FALSE)
-#define	UNIMPLEMENTED_HOWTO \
+#define UNIMPLEMENTED_HOWTO \
   HOWTO (R_88K_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_dont, NULL, \
 	 "R_88K_UNIMPLEMENTED", FALSE, 0, 0, FALSE)
 
-static reloc_howto_type _bfd_m88k_elf_howto_table[] = {
+static reloc_howto_type howto_table[] = {
   HOWTO (R_88K_NONE,       0, 0, 0, FALSE,0, complain_overflow_dont,     bfd_elf_generic_reloc, "R_88K_NONE",      FALSE, 0, 0x00000000,FALSE),
   UNHANDLED_HOWTO (R_88K_COPY),
   UNHANDLED_HOWTO (R_88K_GOTP_ENT),
@@ -71,7 +88,7 @@ static reloc_howto_type _bfd_m88k_elf_howto_table[] = {
   UNIMPLEMENTED_HOWTO,
   UNIMPLEMENTED_HOWTO,
   UNIMPLEMENTED_HOWTO,
-  UNHANDLED_HOWTO (R_88K_PLT_DISP26),
+  HOWTO (R_88K_PLT_DISP26, 2, 2,26, TRUE, 0, complain_overflow_signed,   bfd_elf_generic_reloc, "R_88K_PLT_DISP26",  FALSE, 0, 0x03ffffff,TRUE),
   UNIMPLEMENTED_HOWTO,
   UNHANDLED_HOWTO (R_88K_BBASED_32),
   UNHANDLED_HOWTO (R_88K_BBASED_32UA),
@@ -83,8 +100,8 @@ static reloc_howto_type _bfd_m88k_elf_howto_table[] = {
   UNIMPLEMENTED_HOWTO,
   UNHANDLED_HOWTO (R_88K_ABDIFF_32),
   UNHANDLED_HOWTO (R_88K_ABDIFF_32UA),
-  UNHANDLED_HOWTO (R_88K_ABDIFF_16H),
-  UNHANDLED_HOWTO (R_88K_ABDIFF_16L),
+  HOWTO (R_88K_ABDIFF_16H, 16, 1,16, FALSE,0, complain_overflow_dont,     bfd_elf_generic_reloc, "R_88K_ABDIFF_16H", FALSE, 0, 0x0000ffff,FALSE),
+  HOWTO (R_88K_ABDIFF_16L, 0,  1,16, FALSE,0, complain_overflow_dont,     bfd_elf_generic_reloc, "R_88K_ABDIFF_16L", FALSE, 0, 0x0000ffff,FALSE),
   UNHANDLED_HOWTO (R_88K_ABDIFF_16),
   UNIMPLEMENTED_HOWTO,
   UNIMPLEMENTED_HOWTO,
@@ -99,8 +116,8 @@ static reloc_howto_type _bfd_m88k_elf_howto_table[] = {
   UNIMPLEMENTED_HOWTO,
   UNHANDLED_HOWTO (R_88K_GOT_32),
   UNHANDLED_HOWTO (R_88K_GOT_32UA),
-  UNHANDLED_HOWTO (R_88K_GOT_16H),
-  UNHANDLED_HOWTO (R_88K_GOT_16L),
+  HOWTO (R_88K_GOT_16H,    16, 1,16, FALSE,0, complain_overflow_dont,     bfd_elf_generic_reloc, "R_88K_GOT_16H",    FALSE, 0, 0x0000ffff,FALSE),
+  HOWTO (R_88K_GOT_16L,    0,  1,16, FALSE,0, complain_overflow_dont,     bfd_elf_generic_reloc, "R_88K_GOT_16L",    FALSE, 0, 0x0000ffff,FALSE),
   UNHANDLED_HOWTO (R_88K_GOT_16),
   UNIMPLEMENTED_HOWTO,
   UNIMPLEMENTED_HOWTO,
@@ -113,7 +130,7 @@ static reloc_howto_type _bfd_m88k_elf_howto_table[] = {
   UNIMPLEMENTED_HOWTO,
   UNIMPLEMENTED_HOWTO,
   UNIMPLEMENTED_HOWTO,
-  UNHANDLED_HOWTO (R_88K_PLT_32),
+  HOWTO (R_88K_PLT_32,     0, 2,32, FALSE,0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_88K_PLT_32",    FALSE, 0, 0xffffffff,FALSE),
   UNHANDLED_HOWTO (R_88K_PLT_32UA),
   UNHANDLED_HOWTO (R_88K_PLT_16H),
   UNHANDLED_HOWTO (R_88K_PLT_16L),
@@ -164,21 +181,22 @@ static reloc_howto_type _bfd_m88k_elf_howto_table[] = {
 };
 
 static void
-elf_m88k_info_to_howto (abfd, cache_ptr, dst)
+rtype_to_howto (abfd, cache_ptr, dst)
      bfd *abfd ATTRIBUTE_UNUSED;
      arelent *cache_ptr;
      Elf_Internal_Rela *dst;
 {
   BFD_ASSERT (ELF32_R_TYPE(dst->r_info) < (unsigned int) R_88K_UNIMPLEMENTED);
-  cache_ptr->howto = &_bfd_m88k_elf_howto_table[ELF32_R_TYPE(dst->r_info)];
+  cache_ptr->howto = &howto_table[ELF32_R_TYPE(dst->r_info)];
 }
 
-struct elf_reloc_map {
-  bfd_reloc_code_real_type bfd_reloc_val;
-  unsigned char elf_reloc_val;
-};
+#define elf_info_to_howto rtype_to_howto
 
-static const struct elf_reloc_map m88k_reloc_map[] = {
+static const struct
+{
+  bfd_reloc_code_real_type bfd_val;
+  int elf_val;
+} reloc_map[] = {
   { BFD_RELOC_NONE,           R_88K_NONE },
   { BFD_RELOC_LO16,           R_88K_16L },
   { BFD_RELOC_HI16,           R_88K_16H },
@@ -187,31 +205,184 @@ static const struct elf_reloc_map m88k_reloc_map[] = {
   { BFD_RELOC_8,              R_88K_8 },
   { BFD_RELOC_16,             R_88K_16 },
   { BFD_RELOC_32,             R_88K_32 },
+
+  { BFD_RELOC_LO16_BASEREL,   R_88K_ABDIFF_16L },
+  { BFD_RELOC_HI16_BASEREL,   R_88K_ABDIFF_16H },
+  { BFD_RELOC_LO16_GOTOFF,    R_88K_GOT_16L },
+  { BFD_RELOC_HI16_GOTOFF,    R_88K_GOT_16H },
+  { BFD_RELOC_32_PLTOFF,      R_88K_PLT_32 },
+  { BFD_RELOC_32_PLT_PCREL,   R_88K_PLT_DISP26 },
+
   { BFD_RELOC_VTABLE_INHERIT, R_88K_GNU_VTINHERIT },
   { BFD_RELOC_VTABLE_ENTRY,   R_88K_GNU_VTENTRY }
 };
 
 static reloc_howto_type *
-elf_m88k_reloc_type_lookup (abfd, code)
+reloc_type_lookup (abfd, code)
      bfd *abfd ATTRIBUTE_UNUSED;
      bfd_reloc_code_real_type code;
 {
   unsigned int i;
-
-  for (i = 0; i < sizeof (m88k_reloc_map) / sizeof (struct elf_reloc_map); i++)
+  for (i = 0; i < sizeof (reloc_map) / sizeof (reloc_map[0]); i++)
     {
-      if (m88k_reloc_map[i].bfd_reloc_val == code)
-	return (_bfd_m88k_elf_howto_table +
-		(int) m88k_reloc_map[i].elf_reloc_val);
+      if (reloc_map[i].bfd_val == code)
+	return &howto_table[reloc_map[i].elf_val];
     }
-
-  bfd_set_error (bfd_error_bad_value);
-  return NULL;
+  return 0;
 }
 
+#define bfd_elf32_bfd_reloc_type_lookup reloc_type_lookup
+#define ELF_ARCH bfd_arch_m88k
 
 /* Functions for the m88k ELF linker.  */
 
+/* The name of the dynamic interpreter.  This is put in the .interp
+   section.  */
+
+#define ELF_DYNAMIC_INTERPRETER "/usr/lib/ld.so.1"
+
+/* The size in bytes of an entry in the procedure linkage table.  */
+
+#define PLT_ENTRY_SIZE 24
+
+/* The size in bytes of the first entry in the procedure linkage table.  */
+
+#define PLT_ENTRY0_SIZE (3 * PLT_ENTRY_SIZE)
+
+/* The first entry in a procedure linkage table looks like this.  See
+   the SVR4 ABI m88k supplement to see how this works.  */
+
+static const bfd_byte elf_m88k_plt0_entry[PLT_ENTRY0_SIZE] =
+{
+  0x67, 0xff, 0x00, 0x10, /*	subu r31, r31, 0x10             */
+  0x24, 0x3f, 0x00, 0x0c, /*	st   r1,  r31, 0x0c             */
+  0x25, 0x7f, 0x00, 0x08, /*	st   r11, r31, 0x08             */
+  0xc8, 0x00, 0x00, 0x01, /*	bsr  1f                         */
+  0x5d, 0x60, 0x00, 0x00, /* 1:	or.u r11, r0,  %hi16(1b#abdiff) */
+  0x59, 0x6b, 0x00, 0x00, /*	or   r11, r11, %lo16(1b#abdiff) */
+  0xf5, 0x6b, 0x60, 0x01, /*	addu r11, r11, r1               */
+  0x14, 0x2b, 0x00, 0x04, /*	ld   r1,  r11, 0x04             */
+  0x24, 0x3f, 0x00, 0x04, /*	st   r1,  r31, 0x04             */
+  0x15, 0x6b, 0x00, 0x08, /*	ld   r11, r11, 0x08             */
+  0x24, 0x1f, 0x00, 0x00, /*	st   r0,  r31, 0                */
+  0xf4, 0x00, 0xc8, 0x0b, /*	jsr  r11                        */
+  0xf4, 0x00, 0x58, 0x00, /*	nop                             */
+  0xf4, 0x00, 0x58, 0x00, /*	nop                             */
+  0xf4, 0x00, 0x58, 0x00, /*	nop                             */
+  0xf4, 0x00, 0x58, 0x00, /*	nop                             */
+  0xf4, 0x00, 0x58, 0x00, /*	nop                             */
+  0xf4, 0x00, 0x58, 0x00  /*	nop                             */
+};
+
+/* Subsequent entries in a procedure linkage table look like this.  */
+
+static const bfd_byte elf_m88k_plt_entry[PLT_ENTRY_SIZE] =
+{
+  0x5d, 0x60, 0x00, 0x00, /*	or.u r11, r0,  %hi16(symbol#gotrel) */
+  0x15, 0x6b, 0x00, 0x00, /*	ld   r11, r11, %lo16(symbol#gotrel) */
+  0xf4, 0x00, 0xc0, 0x0b, /*	jmp  r11                            */
+  0x5d, 0x60, 0x00, 0x00, /* 1:	or.u r11, r0,  %hi16(.rela offset)  */
+  0x59, 0x6b, 0x00, 0x00, /*	or   r11, r11, %lo16(.rela offset)  */
+  0xc0, 0x00, 0x00, 0x00  /*	br   resolver                       */
+};
+
+/* The m88k linker needs to keep track of the number of relocs that it
+   decides to copy in check_relocs for each symbol.  This is so that it
+   can discard PC relative relocs if it doesn't need them when linking
+   with -Bsymbolic.  We store the information in a field extending the
+   regular ELF linker hash table.  */
+
+/* This structure keeps track of the number of PC relative relocs we have
+   copied for a given symbol.  */
+
+struct elf_m88k_pcrel_relocs_copied
+{
+  /* Next section.  */
+  struct elf_m88k_pcrel_relocs_copied *next;
+  /* A section in dynobj.  */
+  asection *section;
+  /* Number of relocs copied in this section.  */
+  bfd_size_type count;
+};
+
+/* m88k ELF linker hash entry.  */
+
+struct elf_m88k_link_hash_entry
+{
+  struct elf_link_hash_entry root;
+
+  /* Number of PC relative relocs copied for this symbol.  */
+  struct elf_m88k_pcrel_relocs_copied *pcrel_relocs_copied;
+};
+
+#define elf_m88k_hash_entry(ent) ((struct elf_m88k_link_hash_entry *) (ent))
+
+/* m88k ELF linker hash table.  */
+
+struct elf_m88k_link_hash_table
+{
+  struct elf_link_hash_table root;
+
+  /* Small local sym to section mapping cache.  */
+  struct sym_sec_cache sym_sec;
+};
+
+/* Get the m88k ELF linker hash table from a link_info structure.  */
+
+#define elf_m88k_hash_table(p) \
+  ((struct elf_m88k_link_hash_table *) (p)->hash)
+
+/* Create an entry in an m88k ELF linker hash table.  */
+
+static struct bfd_hash_entry *
+elf_m88k_link_hash_newfunc (entry, table, string)
+     struct bfd_hash_entry *entry;
+     struct bfd_hash_table *table;
+     const char *string;
+{
+  struct bfd_hash_entry *ret = entry;
+
+  /* Allocate the structure if it has not already been allocated by a
+     subclass.  */
+  if (ret == NULL)
+    ret = bfd_hash_allocate (table,
+			     sizeof (struct elf_m88k_link_hash_entry));
+  if (ret == NULL)
+    return ret;
+
+  /* Call the allocation method of the superclass.  */
+  ret = _bfd_elf_link_hash_newfunc (ret, table, string);
+  if (ret != NULL)
+    elf_m88k_hash_entry (ret)->pcrel_relocs_copied = NULL;
+
+  return ret;
+}
+
+/* Create an m88k ELF linker hash table.  */
+
+static struct bfd_link_hash_table *
+elf_m88k_link_hash_table_create (abfd)
+     bfd *abfd;
+{
+  struct elf_m88k_link_hash_table *ret;
+  bfd_size_type amt = sizeof (struct elf_m88k_link_hash_table);
+
+  ret = (struct elf_m88k_link_hash_table *) bfd_alloc (abfd, amt);
+  if (ret == (struct elf_m88k_link_hash_table *) NULL)
+    return NULL;
+
+  if (! _bfd_elf_link_hash_table_init (&ret->root, abfd,
+				       elf_m88k_link_hash_newfunc))
+    {
+      free (ret);
+      return NULL;
+    }
+
+  ret->sym_sec.abfd = NULL;
+
+  return &ret->root.root;
+}
+
 /* Keep m88k-specific flags in the ELF header.  */
 static bfd_boolean
 elf32_m88k_set_private_flags (abfd, flags)
@@ -275,6 +446,7 @@ elf32_m88k_print_private_bfd_data (abfd, ptr)
 
   return TRUE;
 }
+
 /* Look through the relocs for a section during the first phase, and
    allocate space in the global offset table or procedure linkage
    table.  */
@@ -286,28 +458,36 @@ elf_m88k_check_relocs (abfd, info, sec, relocs)
      asection *sec;
      const Elf_Internal_Rela *relocs;
 {
+  bfd *dynobj;
   Elf_Internal_Shdr *symtab_hdr;
-  struct elf_link_hash_entry **sym_hashes, **sym_hashes_end;
+  struct elf_link_hash_entry **sym_hashes;
+  bfd_signed_vma *local_got_refcounts;
   const Elf_Internal_Rela *rel;
   const Elf_Internal_Rela *rel_end;
+  asection *sgot;
+  asection *srelgot;
+  asection *sreloc;
 
   if (info->relocatable)
     return TRUE;
 
+  dynobj = elf_hash_table (info)->dynobj;
   symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
   sym_hashes = elf_sym_hashes (abfd);
-  sym_hashes_end =
-    sym_hashes + symtab_hdr->sh_size / sizeof (Elf32_External_Sym);
-  if (!elf_bad_symtab (abfd))
-    sym_hashes_end -= symtab_hdr->sh_info;
+  local_got_refcounts = elf_local_got_refcounts (abfd);
+
+  sgot = NULL;
+  srelgot = NULL;
+  sreloc = NULL;
 
   rel_end = relocs + sec->reloc_count;
   for (rel = relocs; rel < rel_end; rel++)
     {
-      struct elf_link_hash_entry *h;
       unsigned long r_symndx;
+      struct elf_link_hash_entry *h;
 
       r_symndx = ELF32_R_SYM (rel->r_info);
+
       if (r_symndx < symtab_hdr->sh_info)
 	h = NULL;
       else
@@ -315,6 +495,279 @@ elf_m88k_check_relocs (abfd, info, sec, relocs)
 
       switch (ELF32_R_TYPE (rel->r_info))
 	{
+	case R_88K_GOT_16L:
+	case R_88K_GOT_16H:
+	  /* This symbol requires a global offset table entry.  */
+
+	  if (dynobj == NULL)
+	    {
+	      /* Create the .got section.  */
+	      elf_hash_table (info)->dynobj = dynobj = abfd;
+	      if (!_bfd_elf_create_got_section (dynobj, info))
+		return FALSE;
+	    }
+
+	  if (sgot == NULL)
+	    {
+	      sgot = bfd_get_section_by_name (dynobj, ".got");
+	      BFD_ASSERT (sgot != NULL);
+	    }
+
+	  if (srelgot == NULL
+	      && (h != NULL || info->shared))
+	    {
+	      srelgot = bfd_get_section_by_name (dynobj, ".rela.got");
+	      if (srelgot == NULL)
+		{
+		  srelgot = bfd_make_section (dynobj, ".rela.got");
+		  if (srelgot == NULL
+		      || !bfd_set_section_flags (dynobj, srelgot,
+						 (SEC_ALLOC
+						  | SEC_LOAD
+						  | SEC_HAS_CONTENTS
+						  | SEC_IN_MEMORY
+						  | SEC_LINKER_CREATED
+						  | SEC_READONLY))
+		      || !bfd_set_section_alignment (dynobj, srelgot, 2))
+		    return FALSE;
+		}
+	    }
+
+	  if (h != NULL)
+	    {
+	      if (h->got.refcount == 0)
+		{
+		  /* Make sure this symbol is output as a dynamic symbol.  */
+		  if (h->dynindx == -1
+		      && (h->elf_link_hash_flags & ELF_LINK_FORCED_LOCAL) == 0)
+		    {
+		      if (!bfd_elf_link_record_dynamic_symbol (info, h))
+			return FALSE;
+		    }
+
+		  /* Allocate space in the .got section.  */
+		  sgot->_raw_size += 4;
+		  /* Allocate relocation space.  */
+		  srelgot->_raw_size += sizeof (Elf32_External_Rela);
+		}
+	      h->got.refcount++;
+	    }
+	  else
+	    {
+	      /* This is a global offset table entry for a local symbol.  */
+	      if (local_got_refcounts == NULL)
+		{
+		  bfd_size_type size;
+
+		  size = symtab_hdr->sh_info;
+		  size *= sizeof (bfd_signed_vma);
+		  local_got_refcounts = ((bfd_signed_vma *)
+					 bfd_zalloc (abfd, size));
+		  if (local_got_refcounts == NULL)
+		    return FALSE;
+		  elf_local_got_refcounts (abfd) = local_got_refcounts;
+		}
+	      if (local_got_refcounts[r_symndx] == 0)
+		{
+		  sgot->_raw_size += 4;
+		  if (info->shared)
+		    {
+		      /* If we are generating a shared object, we need to
+			 output a R_88K_BBASED reloc so that the dynamic
+			 linker can adjust this GOT entry.  */
+		      srelgot->_raw_size += sizeof (Elf32_External_Rela);
+		    }
+		}
+	      local_got_refcounts[r_symndx]++;
+	    }
+	  break;
+
+	case R_88K_PLT_DISP26:
+	  /* This symbol requires a procedure linkage table entry.  We
+	     actually build the entry in adjust_dynamic_symbol,
+             because this might be a case of linking PIC code which is
+             never referenced by a dynamic object, in which case we
+             don't need to generate a procedure linkage table entry
+             after all.  */
+
+	  /* If this is a local symbol, we resolve it directly without
+	     creating a procedure linkage table entry.  */
+	  if (h == NULL)
+	    continue;
+
+	  h->elf_link_hash_flags |= ELF_LINK_HASH_NEEDS_PLT;
+	  h->plt.refcount++;
+	  break;
+
+	case R_88K_PLT_32:
+	  /* This symbol requires a procedure linkage table entry.  */
+
+	  if (h == NULL)
+	    {
+	      /* It does not make sense to have this relocation for a
+		 local symbol.  FIXME: does it?  How to handle it if
+		 it does make sense?  */
+	      bfd_set_error (bfd_error_bad_value);
+	      return FALSE;
+	    }
+
+	  /* Make sure this symbol is output as a dynamic symbol.  */
+	  if (h->dynindx == -1
+	      && (h->elf_link_hash_flags & ELF_LINK_FORCED_LOCAL) == 0)
+	    {
+	      if (!bfd_elf_link_record_dynamic_symbol (info, h))
+		return FALSE;
+	    }
+
+	  h->elf_link_hash_flags |= ELF_LINK_HASH_NEEDS_PLT;
+	  h->plt.refcount++;
+	  break;
+
+	case R_88K_DISP16:
+	case R_88K_DISP26:
+	  /* If we are creating a shared library and this is not a local
+	     symbol, we need to copy the reloc into the shared library.
+	     However when linking with -Bsymbolic and this is a global
+	     symbol which is defined in an object we are including in the
+	     link (i.e., DEF_REGULAR is set), then we can resolve the
+	     reloc directly.  At this point we have not seen all the input
+	     files, so it is possible that DEF_REGULAR is not set now but
+	     will be set later (it is never cleared).  We account for that
+	     possibility below by storing information in the
+	     pcrel_relocs_copied field of the hash table entry.  */
+	  if (!(info->shared
+		&& (sec->flags & SEC_ALLOC) != 0
+		&& h != NULL
+		&& (!info->symbolic
+		    || h->root.type == bfd_link_hash_defweak
+		    || (h->elf_link_hash_flags
+			& ELF_LINK_HASH_DEF_REGULAR) == 0)))
+	    {
+	      if (h != NULL)
+		{
+		  /* Make sure a plt entry is created for this symbol if
+		     it turns out to be a function defined by a dynamic
+		     object.  */
+		  h->plt.refcount++;
+		}
+	      break;
+	    }
+	  /* Fall through.  */
+	case R_88K_32:
+	case R_88K_16L:
+	case R_88K_16H:
+	  if (h != NULL)
+	    {
+	      /* Make sure a plt entry is created for this symbol if it
+		 turns out to be a function defined by a dynamic object.  */
+	      h->plt.refcount++;
+	    }
+
+	  /* If we are creating a shared library, we need to copy the
+	     reloc into the shared library.  */
+	  if (info->shared
+	      && (sec->flags & SEC_ALLOC) != 0)
+	    {
+	      /* When creating a shared object, we must copy these
+		 reloc types into the output file.  We create a reloc
+		 section in dynobj and make room for this reloc.  */
+	      if (sreloc == NULL)
+		{
+		  const char *name;
+
+		  name = (bfd_elf_string_from_elf_section
+			  (abfd,
+			   elf_elfheader (abfd)->e_shstrndx,
+			   elf_section_data (sec)->rel_hdr.sh_name));
+		  if (name == NULL)
+		    return FALSE;
+
+		  BFD_ASSERT (strncmp (name, ".rela", 5) == 0
+			      && strcmp (bfd_get_section_name (abfd, sec),
+					 name + 5) == 0);
+
+		  sreloc = bfd_get_section_by_name (dynobj, name);
+		  if (sreloc == NULL)
+		    {
+		      sreloc = bfd_make_section (dynobj, name);
+		      if (sreloc == NULL
+			  || !bfd_set_section_flags (dynobj, sreloc,
+						     (SEC_ALLOC
+						      | SEC_LOAD
+						      | SEC_HAS_CONTENTS
+						      | SEC_IN_MEMORY
+						      | SEC_LINKER_CREATED
+						      | SEC_READONLY))
+			  || !bfd_set_section_alignment (dynobj, sreloc, 2))
+			return FALSE;
+		    }
+		  elf_section_data (sec)->sreloc = sreloc;
+		}
+
+	      if (sec->flags & SEC_READONLY
+		  /* Don't set DF_TEXTREL yet for PC relative
+		     relocations, they might be discarded later.  */
+		  && !(ELF32_R_TYPE (rel->r_info) == R_88K_DISP16
+		       || ELF32_R_TYPE (rel->r_info) == R_88K_DISP26))
+		    info->flags |= DF_TEXTREL;
+
+	      sreloc->_raw_size += sizeof (Elf32_External_Rela);
+
+	      /* We count the number of PC relative relocations we have
+		 entered for this symbol, so that we can discard them
+		 again if, in the -Bsymbolic case, the symbol is later
+		 defined by a regular object, or, in the normal shared
+		 case, the symbol is forced to be local.  Note that this
+		 function is only called if we are using an m88kelf linker
+		 hash table, which means that h is really a pointer to an
+		 elf_m88k_link_hash_entry.  */
+	      if (ELF32_R_TYPE (rel->r_info) == R_88K_DISP16
+		  || ELF32_R_TYPE (rel->r_info) == R_88K_DISP26)
+		{
+		  struct elf_m88k_pcrel_relocs_copied *p;
+		  struct elf_m88k_pcrel_relocs_copied **head;
+
+		  if (h != NULL)
+		    {
+		      struct elf_m88k_link_hash_entry *eh
+			= elf_m88k_hash_entry (h);
+		      head = &eh->pcrel_relocs_copied;
+		    }
+		  else
+		    {
+		      asection *s;
+		      s = (bfd_section_from_r_symndx
+			   (abfd, &elf_m88k_hash_table (info)->sym_sec,
+			    sec, r_symndx));
+		      if (s == NULL)
+			return FALSE;
+
+		      head = ((struct elf_m88k_pcrel_relocs_copied **)
+			      &elf_section_data (s)->local_dynrel);
+		    }
+
+		  for (p = *head; p != NULL; p = p->next)
+		    if (p->section == sreloc)
+		      break;
+
+		  if (p == NULL)
+		    {
+		      p = ((struct elf_m88k_pcrel_relocs_copied *)
+			   bfd_alloc (dynobj, (bfd_size_type) sizeof *p));
+		      if (p == NULL)
+			return FALSE;
+		      p->next = *head;
+		      *head = p;
+		      p->section = sreloc;
+		      p->count = 0;
+		    }
+
+		  ++p->count;
+		}
+	    }
+
+	  break;
+
 	  /* This relocation describes the C++ object vtable hierarchy.
 	     Reconstruct it for later use during GC.  */
 	case R_88K_GNU_VTINHERIT:
@@ -359,15 +812,15 @@ elf_m88k_gc_mark_hook (sec, info, rel, h, sym)
 	default:
 	  switch (h->root.type)
 	    {
+	    default:
+	      break;
+
 	    case bfd_link_hash_defined:
 	    case bfd_link_hash_defweak:
 	      return h->root.u.def.section;
 
 	    case bfd_link_hash_common:
 	      return h->root.u.c.p->section;
-
-	    default:
-	      break;
 	    }
 	}
     }
@@ -381,11 +834,504 @@ elf_m88k_gc_mark_hook (sec, info, rel, h, sym)
 
 static bfd_boolean
 elf_m88k_gc_sweep_hook (abfd, info, sec, relocs)
-     bfd *abfd ATTRIBUTE_UNUSED;
-     struct bfd_link_info *info ATTRIBUTE_UNUSED;
-     asection *sec ATTRIBUTE_UNUSED;
-     const Elf_Internal_Rela *relocs ATTRIBUTE_UNUSED;
+     bfd *abfd;
+     struct bfd_link_info *info;
+     asection *sec;
+     const Elf_Internal_Rela *relocs;
 {
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  bfd_signed_vma *local_got_refcounts;
+  const Elf_Internal_Rela *rel, *relend;
+  bfd *dynobj;
+  asection *sgot;
+  asection *srelgot;
+
+  dynobj = elf_hash_table (info)->dynobj;
+  if (dynobj == NULL)
+    return TRUE;
+
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+  sym_hashes = elf_sym_hashes (abfd);
+  local_got_refcounts = elf_local_got_refcounts (abfd);
+
+  sgot = bfd_get_section_by_name (dynobj, ".got");
+  srelgot = bfd_get_section_by_name (dynobj, ".rela.got");
+
+  relend = relocs + sec->reloc_count;
+  for (rel = relocs; rel < relend; rel++)
+    {
+      unsigned long r_symndx;
+      struct elf_link_hash_entry *h;
+
+      switch (ELF32_R_TYPE (rel->r_info))
+	{
+	case R_88K_GOT_16L:
+	case R_88K_GOT_16H:
+	  r_symndx = ELF32_R_SYM (rel->r_info);
+	  if (r_symndx >= symtab_hdr->sh_info)
+	    {
+	      h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+	      if (h->got.refcount > 0)
+		{
+		  --h->got.refcount;
+		  if (h->got.refcount == 0)
+		    {
+		      /* We don't need the .got entry any more.  */
+		      sgot->_raw_size -= 4;
+		      srelgot->_raw_size -= sizeof (Elf32_External_Rela);
+		    }
+		}
+	    }
+	  else if (local_got_refcounts != NULL)
+	    {
+	      if (local_got_refcounts[r_symndx] > 0)
+		{
+		  --local_got_refcounts[r_symndx];
+		  if (local_got_refcounts[r_symndx] == 0)
+		    {
+		      /* We don't need the .got entry any more.  */
+		      sgot->_raw_size -= 4;
+		      if (info->shared)
+			srelgot->_raw_size -= sizeof (Elf32_External_Rela);
+		    }
+		}
+	    }
+	  break;
+
+	case R_88K_PLT_DISP26:
+	case R_88K_PLT_32:
+	case R_88K_DISP16:
+	case R_88K_DISP26:
+	case R_88K_32:
+	case R_88K_16L:
+	case R_88K_16H:
+	  r_symndx = ELF32_R_SYM (rel->r_info);
+	  if (r_symndx >= symtab_hdr->sh_info)
+	    {
+	      h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+	      if (h->plt.refcount > 0)
+		--h->plt.refcount;
+	    }
+	  break;
+
+	default:
+	  break;
+	}
+    }
+
+  return TRUE;
+}
+
+/* Adjust a symbol defined by a dynamic object and referenced by a
+   regular object.  The current definition is in some section of the
+   dynamic object, but we're not including those sections.  We have to
+   change the definition to something the rest of the link can
+   understand.  */
+
+static bfd_boolean
+elf_m88k_adjust_dynamic_symbol (info, h)
+     struct bfd_link_info *info;
+     struct elf_link_hash_entry *h;
+{
+  bfd *dynobj;
+  asection *s;
+  unsigned int power_of_two;
+
+  dynobj = elf_hash_table (info)->dynobj;
+
+  /* Make sure we know what is going on here.  */
+  BFD_ASSERT (dynobj != NULL
+	      && ((h->elf_link_hash_flags & ELF_LINK_HASH_NEEDS_PLT)
+		  || h->weakdef != NULL
+		  || ((h->elf_link_hash_flags
+		       & ELF_LINK_HASH_DEF_DYNAMIC) != 0
+		      && (h->elf_link_hash_flags
+			  & ELF_LINK_HASH_REF_REGULAR) != 0
+		      && (h->elf_link_hash_flags
+			  & ELF_LINK_HASH_DEF_REGULAR) == 0)));
+
+  /* If this is a function, put it in the procedure linkage table.  We
+     will fill in the contents of the procedure linkage table later,
+     when we know the address of the .got section.  */
+  if (h->type == STT_FUNC
+      || (h->elf_link_hash_flags & ELF_LINK_HASH_NEEDS_PLT) != 0)
+    {
+      if (! info->shared
+	  && (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_DYNAMIC) == 0
+	  && (h->elf_link_hash_flags & ELF_LINK_HASH_REF_DYNAMIC) == 0
+	  /* We must always create the plt entry if it was referenced
+	     by a PLTxxO relocation.  In this case we already recorded
+	     it as a dynamic symbol.  */
+	  && h->dynindx == -1)
+	{
+	  /* This case can occur if we saw a PLTxx reloc in an input
+	     file, but the symbol was never referred to by a dynamic
+	     object.  In such a case, we don't actually need to build
+	     a procedure linkage table, and we can just do a PCxx
+	     reloc instead.  */
+	  BFD_ASSERT ((h->elf_link_hash_flags & ELF_LINK_HASH_NEEDS_PLT) != 0);
+	  h->plt.offset = (bfd_vma) -1;
+	  return TRUE;
+	}
+
+      /* GC may have rendered this entry unused.  */
+      if (h->plt.refcount <= 0)
+	{
+	  h->elf_link_hash_flags &= ~ELF_LINK_HASH_NEEDS_PLT;
+	  h->plt.offset = (bfd_vma) -1;
+	  return TRUE;
+	}
+
+      /* Make sure this symbol is output as a dynamic symbol.  */
+      if (h->dynindx == -1
+	  && (h->elf_link_hash_flags & ELF_LINK_FORCED_LOCAL) == 0)
+	{
+	  if (! bfd_elf_link_record_dynamic_symbol (info, h))
+	    return FALSE;
+	}
+
+      s = bfd_get_section_by_name (dynobj, ".plt");
+      BFD_ASSERT (s != NULL);
+
+      /* If this is the first .plt entry, make room for the special
+	 first entry.  */
+      if (s->_raw_size == 0)
+	{
+	  s->_raw_size += PLT_ENTRY0_SIZE;
+	}
+
+      /* If this symbol is not defined in a regular file, and we are
+	 not generating a shared library, then set the symbol to this
+	 location in the .plt.  This is required to make function
+	 pointers compare as equal between the normal executable and
+	 the shared library.  */
+      if (!info->shared
+	  && (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0)
+	{
+	  h->root.u.def.section = s;
+	  h->root.u.def.value = s->_raw_size;
+	}
+
+      h->plt.offset = s->_raw_size;
+
+      /* Make room for this entry.  */
+      s->_raw_size += PLT_ENTRY_SIZE;
+
+      /* We also need to make an entry in the .got.plt section, which
+	 will be placed in the .got section by the linker script.  */
+      s = bfd_get_section_by_name (dynobj, ".got.plt");
+      BFD_ASSERT (s != NULL);
+      s->_raw_size += 4;
+
+      /* We also need to make an entry in the .rela.plt section.  */
+      s = bfd_get_section_by_name (dynobj, ".rela.plt");
+      BFD_ASSERT (s != NULL);
+      s->_raw_size += sizeof (Elf32_External_Rela);
+
+      return TRUE;
+    }
+
+  /* Reinitialize the plt offset now that it is not used as a reference
+     count any more.  */
+  h->plt.offset = (bfd_vma) -1;
+
+  /* If this is a weak symbol, and there is a real definition, the
+     processor independent code will have arranged for us to see the
+     real definition first, and we can just use the same value.  */
+  if (h->weakdef != NULL)
+    {
+      BFD_ASSERT (h->weakdef->root.type == bfd_link_hash_defined
+		  || h->weakdef->root.type == bfd_link_hash_defweak);
+      h->root.u.def.section = h->weakdef->root.u.def.section;
+      h->root.u.def.value = h->weakdef->root.u.def.value;
+      return TRUE;
+    }
+
+  /* This is a reference to a symbol defined by a dynamic object which
+     is not a function.  */
+
+  /* If we are creating a shared library, we must presume that the
+     only references to the symbol are via the global offset table.
+     For such cases we need not do anything here; the relocations will
+     be handled correctly by relocate_section.  */
+  if (info->shared)
+    return TRUE;
+
+  /* We must allocate the symbol in our .dynbss section, which will
+     become part of the .bss section of the executable.  There will be
+     an entry for this symbol in the .dynsym section.  The dynamic
+     object will contain position independent code, so all references
+     from the dynamic object to this symbol will go through the global
+     offset table.  The dynamic linker will use the .dynsym entry to
+     determine the address it must put in the global offset table, so
+     both the dynamic object and the regular object will refer to the
+     same memory location for the variable.  */
+
+  s = bfd_get_section_by_name (dynobj, ".dynbss");
+  BFD_ASSERT (s != NULL);
+
+  /* We must generate a R_88K_COPY reloc to tell the dynamic linker to
+     copy the initial value out of the dynamic object and into the
+     runtime process image.  We need to remember the offset into the
+     .rela.bss section we are going to use.  */
+  if ((h->root.u.def.section->flags & SEC_ALLOC) != 0)
+    {
+      asection *srel;
+
+      srel = bfd_get_section_by_name (dynobj, ".rela.bss");
+      BFD_ASSERT (srel != NULL);
+      srel->_raw_size += sizeof (Elf32_External_Rela);
+      h->elf_link_hash_flags |= ELF_LINK_HASH_NEEDS_COPY;
+    }
+
+  /* We need to figure out the alignment required for this symbol.  I
+     have no idea how other ELF linkers handle this.  */
+  power_of_two = bfd_log2 (h->size);
+  if (power_of_two > 3)
+    power_of_two = 3;
+
+  /* Apply the required alignment.  */
+  s->_raw_size = BFD_ALIGN (s->_raw_size,
+			    (bfd_size_type) (1 << power_of_two));
+  if (power_of_two > bfd_get_section_alignment (dynobj, s))
+    {
+      if (!bfd_set_section_alignment (dynobj, s, power_of_two))
+	return FALSE;
+    }
+
+  /* Define the symbol as being at this point in the section.  */
+  h->root.u.def.section = s;
+  h->root.u.def.value = s->_raw_size;
+
+  /* Increment the section size to make room for the symbol.  */
+  s->_raw_size += h->size;
+
+  return TRUE;
+}
+
+/* Set the sizes of the dynamic sections.  */
+
+static bfd_boolean
+elf_m88k_size_dynamic_sections (output_bfd, info)
+     bfd *output_bfd ATTRIBUTE_UNUSED;
+     struct bfd_link_info *info;
+{
+  bfd *dynobj;
+  asection *s;
+  bfd_boolean plt;
+  bfd_boolean relocs;
+
+  dynobj = elf_hash_table (info)->dynobj;
+  BFD_ASSERT (dynobj != NULL);
+
+  if (elf_hash_table (info)->dynamic_sections_created)
+    {
+      /* Set the contents of the .interp section to the interpreter.  */
+      if (info->executable)
+	{
+	  s = bfd_get_section_by_name (dynobj, ".interp");
+	  BFD_ASSERT (s != NULL);
+	  s->_raw_size = sizeof ELF_DYNAMIC_INTERPRETER;
+	  s->contents = (unsigned char *) ELF_DYNAMIC_INTERPRETER;
+	}
+    }
+  else
+    {
+      /* We may have created entries in the .rela.got section.
+	 However, if we are not creating the dynamic sections, we will
+	 not actually use these entries.  Reset the size of .rela.got,
+	 which will cause it to get stripped from the output file
+	 below.  */
+      s = bfd_get_section_by_name (dynobj, ".rela.got");
+      if (s != NULL)
+	s->_raw_size = 0;
+    }
+
+  /* If this is a -Bsymbolic shared link, then we need to discard all
+     PC relative relocs against symbols defined in a regular object.
+     For the normal shared case we discard the PC relative relocs
+     against symbols that have become local due to visibility changes.
+     We allocated space for them in the check_relocs routine, but we
+     will not fill them in in the relocate_section routine.  */
+  if (info->shared)
+    elf_link_hash_traverse (elf_hash_table (info),
+			    elf_m88k_discard_copies,
+			    (PTR) info);
+
+  /* The check_relocs and adjust_dynamic_symbol entry points have
+     determined the sizes of the various dynamic sections.  Allocate
+     memory for them.  */
+  plt = FALSE;
+  relocs = FALSE;
+  for (s = dynobj->sections; s != NULL; s = s->next)
+    {
+      const char *name;
+      bfd_boolean strip;
+
+      if ((s->flags & SEC_LINKER_CREATED) == 0)
+	continue;
+
+      /* It's OK to base decisions on the section name, because none
+	 of the dynobj section names depend upon the input files.  */
+      name = bfd_get_section_name (dynobj, s);
+
+      strip = FALSE;
+
+      if (strcmp (name, ".plt") == 0)
+	{
+	  if (s->_raw_size == 0)
+	    {
+	      /* Strip this section if we don't need it; see the
+                 comment below.  */
+	      strip = TRUE;
+	    }
+	  else
+	    {
+	      /* Remember whether there is a PLT.  */
+	      plt = TRUE;
+	    }
+	}
+      else if (strncmp (name, ".rela", 5) == 0)
+	{
+	  if (s->_raw_size == 0)
+	    {
+	      /* If we don't need this section, strip it from the
+		 output file.  This is mostly to handle .rela.bss and
+		 .rela.plt.  We must create both sections in
+		 create_dynamic_sections, because they must be created
+		 before the linker maps input sections to output
+		 sections.  The linker does that before
+		 adjust_dynamic_symbol is called, and it is that
+		 function which decides whether anything needs to go
+		 into these sections.  */
+	      strip = TRUE;
+	    }
+	  else
+	    {
+	      relocs = TRUE;
+
+	      /* We use the reloc_count field as a counter if we need
+		 to copy relocs into the output file.  */
+	      s->reloc_count = 0;
+	    }
+	}
+      else if (strncmp (name, ".got", 4) != 0)
+	{
+	  /* It's not one of our sections, so don't allocate space.  */
+	  continue;
+	}
+
+      if (strip)
+	{
+	  _bfd_strip_section_from_output (info, s);
+	  continue;
+	}
+
+      /* Allocate memory for the section contents.  */
+      /* FIXME: This should be a call to bfd_alloc not bfd_zalloc.
+	 Unused entries should be reclaimed before the section's contents
+	 are written out, but at the moment this does not happen.  Thus in
+	 order to prevent writing out garbage, we initialise the section's
+	 contents to zero.  */
+      s->contents = (bfd_byte *) bfd_zalloc (dynobj, s->_raw_size);
+      if (s->contents == NULL && s->_raw_size != 0)
+	return FALSE;
+    }
+
+  if (elf_hash_table (info)->dynamic_sections_created)
+    {
+      /* Add some entries to the .dynamic section.  We fill in the
+	 values later, in elf_m88k_finish_dynamic_sections, but we
+	 must add the entries now so that we get the correct size for
+	 the .dynamic section.  The DT_DEBUG entry is filled in by the
+	 dynamic linker and used by the debugger.  */
+#define add_dynamic_entry(TAG, VAL) \
+  _bfd_elf_add_dynamic_entry (info, TAG, VAL)
+
+      if (!info->shared)
+	{
+	  if (!add_dynamic_entry (DT_DEBUG, 0))
+	    return FALSE;
+	}
+
+      if (plt)
+	{
+	  if (!add_dynamic_entry (DT_PLTGOT, 0)
+	      || !add_dynamic_entry (DT_PLTRELSZ, 0)
+	      || !add_dynamic_entry (DT_PLTREL, DT_RELA)
+	      || !add_dynamic_entry (DT_JMPREL, 0))
+	    return FALSE;
+	}
+
+      if (relocs)
+	{
+	  if (!add_dynamic_entry (DT_RELA, 0)
+	      || !add_dynamic_entry (DT_RELASZ, 0)
+	      || !add_dynamic_entry (DT_RELAENT, sizeof (Elf32_External_Rela)))
+	    return FALSE;
+	}
+
+      if ((info->flags & DF_TEXTREL) != 0)
+	{
+	  if (!add_dynamic_entry (DT_TEXTREL, 0))
+	    return FALSE;
+	}
+    }
+#undef add_dynamic_entry
+
+  return TRUE;
+}
+
+/* This function is called via elf_link_hash_traverse if we are
+   creating a shared object.  In the -Bsymbolic case it discards the
+   space allocated to copy PC relative relocs against symbols which
+   are defined in regular objects.  For the normal shared case, it
+   discards space for pc-relative relocs that have become local due to
+   symbol visibility changes.  We allocated space for them in the
+   check_relocs routine, but we won't fill them in in the
+   relocate_section routine.
+
+   We also check whether any of the remaining relocations apply
+   against a readonly section, and set the DF_TEXTREL flag in this
+   case.  */
+
+static bfd_boolean
+elf_m88k_discard_copies (h, inf)
+     struct elf_link_hash_entry *h;
+     PTR inf;
+{
+  struct bfd_link_info *info = (struct bfd_link_info *) inf;
+  struct elf_m88k_pcrel_relocs_copied *s;
+
+  if (h->root.type == bfd_link_hash_warning)
+    h = (struct elf_link_hash_entry *) h->root.u.i.link;
+
+  if ((h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0
+      || (!info->symbolic
+	  && (h->elf_link_hash_flags & ELF_LINK_FORCED_LOCAL) == 0))
+    {
+      if ((info->flags & DF_TEXTREL) == 0)
+	{
+	  /* Look for relocations against read-only sections.  */
+	  for (s = elf_m88k_hash_entry (h)->pcrel_relocs_copied;
+	       s != NULL;
+	       s = s->next)
+	    if ((s->section->flags & SEC_READONLY) != 0)
+	      {
+		info->flags |= DF_TEXTREL;
+		break;
+	      }
+	}
+
+      return TRUE;
+    }
+
+  for (s = elf_m88k_hash_entry (h)->pcrel_relocs_copied;
+       s != NULL;
+       s = s->next)
+    s->section->_raw_size -= s->count * sizeof (Elf32_External_Rela);
+
   return TRUE;
 }
 
@@ -403,16 +1349,27 @@ elf_m88k_relocate_section (output_bfd, info, input_bfd, input_section,
      Elf_Internal_Sym *local_syms;
      asection **local_sections;
 {
+  bfd *dynobj;
   Elf_Internal_Shdr *symtab_hdr;
   struct elf_link_hash_entry **sym_hashes;
+  bfd_vma *local_got_offsets;
+  asection *sgot;
+  asection *splt;
+  asection *sreloc;
   Elf_Internal_Rela *rel;
   Elf_Internal_Rela *relend;
 
   if (info->relocatable)
     return TRUE;
 
+  dynobj = elf_hash_table (info)->dynobj;
   symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
   sym_hashes = elf_sym_hashes (input_bfd);
+  local_got_offsets = elf_local_got_offsets (input_bfd);
+
+  sgot = NULL;
+  splt = NULL;
+  sreloc = NULL;
 
   rel = relocs;
   relend = relocs + input_section->reloc_count;
@@ -425,21 +1382,23 @@ elf_m88k_relocate_section (output_bfd, info, input_bfd, input_section,
       Elf_Internal_Sym *sym;
       asection *sec;
       bfd_vma relocation;
+      bfd_boolean unresolved_reloc;
       bfd_reloc_status_type r;
 
       r_type = ELF32_R_TYPE (rel->r_info);
-      r_symndx = ELF32_R_SYM (rel->r_info);
-
-      if (r_type == R_88K_GNU_VTINHERIT || r_type == R_88K_GNU_VTENTRY)
-	continue;
+      if (r_type < 0 || r_type >= (int) R_88K_UNIMPLEMENTED)
+	{
+	  bfd_set_error (bfd_error_bad_value);
+	  return FALSE;
+	}
+      howto = howto_table + r_type;
 
-      if ((unsigned int) r_type >= R_88K_UNIMPLEMENTED)
-	abort ();
+      r_symndx = ELF32_R_SYM (rel->r_info);
 
-      howto = _bfd_m88k_elf_howto_table + r_type;
       h = NULL;
       sym = NULL;
       sec = NULL;
+      unresolved_reloc = FALSE;
 
       if (r_symndx < symtab_hdr->sh_info)
 	{
@@ -449,7 +1408,7 @@ elf_m88k_relocate_section (output_bfd, info, input_bfd, input_section,
 	}
       else
 	{
-	  bfd_boolean unresolved_reloc, warned;
+	  bfd_boolean warned;
 
 	  RELOC_FOR_GLOBAL_SYMBOL (info, input_bfd, input_section, rel,
 				   r_symndx, symtab_hdr, sym_hashes,
@@ -457,6 +1416,316 @@ elf_m88k_relocate_section (output_bfd, info, input_bfd, input_section,
 				   unresolved_reloc, warned);
 	}
 
+      switch (r_type)
+	{
+	case R_88K_GOT_16L:
+	case R_88K_GOT_16H:
+	  /* Relocation is the offset of the entry for this symbol in
+	     the global offset table.  */
+	  {
+	    bfd_vma off;
+
+	    if (sgot == NULL)
+	      {
+		sgot = bfd_get_section_by_name (dynobj, ".got");
+		BFD_ASSERT (sgot != NULL);
+	      }
+
+	    if (h != NULL)
+	      {
+		bfd_boolean dyn;
+
+		off = h->got.offset;
+		BFD_ASSERT (off != (bfd_vma) -1);
+
+		dyn = elf_hash_table (info)->dynamic_sections_created;
+		if (!WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, info->shared, h)
+		    || (info->shared
+			&& (info->symbolic
+			    || h->dynindx == -1
+			    || (h->elf_link_hash_flags & ELF_LINK_FORCED_LOCAL) != 0)
+			&& (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR)) != 0)
+		  {
+		    /* This is actually a static link, or it is a
+		       -Bsymbolic link and the symbol is defined
+		       locally, or the symbol was forced to be local
+		       because of a version file..  We must initialize
+		       this entry in the global offset table.  Since
+		       the offset must always be a multiple of 4, we
+		       use the least significant bit to record whether
+		       we have initialized it already.
+
+		       When doing a dynamic link, we create a .rela.got
+		       relocation entry to initialize the value.  This
+		       is done in the finish_dynamic_symbol routine.  */
+		    if ((off & 1) != 0)
+		      off &= ~1;
+		    else
+		      {
+			bfd_put_32 (output_bfd, relocation,
+				    sgot->contents + off);
+			h->got.offset |= 1;
+		      }
+		  }
+		else
+		  unresolved_reloc = FALSE;
+	      }
+	    else
+	      {
+		BFD_ASSERT (local_got_offsets != NULL
+			    && local_got_offsets[r_symndx] != (bfd_vma) -1);
+
+		off = local_got_offsets[r_symndx];
+
+		/* The offset must always be a multiple of 4.  We use
+		   the least significant bit to record whether we have
+		   already generated the necessary reloc.  */
+		if ((off & 1) != 0)
+		  off &= ~1;
+		else
+		  {
+		    bfd_put_32 (output_bfd, relocation, sgot->contents + off);
+
+		    if (info->shared)
+		      {
+			asection *s;
+			Elf_Internal_Rela outrel;
+			bfd_byte *loc;
+
+			s = bfd_get_section_by_name (dynobj, ".rela.got");
+			BFD_ASSERT (s != NULL);
+
+			outrel.r_offset = (sgot->output_section->vma
+					   + sgot->output_offset
+					   + off);
+			outrel.r_info = ELF32_R_INFO (0, R_88K_BBASED_32);
+			outrel.r_addend = relocation;
+			loc = s->contents;
+			loc += s->reloc_count++ * sizeof (Elf32_External_Rela);
+			bfd_elf32_swap_reloca_out (output_bfd, &outrel, loc);
+		      }
+
+		    local_got_offsets[r_symndx] |= 1;
+		  }
+	      }
+
+	    relocation = sgot->output_offset + off;
+	    if (r_type == R_88K_GOT_16L
+		|| r_type == R_88K_GOT_16H)
+	      {
+		/* This relocation does not use the addend.  */
+		rel->r_addend = 0;
+	      }
+	    else
+	      relocation += sgot->output_section->vma;
+	  }
+	  break;
+
+	case R_88K_ABDIFF_16L:
+	case R_88K_ABDIFF_16H:
+	  /* Relocation is the offset from this symbol to the address of
+	     the global offset table.  */
+
+	  if (sgot == NULL)
+	    {
+	      sgot = bfd_get_section_by_name (dynobj, ".got");
+	      BFD_ASSERT (sgot != NULL);
+	    }
+
+	  relocation = sgot->output_section->vma
+		       - (input_section->output_section->vma
+			  + input_section->output_offset + rel->r_addend);
+	  rel->r_addend = 0;
+	  unresolved_reloc = FALSE;
+	  break;
+
+	case R_88K_PLT_DISP26:
+	  /* Relocation is to the entry for this symbol in the
+	     procedure linkage table.  */
+
+	  /* Resolve a PLTxx reloc against a local symbol directly,
+	     without using the procedure linkage table.  */
+	  if (h == NULL)
+	    break;
+
+	  if (h->plt.offset == (bfd_vma) -1
+	      || !elf_hash_table (info)->dynamic_sections_created)
+	    {
+	      /* We didn't make a PLT entry for this symbol.  This
+		 happens when statically linking PIC code, or when
+		 using -Bsymbolic.  */
+	      break;
+	    }
+
+	  if (splt == NULL)
+	    {
+	      splt = bfd_get_section_by_name (dynobj, ".plt");
+	      BFD_ASSERT (splt != NULL);
+	    }
+
+	  relocation = (splt->output_section->vma
+			+ splt->output_offset
+			+ h->plt.offset);
+	  unresolved_reloc = FALSE;
+	  break;
+
+	case R_88K_PLT_32:
+	  /* Relocation is the offset of the entry for this symbol in
+	     the procedure linkage table.  */
+	  BFD_ASSERT (h != NULL && h->plt.offset != (bfd_vma) -1);
+
+	  if (splt == NULL)
+	    {
+	      splt = bfd_get_section_by_name (dynobj, ".plt");
+	      BFD_ASSERT (splt != NULL);
+	    }
+
+	  relocation = h->plt.offset;
+	  unresolved_reloc = FALSE;
+
+	  /* This relocation does not use the addend.  */
+	  rel->r_addend = 0;
+
+	  break;
+
+	case R_88K_DISP16:
+	case R_88K_DISP26:
+	  if (h == NULL
+	      || (info->shared
+		  && (h->elf_link_hash_flags & ELF_LINK_FORCED_LOCAL) != 0))
+	    break;
+	  /* Fall through.  */
+	case R_88K_8:
+	case R_88K_16:
+	case R_88K_32:
+	case R_88K_16L:
+	case R_88K_16H:
+	  if (info->shared
+	      && r_symndx != 0
+	      && (input_section->flags & SEC_ALLOC) != 0
+	      && (h == NULL
+		  || ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
+		  || h->root.type != bfd_link_hash_undefweak)
+	      && ((r_type != R_88K_DISP16
+		   && r_type != R_88K_DISP26)
+		  || (h != NULL
+		      && h->dynindx != -1
+		      && (!info->symbolic
+			  || (h->elf_link_hash_flags
+			      & ELF_LINK_HASH_DEF_REGULAR) == 0))))
+	    {
+	      Elf_Internal_Rela outrel;
+	      bfd_byte *loc;
+	      bfd_boolean skip, relocate;
+
+	      /* When generating a shared object, these relocations
+		 are copied into the output file to be resolved at run
+		 time.  */
+
+	      skip = FALSE;
+	      relocate = FALSE;
+
+	      outrel.r_offset =
+		_bfd_elf_section_offset (output_bfd, info, input_section,
+					 rel->r_offset);
+	      if (outrel.r_offset == (bfd_vma) -1)
+		skip = TRUE;
+	      else if (outrel.r_offset == (bfd_vma) -2)
+		skip = TRUE, relocate = TRUE;
+	      outrel.r_offset += (input_section->output_section->vma
+				  + input_section->output_offset);
+
+	      if (skip)
+		memset (&outrel, 0, sizeof outrel);
+	      else if (h != NULL
+		       && h->dynindx != -1
+		       && (r_type == R_88K_DISP16
+			   || r_type == R_88K_DISP26
+			   || !info->shared
+			   || !info->symbolic
+			   || (h->elf_link_hash_flags
+			       & ELF_LINK_HASH_DEF_REGULAR) == 0))
+		{
+		  outrel.r_info = ELF32_R_INFO (h->dynindx, r_type);
+		  outrel.r_addend = rel->r_addend;
+		}
+	      else
+		{
+		  /* This symbol is local, or marked to become local.  */
+		  if (r_type == R_88K_32)
+		    {
+		      relocate = TRUE;
+		      outrel.r_info = ELF32_R_INFO (0, R_88K_BBASED_32);
+		      outrel.r_addend = relocation + rel->r_addend;
+		    }
+		  else
+		    {
+		      long indx;
+
+		      if (bfd_is_abs_section (sec))
+			indx = 0;
+		      else if (sec == NULL || sec->owner == NULL)
+			{
+			  bfd_set_error (bfd_error_bad_value);
+			  return FALSE;
+			}
+		      else
+			{
+			  asection *osec;
+
+			  osec = sec->output_section;
+			  indx = elf_section_data (osec)->dynindx;
+			  BFD_ASSERT (indx > 0);
+			}
+
+		      outrel.r_info = ELF32_R_INFO (indx, r_type);
+		      outrel.r_addend = relocation + rel->r_addend;
+		    }
+		}
+
+	      sreloc = elf_section_data (input_section)->sreloc;
+	      if (sreloc == NULL)
+		abort ();
+
+	      loc = sreloc->contents;
+	      loc += sreloc->reloc_count++ * sizeof (Elf32_External_Rela);
+	      bfd_elf32_swap_reloca_out (output_bfd, &outrel, loc);
+
+	      /* This reloc will be computed at runtime, so there's no
+                 need to do anything now, except for R_88K_32
+                 relocations that have been turned into
+                 R_88K_BBASED_32.  */
+	      if (!relocate)
+		continue;
+	    }
+
+	  break;
+
+	case R_88K_GNU_VTINHERIT:
+	case R_88K_GNU_VTENTRY:
+	  /* These are no-ops in the end.  */
+	  continue;
+
+	default:
+	  break;
+	}
+
+      /* Dynamic relocs are not propagated for SEC_DEBUGGING sections
+	 because such sections are not SEC_ALLOC and thus ld.so will
+	 not process them.  */
+      if (unresolved_reloc
+	  && !((input_section->flags & SEC_DEBUGGING) != 0
+	       && (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_DYNAMIC) != 0))
+	{
+	  (*_bfd_error_handler)
+	    (_("%s(%s+0x%lx): unresolvable relocation against symbol `%s'"),
+	     bfd_archive_filename (input_bfd),
+	     bfd_get_section_name (input_bfd, input_section),
+	     (long) rel->r_offset,
+	     h->root.root.string);
+	  return FALSE;
+	}
+
       r = _bfd_final_link_relocate (howto, input_bfd, input_section,
 				    contents, rel->r_offset,
 				    relocation, rel->r_addend);
@@ -500,31 +1769,356 @@ elf_m88k_relocate_section (output_bfd, info, input_bfd, input_section,
   return TRUE;
 }
 
-#define	ELF_ARCH			bfd_arch_m88k
-#define ELF_MACHINE_CODE		EM_88K
-#define ELF_MAXPAGESIZE			0x1000
+/* Finish up dynamic symbol handling.  We set the contents of various
+   dynamic sections here.  */
 
-#define TARGET_BIG_SYM			bfd_elf32_m88k_vec
-#define TARGET_BIG_NAME			"elf32-m88k"
+static bfd_boolean
+elf_m88k_finish_dynamic_symbol (output_bfd, info, h, sym)
+     bfd *output_bfd;
+     struct bfd_link_info *info;
+     struct elf_link_hash_entry *h;
+     Elf_Internal_Sym *sym;
+{
+  bfd *dynobj;
 
-#define elf_info_to_howto		elf_m88k_info_to_howto
+  dynobj = elf_hash_table (info)->dynobj;
 
-#define bfd_elf32_bfd_reloc_type_lookup elf_m88k_reloc_type_lookup
+  if (h->plt.offset != (bfd_vma) -1)
+    {
+      asection *splt;
+      asection *sgot;
+      asection *srela;
+      bfd_vma plt_index;
+      bfd_vma got_offset;
+      bfd_vma dyn_offset;
+      Elf_Internal_Rela rela;
+      unsigned int br;
+
+      /* This symbol has an entry in the procedure linkage table.  Set
+	 it up.  */
+
+      BFD_ASSERT (h->dynindx != -1);
+
+      splt = bfd_get_section_by_name (dynobj, ".plt");
+      sgot = bfd_get_section_by_name (dynobj, ".got.plt");
+      srela = bfd_get_section_by_name (dynobj, ".rela.plt");
+      BFD_ASSERT (splt != NULL && sgot != NULL && srela != NULL);
+
+      /* Get the index in the procedure linkage table which
+	 corresponds to this symbol.  This is the index of this symbol
+	 in all the symbols for which we are making plt entries.  The
+	 first entry in the procedure linkage table, spanning three
+	 regular entries, is reserved.  */
+      plt_index = (h->plt.offset - PLT_ENTRY0_SIZE) / PLT_ENTRY_SIZE;
+
+      /* Get the offset into the .got table of the entry that
+	 corresponds to this function.  Each .got entry is 4 bytes.
+	 The first three are reserved.  */
+      got_offset = (plt_index + 3) * 4;
+
+      /* Fill in the entry in the procedure linkage table.  */
+      memcpy (splt->contents + h->plt.offset, elf_m88k_plt_entry,
+	      PLT_ENTRY_SIZE);
+
+      dyn_offset = sgot->output_section->vma + sgot->output_offset + got_offset;
+      bfd_put_16 (output_bfd, dyn_offset >> 16,
+		  splt->contents + h->plt.offset + 2);
+      bfd_put_16 (output_bfd, dyn_offset & 0xffff,
+		  splt->contents + h->plt.offset + 6);
+
+      dyn_offset = plt_index * sizeof (Elf32_External_Rela);
+      bfd_put_16 (output_bfd, dyn_offset >> 16,
+		  splt->contents + h->plt.offset + 14);
+      bfd_put_16 (output_bfd, dyn_offset & 0xffff,
+		  splt->contents + h->plt.offset + 18);
+
+      br = bfd_get_32 (output_bfd, splt->contents + h->plt.offset + 20);
+      br &= ~0x03ffffff;
+      br |= 0x04000000 -  ((h->plt.offset + 20) >> 2);
+      bfd_put_32 (output_bfd, br,
+		  splt->contents + h->plt.offset + 20);
+
+      /* Fill in the entry in the global offset table.  */
+      bfd_put_32 (output_bfd,
+		  (splt->output_section->vma
+		   + splt->output_offset
+		   + h->plt.offset
+		   + 12),
+		  sgot->contents + got_offset);
+
+      /* Fill in the entry in the .rela.plt section.  */
+      rela.r_offset = (sgot->output_section->vma
+		       + sgot->output_offset
+		       + got_offset);
+      rela.r_info = ELF32_R_INFO (h->dynindx, R_88K_GOTP_ENT);
+      rela.r_addend = splt->output_section->vma + h->plt.offset;
+      bfd_elf32_swap_reloca_out (output_bfd, &rela,
+				 srela->contents
+				 + plt_index * sizeof (Elf32_External_Rela));
+
+      if ((h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0)
+	{
+	  /* Mark the symbol as undefined, rather than as defined in
+	     the .plt section.  Leave the value alone.  */
+	  sym->st_shndx = SHN_UNDEF;
+	}
+    }
+
+  if (h->got.offset != (bfd_vma) -1)
+    {
+      asection *sgot;
+      asection *srela;
+      Elf_Internal_Rela rela;
+      bfd_byte *loc;
+
+      /* This symbol has an entry in the global offset table.  Set it
+	 up.  */
+
+      sgot = bfd_get_section_by_name (dynobj, ".got");
+      srela = bfd_get_section_by_name (dynobj, ".rela.got");
+      BFD_ASSERT (sgot != NULL && srela != NULL);
+
+      rela.r_offset = (sgot->output_section->vma
+		       + sgot->output_offset
+		       + (h->got.offset &~ (bfd_vma) 1));
+
+      /* If this is a -Bsymbolic link, and the symbol is defined
+	 locally, we just want to emit a BBASED reloc.  Likewise if
+	 the symbol was forced to be local because of a version file.
+	 The entry in the global offset table will already have been
+	 initialized in the relocate_section function.  */
+      if (info->shared
+	  && (info->symbolic
+	      || h->dynindx == -1
+	      || (h->elf_link_hash_flags & ELF_LINK_FORCED_LOCAL) != 0)
+	  && (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR))
+	{
+	  rela.r_info = ELF32_R_INFO (0, R_88K_BBASED_32);
+	  rela.r_addend = bfd_get_signed_32 (output_bfd,
+					     (sgot->contents
+					      + (h->got.offset &~ (bfd_vma) 1)));
+	}
+      else
+	{
+	  bfd_put_32 (output_bfd, (bfd_vma) 0,
+		      sgot->contents + (h->got.offset &~ (bfd_vma) 1));
+	  rela.r_info = ELF32_R_INFO (h->dynindx, R_88K_32);
+	  rela.r_addend = 0;
+	}
+
+      loc = srela->contents;
+      loc += srela->reloc_count++ * sizeof (Elf32_External_Rela);
+      bfd_elf32_swap_reloca_out (output_bfd, &rela, loc);
+    }
+
+  if ((h->elf_link_hash_flags & ELF_LINK_HASH_NEEDS_COPY) != 0)
+    {
+      asection *s;
+      Elf_Internal_Rela rela;
+      bfd_byte *loc;
+
+      /* This symbol needs a copy reloc.  Set it up.  */
+
+      BFD_ASSERT (h->dynindx != -1
+		  && (h->root.type == bfd_link_hash_defined
+		      || h->root.type == bfd_link_hash_defweak));
+
+      s = bfd_get_section_by_name (h->root.u.def.section->owner,
+				   ".rela.bss");
+      BFD_ASSERT (s != NULL);
+
+      rela.r_offset = (h->root.u.def.value
+		       + h->root.u.def.section->output_section->vma
+		       + h->root.u.def.section->output_offset);
+      rela.r_info = ELF32_R_INFO (h->dynindx, R_88K_COPY);
+      rela.r_addend = 0;
+      loc = s->contents + s->reloc_count++ * sizeof (Elf32_External_Rela);
+      bfd_elf32_swap_reloca_out (output_bfd, &rela, loc);
+    }
+
+  /* Mark _DYNAMIC and _GLOBAL_OFFSET_TABLE_ as absolute.  */
+  if (strcmp (h->root.root.string, "_DYNAMIC") == 0
+      || strcmp (h->root.root.string, "_GLOBAL_OFFSET_TABLE_") == 0)
+    sym->st_shndx = SHN_ABS;
+
+  return TRUE;
+}
+
+/* Finish up the dynamic sections.  */
+
+static bfd_boolean
+elf_m88k_finish_dynamic_sections (output_bfd, info)
+     bfd *output_bfd;
+     struct bfd_link_info *info;
+{
+  bfd *dynobj;
+  asection *sgot;
+  asection *sdyn;
+
+  dynobj = elf_hash_table (info)->dynobj;
+
+  sgot = bfd_get_section_by_name (dynobj, ".got.plt");
+  BFD_ASSERT (sgot != NULL);
+  sdyn = bfd_get_section_by_name (dynobj, ".dynamic");
+
+  if (elf_hash_table (info)->dynamic_sections_created)
+    {
+      asection *splt;
+      Elf32_External_Dyn *dyncon, *dynconend;
+
+      splt = bfd_get_section_by_name (dynobj, ".plt");
+      BFD_ASSERT (splt != NULL && sdyn != NULL);
+
+      dyncon = (Elf32_External_Dyn *) sdyn->contents;
+      dynconend = (Elf32_External_Dyn *) (sdyn->contents + sdyn->_raw_size);
+      for (; dyncon < dynconend; dyncon++)
+	{
+	  Elf_Internal_Dyn dyn;
+	  const char *name;
+	  asection *s;
+
+	  bfd_elf32_swap_dyn_in (dynobj, dyncon, &dyn);
+
+	  switch (dyn.d_tag)
+	    {
+	    default:
+	      break;
+
+	    case DT_PLTGOT:
+	      name = ".got";
+	      goto get_vma;
+	    case DT_JMPREL:
+	      name = ".rela.plt";
+	    get_vma:
+	      s = bfd_get_section_by_name (output_bfd, name);
+	      BFD_ASSERT (s != NULL);
+	      dyn.d_un.d_ptr = s->vma;
+	      bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
+	      break;
+
+	    case DT_PLTRELSZ:
+	      s = bfd_get_section_by_name (output_bfd, ".rela.plt");
+	      BFD_ASSERT (s != NULL);
+	      if (s->_cooked_size != 0)
+		dyn.d_un.d_val = s->_cooked_size;
+	      else
+		dyn.d_un.d_val = s->_raw_size;
+	      bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
+	      break;
+
+	    case DT_RELASZ:
+	      /* The procedure linkage table relocs (DT_JMPREL) should
+		 not be included in the overall relocs (DT_RELA).
+		 Therefore, we override the DT_RELASZ entry here to
+		 make it not include the JMPREL relocs.  Since the
+		 linker script arranges for .rela.plt to follow all
+		 other relocation sections, we don't have to worry
+		 about changing the DT_RELA entry.  */
+	      s = bfd_get_section_by_name (output_bfd, ".rela.plt");
+	      if (s != NULL)
+		{
+		  if (s->_cooked_size != 0)
+		    dyn.d_un.d_val -= s->_cooked_size;
+		  else
+		    dyn.d_un.d_val -= s->_raw_size;
+		}
+	      bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
+	      break;
+	    }
+	}
+
+      /* Fill in the first entry in the procedure linkage table.  */
+      if (splt->_raw_size > 0)
+	{
+	      memcpy (splt->contents, elf_m88k_plt0_entry, PLT_ENTRY0_SIZE);
+	      bfd_put_16 (output_bfd,
+		          (sgot->output_section->vma
+		           + sgot->output_offset
+		           - (splt->output_section->vma + 16)) >> 16,
+		          splt->contents + 18);
+	      bfd_put_16 (output_bfd,
+		          (sgot->output_section->vma
+		           + sgot->output_offset
+		           - (splt->output_section->vma + 16)) & 0xffff,
+		          splt->contents + 22);
+              elf_section_data (splt->output_section)->this_hdr.sh_entsize
+               = PLT_ENTRY0_SIZE;
+	}
+    }
+
+  /* Fill in the first three entries in the global offset table.  */
+  if (sgot->_raw_size > 0)
+    {
+      if (sdyn == NULL)
+	bfd_put_32 (output_bfd, (bfd_vma) 0, sgot->contents);
+      else
+	bfd_put_32 (output_bfd,
+		    sdyn->output_section->vma + sdyn->output_offset,
+		    sgot->contents);
+      bfd_put_32 (output_bfd, (bfd_vma) 0, sgot->contents + 4);
+      bfd_put_32 (output_bfd, (bfd_vma) 0, sgot->contents + 8);
+    }
+
+  elf_section_data (sgot->output_section)->this_hdr.sh_entsize = 4;
+
+  return TRUE;
+}
+
+static enum elf_reloc_type_class
+elf32_m88k_reloc_type_class (rela)
+     const Elf_Internal_Rela *rela;
+{
+  switch ((int) ELF32_R_TYPE (rela->r_info))
+    {
+    case R_88K_BBASED_32:
+    case R_88K_BBASED_16H:
+    case R_88K_BBASED_16L:
+      return reloc_class_relative;
+    case R_88K_GOTP_ENT:
+      return reloc_class_plt;
+    case R_88K_COPY:
+      return reloc_class_copy;
+    default:
+      return reloc_class_normal;
+    }
+}
+
+#define TARGET_BIG_SYM			bfd_elf32_m88k_vec
+#define TARGET_BIG_NAME			"elf32-m88k"
+#define ELF_MACHINE_CODE		EM_88K
+#define ELF_MAXPAGESIZE			0x1000
+#define elf_backend_create_dynamic_sections \
+					_bfd_elf_create_dynamic_sections
+#define bfd_elf32_bfd_link_hash_table_create \
+					elf_m88k_link_hash_table_create
 #define bfd_elf32_bfd_final_link	bfd_elf_gc_common_final_link
 
 #define elf_backend_check_relocs	elf_m88k_check_relocs
+#define elf_backend_adjust_dynamic_symbol \
+					elf_m88k_adjust_dynamic_symbol
+#define elf_backend_size_dynamic_sections \
+					elf_m88k_size_dynamic_sections
 #define elf_backend_relocate_section	elf_m88k_relocate_section
+#define elf_backend_finish_dynamic_symbol \
+					elf_m88k_finish_dynamic_symbol
+#define elf_backend_finish_dynamic_sections \
+					elf_m88k_finish_dynamic_sections
 #define elf_backend_gc_mark_hook	elf_m88k_gc_mark_hook
 #define elf_backend_gc_sweep_hook	elf_m88k_gc_sweep_hook
-
 #define bfd_elf32_bfd_merge_private_bfd_data \
                                         elf32_m88k_merge_private_bfd_data
 #define bfd_elf32_bfd_set_private_flags \
                                         elf32_m88k_set_private_flags
 #define bfd_elf32_bfd_print_private_bfd_data \
                                         elf32_m88k_print_private_bfd_data
+#define elf_backend_reloc_type_class	elf32_m88k_reloc_type_class
 
 #define elf_backend_can_gc_sections	1
+#define elf_backend_can_refcount	1
+#define elf_backend_want_got_plt	1
+#define elf_backend_plt_readonly	1
+#define elf_backend_want_plt_sym	0
+#define elf_backend_got_header_size	12
 #define elf_backend_rela_normal		1
 
 #include "elf32-target.h"