gdb: add target_ops::supports_displaced_step
[deliverable/binutils-gdb.git] / bfd / elf32-lm32.c
index 727fc7a35692d46d185efd75c1d1cecf87eb1357..3c31dd44c853d91a3cb058c4a7d118f40d9dd8e4 100644 (file)
@@ -1,5 +1,5 @@
 /* Lattice Mico32-specific support for 32-bit ELF
-   Copyright 2008, 2009, 2010  Free Software Foundation, Inc.
+   Copyright (C) 2008-2020 Free Software Foundation, Inc.
    Contributed by Jon Beniston <jon@beniston.com>
 
    This file is part of BFD, the Binary File Descriptor library.
@@ -19,8 +19,8 @@
    Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
    MA 02110-1301, USA.  */
 
-#include "bfd.h"
 #include "sysdep.h"
+#include "bfd.h"
 #include "libbfd.h"
 #include "elf-bfd.h"
 #include "elf/lm32.h"
 
 #define ELF_DYNAMIC_INTERPRETER "/usr/lib/libc.so.1"
 
-extern const bfd_target bfd_elf32_lm32fdpic_vec;
+extern const bfd_target lm32_elf32_fdpic_vec;
 
-#define IS_FDPIC(bfd) ((bfd)->xvec == &bfd_elf32_lm32fdpic_vec)
+#define IS_FDPIC(bfd) ((bfd)->xvec == &lm32_elf32_fdpic_vec)
 
 static bfd_reloc_status_type lm32_elf_gprel_reloc
   (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **);
 
-/* The linker needs to keep track of the number of relocs that it
-   decides to copy as dynamic relocs in check_relocs for each symbol.
-   This is so that it can later discard them if they are found to be
-   unnecessary.  We store the information in a field extending the
-   regular ELF linker hash table.  */
-
-struct elf_lm32_dyn_relocs
-{
-  struct elf_lm32_dyn_relocs *next;
-
-  /* The input section of the reloc.  */
-  asection *sec;
-
-  /* Total number of relocs copied for the input section.  */
-  bfd_size_type count;
-
-  /* Number of pc-relative relocs copied for the input section.  */
-  bfd_size_type pc_count;
-};
-
-/* lm32 ELF linker hash entry.  */
-
-struct elf_lm32_link_hash_entry
-{
-  struct elf_link_hash_entry root;
-
-  /* Track dynamic relocs copied for this symbol.  */
-  struct elf_lm32_dyn_relocs *dyn_relocs;
-};
-
 /* lm32 ELF linker hash table.  */
 
 struct elf_lm32_link_hash_table
@@ -87,12 +57,7 @@ struct elf_lm32_link_hash_table
   struct elf_link_hash_table root;
 
   /* Short-cuts to get to dynamic linker sections.  */
-  asection *sgot;
-  asection *sgotplt;
-  asection *srelgot;
   asection *sfixup32;
-  asection *splt;
-  asection *srelplt;
   asection *sdynbss;
   asection *srelbss;
 
@@ -106,9 +71,9 @@ struct elf_lm32_link_hash_table
   == LM32_ELF_DATA ? ((struct elf_lm32_link_hash_table *) ((p)->hash)) : NULL)
 
 #define lm32fdpic_got_section(info) \
-  (lm32_elf_hash_table (info)->sgot)
+  (lm32_elf_hash_table (info)->root.sgot)
 #define lm32fdpic_gotrel_section(info) \
-  (lm32_elf_hash_table (info)->srelgot)
+  (lm32_elf_hash_table (info)->root.srelgot)
 #define lm32fdpic_fixup32_section(info) \
   (lm32_elf_hash_table (info)->sfixup32)
 
@@ -118,70 +83,27 @@ struct weak_symbol_list
   struct weak_symbol_list *next;
 };
 
-/* Create an entry in an lm32 ELF linker hash table.  */
-
-static struct bfd_hash_entry *
-lm32_elf_link_hash_newfunc (struct bfd_hash_entry *entry,
-                           struct bfd_hash_table *table,
-                           const char *string)
-{
-  struct elf_lm32_link_hash_entry *ret =
-    (struct elf_lm32_link_hash_entry *) 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_lm32_link_hash_entry));
-  if (ret == NULL)
-    return NULL;
-
-  /* Call the allocation method of the superclass.  */
-  ret = ((struct elf_lm32_link_hash_entry *)
-         _bfd_elf_link_hash_newfunc ((struct bfd_hash_entry *) ret,
-                                     table, string));
-  if (ret != NULL)
-    {
-      struct elf_lm32_link_hash_entry *eh;
-
-      eh = (struct elf_lm32_link_hash_entry *) ret;
-      eh->dyn_relocs = NULL;
-    }
-
-  return (struct bfd_hash_entry *) ret;
-}
-
 /* Create an lm32 ELF linker hash table.  */
 
 static struct bfd_link_hash_table *
 lm32_elf_link_hash_table_create (bfd *abfd)
 {
   struct elf_lm32_link_hash_table *ret;
-  bfd_size_type amt = sizeof (struct elf_lm32_link_hash_table);
+  size_t amt = sizeof (struct elf_lm32_link_hash_table);
 
-  ret = bfd_malloc (amt);
+  ret = bfd_zmalloc (amt);
   if (ret == NULL)
     return NULL;
 
   if (!_bfd_elf_link_hash_table_init (&ret->root, abfd,
-                                     lm32_elf_link_hash_newfunc,
-                                     sizeof (struct elf_lm32_link_hash_entry),
+                                     _bfd_elf_link_hash_newfunc,
+                                     sizeof (struct elf_link_hash_entry),
                                      LM32_ELF_DATA))
     {
       free (ret);
       return NULL;
     }
 
-  ret->sgot = NULL;
-  ret->sgotplt = NULL;
-  ret->srelgot = NULL;
-  ret->sfixup32 = NULL;
-  ret->splt = NULL;
-  ret->srelplt = NULL;
-  ret->sdynbss = NULL;
-  ret->srelbss = NULL;
-  ret->relocs32 = 0;
-
   return &ret->root.root;
 }
 
@@ -207,36 +129,6 @@ _lm32fdpic_add_rofixup (bfd *output_bfd, asection *rofixup, bfd_vma relocation)
   return fixup_offset;
 }
 
-/* Create .got, .gotplt, and .rela.got sections in DYNOBJ, and set up
-   shortcuts to them in our hash table.  */
-
-static bfd_boolean
-create_got_section (bfd *dynobj, struct bfd_link_info *info)
-{
-  struct elf_lm32_link_hash_table *htab;
-  asection *s;
-
-  /* This function may be called more than once.  */
-  s = bfd_get_section_by_name (dynobj, ".got");
-  if (s != NULL && (s->flags & SEC_LINKER_CREATED) != 0)
-    return TRUE;
-
-  htab = lm32_elf_hash_table (info);
-  if (htab == NULL)
-    return FALSE;
-
-  if (! _bfd_elf_create_got_section (dynobj, info))
-    return FALSE;
-
-  htab->sgot = bfd_get_section_by_name (dynobj, ".got");
-  htab->sgotplt = bfd_get_section_by_name (dynobj, ".got.plt");
-  htab->srelgot = bfd_get_section_by_name (dynobj, ".rela.got");
-  if (! htab->sgot || ! htab->sgotplt || ! htab->srelgot)
-    abort ();
-
-  return TRUE;
-}
-
 /* Create .rofixup sections in DYNOBJ, and set up
    shortcuts to them in our hash table.  */
 
@@ -250,16 +142,17 @@ create_rofixup_section (bfd *dynobj, struct bfd_link_info *info)
     return FALSE;
 
   /* Fixup section for R_LM32_32 relocs.  */
-  lm32fdpic_fixup32_section (info) = bfd_make_section_with_flags (dynobj,
-                                                                   ".rofixup",
-                                                                  (SEC_ALLOC
-                                                                   | SEC_LOAD
-                                                                   | SEC_HAS_CONTENTS
-                                                                   | SEC_IN_MEMORY
-                                                                  | SEC_LINKER_CREATED
-                                                                   | SEC_READONLY));
+  lm32fdpic_fixup32_section (info)
+    = bfd_make_section_anyway_with_flags (dynobj,
+                                         ".rofixup",
+                                         (SEC_ALLOC
+                                          | SEC_LOAD
+                                          | SEC_HAS_CONTENTS
+                                          | SEC_IN_MEMORY
+                                          | SEC_LINKER_CREATED
+                                          | SEC_READONLY));
   if (lm32fdpic_fixup32_section (info) == NULL
-      || ! bfd_set_section_alignment (dynobj, lm32fdpic_fixup32_section (info), 2))
+      || !bfd_set_section_alignment (lm32fdpic_fixup32_section (info), 2))
     return FALSE;
 
   return TRUE;
@@ -268,206 +161,206 @@ create_rofixup_section (bfd *dynobj, struct bfd_link_info *info)
 static reloc_howto_type lm32_elf_howto_table [] =
 {
   /* This reloc does nothing.  */
-  HOWTO (R_LM32_NONE,               /* type */
-         0,                         /* rightshift */
-         2,                         /* size (0 = byte, 1 = short, 2 = long) */
-         32,                        /* bitsize */
-         FALSE,                     /* pc_relative */
-         0,                         /* bitpos */
-         complain_overflow_bitfield,/* complain_on_overflow */
-         bfd_elf_generic_reloc,     /* special_function */
-         "R_LM32_NONE",             /* name */
-         FALSE,                     /* partial_inplace */
-         0,                         /* src_mask */
-         0,                         /* dst_mask */
-         FALSE),                    /* pcrel_offset */
+  HOWTO (R_LM32_NONE,              /* type */
+        0,                         /* rightshift */
+        3,                         /* size (0 = byte, 1 = short, 2 = long) */
+        0,                         /* bitsize */
+        FALSE,                     /* pc_relative */
+        0,                         /* bitpos */
+        complain_overflow_dont,    /* complain_on_overflow */
+        bfd_elf_generic_reloc,     /* special_function */
+        "R_LM32_NONE",             /* name */
+        FALSE,                     /* partial_inplace */
+        0,                         /* src_mask */
+        0,                         /* dst_mask */
+        FALSE),                    /* pcrel_offset */
 
   /* An 8 bit absolute relocation.  */
-  HOWTO (R_LM32_8,                  /* type */
-         0,                         /* rightshift */
-         0,                         /* size (0 = byte, 1 = short, 2 = long) */
-         8,                         /* bitsize */
-         FALSE,                     /* pc_relative */
-         0,                         /* bitpos */
-         complain_overflow_bitfield,/* complain_on_overflow */
-         bfd_elf_generic_reloc,     /* special_function */
-         "R_LM32_8",                /* name */
-         FALSE,                     /* partial_inplace */
-         0,                         /* src_mask */
-         0xff,                      /* dst_mask */
-         FALSE),                    /* pcrel_offset */
+  HOWTO (R_LM32_8,                 /* type */
+        0,                         /* rightshift */
+        0,                         /* size (0 = byte, 1 = short, 2 = long) */
+        8,                         /* bitsize */
+        FALSE,                     /* pc_relative */
+        0,                         /* bitpos */
+        complain_overflow_bitfield,/* complain_on_overflow */
+        bfd_elf_generic_reloc,     /* special_function */
+        "R_LM32_8",                /* name */
+        FALSE,                     /* partial_inplace */
+        0,                         /* src_mask */
+        0xff,                      /* dst_mask */
+        FALSE),                    /* pcrel_offset */
 
   /* A 16 bit absolute relocation.  */
-  HOWTO (R_LM32_16,                 /* type */
-         0,                         /* rightshift */
-         1,                         /* size (0 = byte, 1 = short, 2 = long) */
-         16,                        /* bitsize */
-         FALSE,                     /* pc_relative */
-         0,                         /* bitpos */
-         complain_overflow_bitfield,/* complain_on_overflow */
-         bfd_elf_generic_reloc,     /* special_function */
-         "R_LM32_16",               /* name */
-         FALSE,                     /* partial_inplace */
-         0,                         /* src_mask */
-         0xffff,                    /* dst_mask */
-         FALSE),                    /* pcrel_offset */
+  HOWTO (R_LM32_16,                /* type */
+        0,                         /* rightshift */
+        1,                         /* size (0 = byte, 1 = short, 2 = long) */
+        16,                        /* bitsize */
+        FALSE,                     /* pc_relative */
+        0,                         /* bitpos */
+        complain_overflow_bitfield,/* complain_on_overflow */
+        bfd_elf_generic_reloc,     /* special_function */
+        "R_LM32_16",               /* name */
+        FALSE,                     /* partial_inplace */
+        0,                         /* src_mask */
+        0xffff,                    /* dst_mask */
+        FALSE),                    /* pcrel_offset */
 
   /* A 32 bit absolute relocation.  */
-  HOWTO (R_LM32_32,                 /* type */
-         0,                         /* rightshift */
-         2,                         /* size (0 = byte, 1 = short, 2 = long) */
-         32,                        /* bitsize */
-         FALSE,                     /* pc_relative */
-         0,                         /* bitpos */
-         complain_overflow_bitfield,/* complain_on_overflow */
-         bfd_elf_generic_reloc,     /* special_function */
-         "R_LM32_32",               /* name */
-         FALSE,                     /* partial_inplace */
-         0,                         /* src_mask */
-         0xffffffff,                /* dst_mask */
-         FALSE),                    /* pcrel_offset */
-
-  HOWTO (R_LM32_HI16,               /* type */
-         16,                        /* rightshift */
-         2,                         /* size (0 = byte, 1 = short, 2 = long) */
-         16,                        /* bitsize */
-         FALSE,                     /* pc_relative */
-         0,                         /* bitpos */
-         complain_overflow_bitfield,/* complain_on_overflow */
-         bfd_elf_generic_reloc,     /* special_function */
-         "R_LM32_HI16",             /* name */
-         FALSE,                     /* partial_inplace */
-         0,                         /* src_mask */
-         0xffff,                    /* dst_mask */
-         FALSE),                    /* pcrel_offset */
-
-  HOWTO (R_LM32_LO16,               /* type */
-         0,                         /* rightshift */
-         2,                         /* size (0 = byte, 1 = short, 2 = long) */
-         16,                        /* bitsize */
-         FALSE,                     /* pc_relative */
-         0,                         /* bitpos */
-         complain_overflow_dont,    /* complain_on_overflow */
-         bfd_elf_generic_reloc,     /* special_function */
-         "R_LM32_LO16",             /* name */
-         FALSE,                     /* partial_inplace */
-         0,                         /* src_mask */
-         0xffff,                    /* dst_mask */
-         FALSE),                    /* pcrel_offset */
-
-  HOWTO (R_LM32_GPREL16,            /* type */
-         0,                         /* rightshift */
-         2,                         /* size (0 = byte, 1 = short, 2 = long) */
-         16,                        /* bitsize */
-         FALSE,                     /* pc_relative */
-         0,                         /* bitpos */
-         complain_overflow_dont,    /* complain_on_overflow */
-         lm32_elf_gprel_reloc,      /* special_function */
-         "R_LM32_GPREL16",          /* name */
-         FALSE,                     /* partial_inplace */
-         0,                         /* src_mask */
-         0xffff,                    /* dst_mask */
-         FALSE),                    /* pcrel_offset */
-
-  HOWTO (R_LM32_CALL,               /* type */
-         2,                         /* rightshift */
-         2,                         /* size (0 = byte, 1 = short, 2 = long) */
-         26,                        /* bitsize */
-         TRUE,                      /* pc_relative */
-         0,                         /* bitpos */
-         complain_overflow_signed,  /* complain_on_overflow */
-         bfd_elf_generic_reloc,     /* special_function */
-         "R_LM32_CALL",             /* name */
-         FALSE,                     /* partial_inplace */
-         0,                         /* src_mask */
-         0x3ffffff,                 /* dst_mask */
-         TRUE),                     /* pcrel_offset */
-
-  HOWTO (R_LM32_BRANCH,             /* type */
-         2,                         /* rightshift */
-         2,                         /* size (0 = byte, 1 = short, 2 = long) */
-         16,                        /* bitsize */
-         TRUE,                      /* pc_relative */
-         0,                         /* bitpos */
-         complain_overflow_signed,  /* complain_on_overflow */
-         bfd_elf_generic_reloc,     /* special_function */
-         "R_LM32_BRANCH",           /* name */
-         FALSE,                     /* partial_inplace */
-         0,                         /* src_mask */
-         0xffff,                    /* dst_mask */
-         TRUE),                     /* pcrel_offset */
+  HOWTO (R_LM32_32,                /* type */
+        0,                         /* rightshift */
+        2,                         /* size (0 = byte, 1 = short, 2 = long) */
+        32,                        /* bitsize */
+        FALSE,                     /* pc_relative */
+        0,                         /* bitpos */
+        complain_overflow_bitfield,/* complain_on_overflow */
+        bfd_elf_generic_reloc,     /* special_function */
+        "R_LM32_32",               /* name */
+        FALSE,                     /* partial_inplace */
+        0,                         /* src_mask */
+        0xffffffff,                /* dst_mask */
+        FALSE),                    /* pcrel_offset */
+
+  HOWTO (R_LM32_HI16,              /* type */
+        16,                        /* rightshift */
+        2,                         /* size (0 = byte, 1 = short, 2 = long) */
+        16,                        /* bitsize */
+        FALSE,                     /* pc_relative */
+        0,                         /* bitpos */
+        complain_overflow_bitfield,/* complain_on_overflow */
+        bfd_elf_generic_reloc,     /* special_function */
+        "R_LM32_HI16",             /* name */
+        FALSE,                     /* partial_inplace */
+        0,                         /* src_mask */
+        0xffff,                    /* dst_mask */
+        FALSE),                    /* pcrel_offset */
+
+  HOWTO (R_LM32_LO16,              /* type */
+        0,                         /* rightshift */
+        2,                         /* size (0 = byte, 1 = short, 2 = long) */
+        16,                        /* bitsize */
+        FALSE,                     /* pc_relative */
+        0,                         /* bitpos */
+        complain_overflow_dont,    /* complain_on_overflow */
+        bfd_elf_generic_reloc,     /* special_function */
+        "R_LM32_LO16",             /* name */
+        FALSE,                     /* partial_inplace */
+        0,                         /* src_mask */
+        0xffff,                    /* dst_mask */
+        FALSE),                    /* pcrel_offset */
+
+  HOWTO (R_LM32_GPREL16,           /* type */
+        0,                         /* rightshift */
+        2,                         /* size (0 = byte, 1 = short, 2 = long) */
+        16,                        /* bitsize */
+        FALSE,                     /* pc_relative */
+        0,                         /* bitpos */
+        complain_overflow_dont,    /* complain_on_overflow */
+        lm32_elf_gprel_reloc,      /* special_function */
+        "R_LM32_GPREL16",          /* name */
+        FALSE,                     /* partial_inplace */
+        0,                         /* src_mask */
+        0xffff,                    /* dst_mask */
+        FALSE),                    /* pcrel_offset */
+
+  HOWTO (R_LM32_CALL,              /* type */
+        2,                         /* rightshift */
+        2,                         /* size (0 = byte, 1 = short, 2 = long) */
+        26,                        /* bitsize */
+        TRUE,                      /* pc_relative */
+        0,                         /* bitpos */
+        complain_overflow_signed,  /* complain_on_overflow */
+        bfd_elf_generic_reloc,     /* special_function */
+        "R_LM32_CALL",             /* name */
+        FALSE,                     /* partial_inplace */
+        0,                         /* src_mask */
+        0x3ffffff,                 /* dst_mask */
+        TRUE),                     /* pcrel_offset */
+
+  HOWTO (R_LM32_BRANCH,                    /* type */
+        2,                         /* rightshift */
+        2,                         /* size (0 = byte, 1 = short, 2 = long) */
+        16,                        /* bitsize */
+        TRUE,                      /* pc_relative */
+        0,                         /* bitpos */
+        complain_overflow_signed,  /* complain_on_overflow */
+        bfd_elf_generic_reloc,     /* special_function */
+        "R_LM32_BRANCH",           /* name */
+        FALSE,                     /* partial_inplace */
+        0,                         /* src_mask */
+        0xffff,                    /* dst_mask */
+        TRUE),                     /* pcrel_offset */
 
   /* GNU extension to record C++ vtable hierarchy.  */
-  HOWTO (R_LM32_GNU_VTINHERIT,      /* type */
-         0,                         /* rightshift */
-         2,                         /* size (0 = byte, 1 = short, 2 = long) */
-         0,                         /* bitsize */
-         FALSE,                     /* pc_relative */
-         0,                         /* bitpos */
-         complain_overflow_dont,    /* complain_on_overflow */
-         NULL,                      /* special_function */
-         "R_LM32_GNU_VTINHERIT",    /* name */
-         FALSE,                     /* partial_inplace */
-         0,                         /* src_mask */
-         0,                         /* dst_mask */
-         FALSE),                    /* pcrel_offset */
+  HOWTO (R_LM32_GNU_VTINHERIT,     /* type */
+        0,                         /* rightshift */
+        2,                         /* size (0 = byte, 1 = short, 2 = long) */
+        0,                         /* bitsize */
+        FALSE,                     /* pc_relative */
+        0,                         /* bitpos */
+        complain_overflow_dont,    /* complain_on_overflow */
+        NULL,                      /* special_function */
+        "R_LM32_GNU_VTINHERIT",    /* name */
+        FALSE,                     /* partial_inplace */
+        0,                         /* src_mask */
+        0,                         /* dst_mask */
+        FALSE),                    /* pcrel_offset */
 
   /* GNU extension to record C++ vtable member usage.  */
-  HOWTO (R_LM32_GNU_VTENTRY,        /* type */
-         0,                         /* rightshift */
-         2,                         /* size (0 = byte, 1 = short, 2 = long) */
-         0,                         /* bitsize */
-         FALSE,                     /* pc_relative */
-         0,                         /* bitpos */
-         complain_overflow_dont,    /* complain_on_overflow */
-         _bfd_elf_rel_vtable_reloc_fn,/* special_function */
-         "R_LM32_GNU_VTENTRY",      /* name */
-         FALSE,                     /* partial_inplace */
-         0,                         /* src_mask */
-         0,                         /* dst_mask */
-         FALSE),                    /* pcrel_offset */
-
-  HOWTO (R_LM32_16_GOT,             /* type */
-         0,                         /* rightshift */
-         2,                         /* size (0 = byte, 1 = short, 2 = long) */
-         16,                        /* bitsize */
-         FALSE,                     /* pc_relative */
-         0,                         /* bitpos */
-         complain_overflow_signed,  /* complain_on_overflow */
-         bfd_elf_generic_reloc,     /* special_function */
-         "R_LM32_16_GOT",           /* name */
-         FALSE,                     /* partial_inplace */
-         0,                         /* src_mask */
-         0xffff,                    /* dst_mask */
-         FALSE),                    /* pcrel_offset */
-
-  HOWTO (R_LM32_GOTOFF_HI16,        /* type */
-         16,                        /* rightshift */
-         2,                         /* size (0 = byte, 1 = short, 2 = long) */
-         16,                        /* bitsize */
-         FALSE,                     /* pc_relative */
-         0,                         /* bitpos */
-         complain_overflow_dont,    /* complain_on_overflow */
-         bfd_elf_generic_reloc,     /* special_function */
-         "R_LM32_GOTOFF_HI16",      /* name */
-         FALSE,                     /* partial_inplace */
-         0xffff,                    /* src_mask */
-         0xffff,                    /* dst_mask */
-         FALSE),                    /* pcrel_offset */
-
-  HOWTO (R_LM32_GOTOFF_LO16,        /* type */
-         0,                         /* rightshift */
-         2,                         /* size (0 = byte, 1 = short, 2 = long) */
-         16,                        /* bitsize */
-         FALSE,                     /* pc_relative */
-         0,                         /* bitpos */
-         complain_overflow_dont,    /* complain_on_overflow */
-         bfd_elf_generic_reloc,     /* special_function */
-         "R_LM32_GOTOFF_LO16",      /* name */
-         FALSE,                     /* partial_inplace */
-         0xffff,                    /* src_mask */
-         0xffff,                    /* dst_mask */
-         FALSE),                    /* pcrel_offset */
+  HOWTO (R_LM32_GNU_VTENTRY,       /* type */
+        0,                         /* rightshift */
+        2,                         /* size (0 = byte, 1 = short, 2 = long) */
+        0,                         /* bitsize */
+        FALSE,                     /* pc_relative */
+        0,                         /* bitpos */
+        complain_overflow_dont,    /* complain_on_overflow */
+        _bfd_elf_rel_vtable_reloc_fn,/* special_function */
+        "R_LM32_GNU_VTENTRY",      /* name */
+        FALSE,                     /* partial_inplace */
+        0,                         /* src_mask */
+        0,                         /* dst_mask */
+        FALSE),                    /* pcrel_offset */
+
+  HOWTO (R_LM32_16_GOT,                    /* type */
+        0,                         /* rightshift */
+        2,                         /* size (0 = byte, 1 = short, 2 = long) */
+        16,                        /* bitsize */
+        FALSE,                     /* pc_relative */
+        0,                         /* bitpos */
+        complain_overflow_signed,  /* complain_on_overflow */
+        bfd_elf_generic_reloc,     /* special_function */
+        "R_LM32_16_GOT",           /* name */
+        FALSE,                     /* partial_inplace */
+        0,                         /* src_mask */
+        0xffff,                    /* dst_mask */
+        FALSE),                    /* pcrel_offset */
+
+  HOWTO (R_LM32_GOTOFF_HI16,       /* type */
+        16,                        /* rightshift */
+        2,                         /* size (0 = byte, 1 = short, 2 = long) */
+        16,                        /* bitsize */
+        FALSE,                     /* pc_relative */
+        0,                         /* bitpos */
+        complain_overflow_dont,    /* complain_on_overflow */
+        bfd_elf_generic_reloc,     /* special_function */
+        "R_LM32_GOTOFF_HI16",      /* name */
+        FALSE,                     /* partial_inplace */
+        0xffff,                    /* src_mask */
+        0xffff,                    /* dst_mask */
+        FALSE),                    /* pcrel_offset */
+
+  HOWTO (R_LM32_GOTOFF_LO16,       /* type */
+        0,                         /* rightshift */
+        2,                         /* size (0 = byte, 1 = short, 2 = long) */
+        16,                        /* bitsize */
+        FALSE,                     /* pc_relative */
+        0,                         /* bitpos */
+        complain_overflow_dont,    /* complain_on_overflow */
+        bfd_elf_generic_reloc,     /* special_function */
+        "R_LM32_GOTOFF_LO16",      /* name */
+        FALSE,                     /* partial_inplace */
+        0xffff,                    /* src_mask */
+        0xffff,                    /* dst_mask */
+        FALSE),                    /* pcrel_offset */
 
   HOWTO (R_LM32_COPY,          /* type */
         0,                     /* rightshift */
@@ -537,29 +430,29 @@ struct lm32_reloc_map
 
 static const struct lm32_reloc_map lm32_reloc_map[] =
 {
-  { BFD_RELOC_NONE,             R_LM32_NONE },
-  { BFD_RELOC_8,                R_LM32_8 },
-  { BFD_RELOC_16,               R_LM32_16 },
-  { BFD_RELOC_32,               R_LM32_32 },
-  { BFD_RELOC_HI16,             R_LM32_HI16 },
-  { BFD_RELOC_LO16,             R_LM32_LO16 },
-  { BFD_RELOC_GPREL16,          R_LM32_GPREL16 },
-  { BFD_RELOC_LM32_CALL,        R_LM32_CALL },
-  { BFD_RELOC_LM32_BRANCH,      R_LM32_BRANCH },
-  { BFD_RELOC_VTABLE_INHERIT,   R_LM32_GNU_VTINHERIT },
-  { BFD_RELOC_VTABLE_ENTRY,     R_LM32_GNU_VTENTRY },
-  { BFD_RELOC_LM32_16_GOT,      R_LM32_16_GOT },
+  { BFD_RELOC_NONE,            R_LM32_NONE },
+  { BFD_RELOC_8,               R_LM32_8 },
+  { BFD_RELOC_16,              R_LM32_16 },
+  { BFD_RELOC_32,              R_LM32_32 },
+  { BFD_RELOC_HI16,            R_LM32_HI16 },
+  { BFD_RELOC_LO16,            R_LM32_LO16 },
+  { BFD_RELOC_GPREL16,         R_LM32_GPREL16 },
+  { BFD_RELOC_LM32_CALL,       R_LM32_CALL },
+  { BFD_RELOC_LM32_BRANCH,     R_LM32_BRANCH },
+  { BFD_RELOC_VTABLE_INHERIT,  R_LM32_GNU_VTINHERIT },
+  { BFD_RELOC_VTABLE_ENTRY,    R_LM32_GNU_VTENTRY },
+  { BFD_RELOC_LM32_16_GOT,     R_LM32_16_GOT },
   { BFD_RELOC_LM32_GOTOFF_HI16, R_LM32_GOTOFF_HI16 },
   { BFD_RELOC_LM32_GOTOFF_LO16, R_LM32_GOTOFF_LO16 },
-  { BFD_RELOC_LM32_COPY,        R_LM32_COPY },
-  { BFD_RELOC_LM32_GLOB_DAT,    R_LM32_GLOB_DAT },
-  { BFD_RELOC_LM32_JMP_SLOT,    R_LM32_JMP_SLOT },
-  { BFD_RELOC_LM32_RELATIVE,    R_LM32_RELATIVE },
+  { BFD_RELOC_LM32_COPY,       R_LM32_COPY },
+  { BFD_RELOC_LM32_GLOB_DAT,   R_LM32_GLOB_DAT },
+  { BFD_RELOC_LM32_JMP_SLOT,   R_LM32_JMP_SLOT },
+  { BFD_RELOC_LM32_RELATIVE,   R_LM32_RELATIVE },
 };
 
 static reloc_howto_type *
 lm32_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED,
-                        bfd_reloc_code_real_type code)
+                       bfd_reloc_code_real_type code)
 {
   unsigned int i;
 
@@ -588,16 +481,24 @@ lm32_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
 
 /* Set the howto pointer for an Lattice Mico32 ELF reloc.  */
 
-static void
-lm32_info_to_howto_rela (bfd *abfd ATTRIBUTE_UNUSED,
-                         arelent *cache_ptr,
-                         Elf_Internal_Rela *dst)
+static bfd_boolean
+lm32_info_to_howto_rela (bfd *abfd,
+                        arelent *cache_ptr,
+                        Elf_Internal_Rela *dst)
 {
   unsigned int r_type;
 
   r_type = ELF32_R_TYPE (dst->r_info);
-  BFD_ASSERT (r_type < (unsigned int) R_LM32_max);
+  if (r_type >= (unsigned int) R_LM32_max)
+    {
+      /* xgettext:c-format */
+      _bfd_error_handler (_("%pB: unsupported relocation type %#x"),
+                         abfd, r_type);
+      bfd_set_error (bfd_error_bad_value);
+      return FALSE;
+    }
   cache_ptr->howto = &lm32_elf_howto_table[r_type];
+  return TRUE;
 }
 
 /* Set the right machine number for an Lattice Mico32 ELF file. */
@@ -610,19 +511,20 @@ lm32_elf_object_p (bfd *abfd)
 
 /* Set machine type flags just before file is written out. */
 
-static void
-lm32_elf_final_write_processing (bfd *abfd, bfd_boolean linker ATTRIBUTE_UNUSED)
+static bfd_boolean
+lm32_elf_final_write_processing (bfd *abfd)
 {
   elf_elfheader (abfd)->e_machine = EM_LATTICEMICO32;
   elf_elfheader (abfd)->e_flags &=~ EF_LM32_MACH;
   switch (bfd_get_mach (abfd))
     {
       case bfd_mach_lm32:
-        elf_elfheader (abfd)->e_flags |= E_LM32_MACH;
-        break;
+       elf_elfheader (abfd)->e_flags |= E_LM32_MACH;
+       break;
       default:
-        abort ();
+       abort ();
     }
+  return _bfd_elf_final_write_processing (abfd);
 }
 
 /* Set the GP value for OUTPUT_BFD.  Returns FALSE if this is a
@@ -682,7 +584,7 @@ lm32_elf_assign_gp (bfd *output_bfd, bfd_vma *pgp)
 
 static bfd_reloc_status_type
 lm32_elf_final_gp (bfd *output_bfd, asymbol *symbol, bfd_boolean relocatable,
-                    char **error_message, bfd_vma *pgp)
+                   char **error_message, bfd_vma *pgp)
 {
   if (bfd_is_und_section (symbol->section) && !relocatable)
     {
@@ -783,8 +685,7 @@ _lm32fdpic_osec_to_segment (bfd *output_bfd, asection *osec)
   Elf_Internal_Phdr *p;
 
   /* Find the segment that contains the output_section.  */
-  for (m = elf_tdata (output_bfd)->segment_map,
-        p = elf_tdata (output_bfd)->phdr;
+  for (m = elf_seg_map (output_bfd), p = elf_tdata (output_bfd)->phdr;
        m != NULL;
        m = m->next, p++)
     {
@@ -815,29 +716,27 @@ _lm32fdpic_osec_readonly_p (bfd *output_bfd, asection *osec)
 
 static bfd_boolean
 lm32_elf_relocate_section (bfd *output_bfd,
-                           struct bfd_link_info *info,
-                           bfd *input_bfd,
-                           asection *input_section,
-                           bfd_byte *contents,
-                           Elf_Internal_Rela *relocs,
-                           Elf_Internal_Sym *local_syms,
-                           asection **local_sections)
+                          struct bfd_link_info *info,
+                          bfd *input_bfd,
+                          asection *input_section,
+                          bfd_byte *contents,
+                          Elf_Internal_Rela *relocs,
+                          Elf_Internal_Sym *local_syms,
+                          asection **local_sections)
 {
   Elf_Internal_Shdr *symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
   struct elf_link_hash_entry **sym_hashes = elf_sym_hashes (input_bfd);
   Elf_Internal_Rela *rel, *relend;
   struct elf_lm32_link_hash_table *htab = lm32_elf_hash_table (info);
-  bfd *dynobj;
   bfd_vma *local_got_offsets;
   asection *sgot;
 
   if (htab == NULL)
     return FALSE;
 
-  dynobj = htab->root.dynobj;
   local_got_offsets = elf_local_got_offsets (input_bfd);
 
-  sgot = htab->sgot;
+  sgot = htab->root.sgot;
 
   symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
   sym_hashes = elf_sym_hashes (input_bfd);
@@ -861,8 +760,8 @@ lm32_elf_relocate_section (bfd *output_bfd,
       r_type = ELF32_R_TYPE (rel->r_info);
 
       if (r_type == R_LM32_GNU_VTENTRY
-          || r_type == R_LM32_GNU_VTINHERIT )
-        continue;
+         || r_type == R_LM32_GNU_VTINHERIT )
+       continue;
 
       h = NULL;
       sym = NULL;
@@ -871,41 +770,34 @@ lm32_elf_relocate_section (bfd *output_bfd,
       howto = lm32_elf_howto_table + r_type;
 
       if (r_symndx < symtab_hdr->sh_info)
-        {
-          /* It's a local symbol.  */
-          sym = local_syms + r_symndx;
-          sec = local_sections[r_symndx];
-          relocation = _bfd_elf_rela_local_sym (output_bfd, sym, &sec, rel);
-          name = bfd_elf_string_from_elf_section
+       {
+         /* It's a local symbol.  */
+         sym = local_syms + r_symndx;
+         sec = local_sections[r_symndx];
+         relocation = _bfd_elf_rela_local_sym (output_bfd, sym, &sec, rel);
+         name = bfd_elf_string_from_elf_section
            (input_bfd, symtab_hdr->sh_link, sym->st_name);
-         name = (name == NULL) ? bfd_section_name (input_bfd, sec) : name;
-        }
+         name = name == NULL ? bfd_section_name (sec) : name;
+       }
       else
-        {
-          /* It's a global symbol.  */
-          bfd_boolean unresolved_reloc;
-         bfd_boolean warned;
+       {
+         /* It's a global symbol.  */
+         bfd_boolean unresolved_reloc;
+         bfd_boolean warned, ignored;
 
          RELOC_FOR_GLOBAL_SYMBOL (info, input_bfd, input_section, rel,
                                   r_symndx, symtab_hdr, sym_hashes,
                                   h, sec, relocation,
-                                  unresolved_reloc, warned);
+                                  unresolved_reloc, warned, ignored);
          name = h->root.root.string;
-        }
-
-      if (sec != NULL && elf_discarded_section (sec))
-       {
-         /* For relocs against symbols from removed linkonce sections,
-            or sections discarded by a linker script, we just want the
-            section contents zeroed.  Avoid any special processing.  */
-         _bfd_clear_contents (howto, input_bfd, contents + rel->r_offset);
-         rel->r_info = 0;
-         rel->r_addend = 0;
-         continue;
        }
 
-      if (info->relocatable)
-        {
+      if (sec != NULL && discarded_section (sec))
+       RELOC_AGAINST_DISCARDED_SECTION (info, input_bfd, input_section,
+                                        rel, 1, relend, howto, 0, contents);
+
+      if (bfd_link_relocatable (info))
+       {
          /* This is a relocatable link.  We don't have to change
             anything, unless the reloc is against a section symbol,
             in which case we have to adjust according to where the
@@ -918,283 +810,283 @@ lm32_elf_relocate_section (bfd *output_bfd,
          if (! howto->partial_inplace)
            continue;
 
-          /* Shouldn't reach here.  */
+         /* Shouldn't reach here.  */
          abort ();
          r = bfd_reloc_ok;
-        }
+       }
       else
-        {
-          switch (howto->type)
-            {
-            case R_LM32_GPREL16:
-              if (!lm32_elf_assign_gp (output_bfd, &gp))
-                r = bfd_reloc_dangerous;
-              else
-                {
-                  relocation = relocation + rel->r_addend - gp;
-                  rel->r_addend = 0;
-                  if ((signed)relocation < -32768 || (signed)relocation > 32767)
-                    r = bfd_reloc_outofrange;
-                  else
-                    {
-                      r = _bfd_final_link_relocate (howto, input_bfd,
-                                                 input_section, contents,
-                                                 rel->r_offset, relocation,
-                                                 rel->r_addend);
-                   }
-                }
-              break;
-            case R_LM32_16_GOT:
-              /* Relocation is to the entry for this symbol in the global
-                 offset table.  */
-              BFD_ASSERT (sgot != NULL);
-              if (h != NULL)
-                {
-                  bfd_boolean dyn;
-                  bfd_vma off;
-
-                  off = h->got.offset;
-                  BFD_ASSERT (off != (bfd_vma) -1);
-
-                  dyn = htab->root.dynamic_sections_created;
-                  if (! WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, info->shared, h)
-                      || (info->shared
-                          && (info->symbolic
-                              || h->dynindx == -1
-                              || h->forced_local)
-                          && h->def_regular))
-                    {
-                      /* 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
-                        {
-                          /* Write entry in GOT */
-                          bfd_put_32 (output_bfd, relocation,
-                                      sgot->contents + off);
-                          /* Create entry in .rofixup pointing to GOT entry.  */
-                           if (IS_FDPIC (output_bfd) && h->root.type != bfd_link_hash_undefweak)
-                             {
-                              _lm32fdpic_add_rofixup (output_bfd,
-                                                      lm32fdpic_fixup32_section
-                                                       (info),
-                                                      sgot->output_section->vma
-                                                        + sgot->output_offset
-                                                        + off);
-                             }
-                          /* Mark GOT entry as having been written.  */
-                          h->got.offset |= 1;
-                        }
-                    }
-
-                  relocation = sgot->output_offset + off;
-                }
-              else
-                {
-                  bfd_vma off;
-                  bfd_byte *loc;
-
-                  BFD_ASSERT (local_got_offsets != NULL
-                              && local_got_offsets[r_symndx] != (bfd_vma) -1);
-
-                  /* Get offset into GOT table.  */
-                  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 processed this entry.  */
-                  if ((off & 1) != 0)
-                    off &= ~1;
-                  else
-                    {
-                      /* Write entry in GOT.  */
-                      bfd_put_32 (output_bfd, relocation, sgot->contents + off);
-                      /* Create entry in .rofixup pointing to GOT entry.  */
-                      if (IS_FDPIC (output_bfd))
-                        {
-                         _lm32fdpic_add_rofixup (output_bfd,
-                                                 lm32fdpic_fixup32_section
-                                                  (info),
-                                                 sgot->output_section->vma
-                                                   + sgot->output_offset
-                                                   + off);
-                        }
-
-                      if (info->shared)
-                        {
-                          asection *srelgot;
-                          Elf_Internal_Rela outrel;
-
-                          /* We need to generate a R_LM32_RELATIVE reloc
-                             for the dynamic linker.  */
-                          srelgot = bfd_get_section_by_name (dynobj, ".rela.got");
-                          BFD_ASSERT (srelgot != NULL);
-
-                          outrel.r_offset = (sgot->output_section->vma
-                                             + sgot->output_offset
-                                             + off);
-                          outrel.r_info = ELF32_R_INFO (0, R_LM32_RELATIVE);
-                          outrel.r_addend = relocation;
-                          loc = srelgot->contents;
-                          loc += srelgot->reloc_count * sizeof (Elf32_External_Rela);
-                          bfd_elf32_swap_reloca_out (output_bfd, &outrel,loc);
-                          ++srelgot->reloc_count;
-                        }
-
-                      local_got_offsets[r_symndx] |= 1;
-                    }
-
-
-                  relocation = sgot->output_offset + off;
-                }
-
-              /* Addend should be zero.  */
-              if (rel->r_addend != 0)
-                (*_bfd_error_handler) (_("internal error: addend should be zero for R_LM32_16_GOT"));
-
-              r = _bfd_final_link_relocate (howto,
-                                            input_bfd,
-                                            input_section,
-                                            contents,
-                                            rel->r_offset,
-                                            relocation,
-                                            rel->r_addend);
-              break;
-
-            case R_LM32_GOTOFF_LO16:
-            case R_LM32_GOTOFF_HI16:
-              /* Relocation is offset from GOT.  */
+       {
+         switch (howto->type)
+           {
+           case R_LM32_GPREL16:
+             if (!lm32_elf_assign_gp (output_bfd, &gp))
+               r = bfd_reloc_dangerous;
+             else
+               {
+                 relocation = relocation + rel->r_addend - gp;
+                 rel->r_addend = 0;
+                 if ((signed)relocation < -32768 || (signed)relocation > 32767)
+                   r = bfd_reloc_outofrange;
+                 else
+                   {
+                     r = _bfd_final_link_relocate (howto, input_bfd,
+                                                   input_section, contents,
+                                                   rel->r_offset, relocation,
+                                                   rel->r_addend);
+                   }
+               }
+             break;
+           case R_LM32_16_GOT:
+             /* Relocation is to the entry for this symbol in the global
+                offset table.  */
+             BFD_ASSERT (sgot != NULL);
+             if (h != NULL)
+               {
+                 bfd_boolean dyn;
+                 bfd_vma off;
+
+                 off = h->got.offset;
+                 BFD_ASSERT (off != (bfd_vma) -1);
+
+                 dyn = htab->root.dynamic_sections_created;
+                 if (! WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn,
+                                                        bfd_link_pic (info),
+                                                        h)
+                     || (bfd_link_pic (info)
+                         && (info->symbolic
+                             || h->dynindx == -1
+                             || h->forced_local)
+                         && h->def_regular))
+                   {
+                     /* 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
+                       {
+                         /* Write entry in GOT */
+                         bfd_put_32 (output_bfd, relocation,
+                                     sgot->contents + off);
+                         /* Create entry in .rofixup pointing to GOT entry.  */
+                          if (IS_FDPIC (output_bfd) && h->root.type != bfd_link_hash_undefweak)
+                            {
+                              _lm32fdpic_add_rofixup (output_bfd,
+                                                      lm32fdpic_fixup32_section
+                                                       (info),
+                                                      sgot->output_section->vma
+                                                       + sgot->output_offset
+                                                       + off);
+                            }
+                         /* Mark GOT entry as having been written.  */
+                         h->got.offset |= 1;
+                       }
+                   }
+
+                 relocation = sgot->output_offset + off;
+               }
+             else
+               {
+                 bfd_vma off;
+                 bfd_byte *loc;
+
+                 BFD_ASSERT (local_got_offsets != NULL
+                             && local_got_offsets[r_symndx] != (bfd_vma) -1);
+
+                 /* Get offset into GOT table.  */
+                 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 processed this entry.  */
+                 if ((off & 1) != 0)
+                   off &= ~1;
+                 else
+                   {
+                     /* Write entry in GOT.  */
+                     bfd_put_32 (output_bfd, relocation, sgot->contents + off);
+                     /* Create entry in .rofixup pointing to GOT entry.  */
+                     if (IS_FDPIC (output_bfd))
+                       {
+                         _lm32fdpic_add_rofixup (output_bfd,
+                                                 lm32fdpic_fixup32_section
+                                                  (info),
+                                                 sgot->output_section->vma
+                                                  + sgot->output_offset
+                                                  + off);
+                       }
+
+                     if (bfd_link_pic (info))
+                       {
+                         asection *srelgot;
+                         Elf_Internal_Rela outrel;
+
+                         /* We need to generate a R_LM32_RELATIVE reloc
+                            for the dynamic linker.  */
+                         srelgot = htab->root.srelgot;
+                         BFD_ASSERT (srelgot != NULL);
+
+                         outrel.r_offset = (sgot->output_section->vma
+                                            + sgot->output_offset
+                                            + off);
+                         outrel.r_info = ELF32_R_INFO (0, R_LM32_RELATIVE);
+                         outrel.r_addend = relocation;
+                         loc = srelgot->contents;
+                         loc += srelgot->reloc_count * sizeof (Elf32_External_Rela);
+                         bfd_elf32_swap_reloca_out (output_bfd, &outrel,loc);
+                         ++srelgot->reloc_count;
+                       }
+
+                     local_got_offsets[r_symndx] |= 1;
+                   }
+
+
+                 relocation = sgot->output_offset + off;
+               }
+
+             /* Addend should be zero.  */
+             if (rel->r_addend != 0)
+               _bfd_error_handler
+                 (_("internal error: addend should be zero for %s"),
+                  "R_LM32_16_GOT");
+
+             r = _bfd_final_link_relocate (howto,
+                                           input_bfd,
+                                           input_section,
+                                           contents,
+                                           rel->r_offset,
+                                           relocation,
+                                           rel->r_addend);
+             break;
+
+           case R_LM32_GOTOFF_LO16:
+           case R_LM32_GOTOFF_HI16:
+             /* Relocation is offset from GOT.  */
              BFD_ASSERT (sgot != NULL);
              relocation -= sgot->output_section->vma;
              /* Account for sign-extension.  */
-              if ((r_type == R_LM32_GOTOFF_HI16)
-                  && ((relocation + rel->r_addend) & 0x8000))
-                rel->r_addend += 0x10000;
-              r = _bfd_final_link_relocate (howto,
-                                            input_bfd,
-                                            input_section,
-                                            contents,
-                                            rel->r_offset,
-                                            relocation,
-                                            rel->r_addend);
-              break;
-
-            case R_LM32_32:
-              if (IS_FDPIC (output_bfd))
-                {
-                  if ((!h) || (h && h->root.type != bfd_link_hash_undefweak))
-                    {
-                      /* Only create .rofixup entries for relocs in loadable sections.  */
-                      if ((bfd_get_section_flags (output_bfd, input_section->output_section)
-                          & (SEC_ALLOC | SEC_LOAD)) == (SEC_ALLOC | SEC_LOAD))
-
-                        {
-                          /* Check address to be modified is writable.  */
-                          if (_lm32fdpic_osec_readonly_p (output_bfd,
-                                                          input_section
-                                                           ->output_section))
-                            {
-                              info->callbacks->warning
-                                (info,
-                                 _("cannot emit dynamic relocations in read-only section"),
-                                 name, input_bfd, input_section, rel->r_offset);
-                               return FALSE;
-                            }
-                          /* Create entry in .rofixup section.  */
-                          _lm32fdpic_add_rofixup (output_bfd,
-                                                  lm32fdpic_fixup32_section (info),
-                                                  input_section->output_section->vma
-                                                   + input_section->output_offset
-                                                   + rel->r_offset);
-                        }
-                    }
-                }
-              /* Fall through.  */
-
-            default:
-              r = _bfd_final_link_relocate (howto,
-                                            input_bfd,
-                                            input_section,
-                                            contents,
-                                            rel->r_offset,
-                                            relocation,
-                                            rel->r_addend);
-              break;
-            }
-        }
+             if ((r_type == R_LM32_GOTOFF_HI16)
+                 && ((relocation + rel->r_addend) & 0x8000))
+               rel->r_addend += 0x10000;
+             r = _bfd_final_link_relocate (howto,
+                                           input_bfd,
+                                           input_section,
+                                           contents,
+                                           rel->r_offset,
+                                           relocation,
+                                           rel->r_addend);
+             break;
+
+           case R_LM32_32:
+             if (IS_FDPIC (output_bfd))
+               {
+                 if ((!h) || (h && h->root.type != bfd_link_hash_undefweak))
+                   {
+                     /* Only create .rofixup entries for relocs in loadable sections.  */
+                     if ((bfd_section_flags (input_section->output_section)
+                         & (SEC_ALLOC | SEC_LOAD)) == (SEC_ALLOC | SEC_LOAD))
+
+                       {
+                         /* Check address to be modified is writable.  */
+                         if (_lm32fdpic_osec_readonly_p (output_bfd,
+                                                         input_section
+                                                          ->output_section))
+                           {
+                             info->callbacks->warning
+                               (info,
+                                _("cannot emit dynamic relocations in read-only section"),
+                                name, input_bfd, input_section, rel->r_offset);
+                              return FALSE;
+                           }
+                         /* Create entry in .rofixup section.  */
+                         _lm32fdpic_add_rofixup (output_bfd,
+                                                 lm32fdpic_fixup32_section (info),
+                                                 input_section->output_section->vma
+                                                  + input_section->output_offset
+                                                  + rel->r_offset);
+                       }
+                   }
+               }
+             /* Fall through.  */
+
+           default:
+             r = _bfd_final_link_relocate (howto,
+                                           input_bfd,
+                                           input_section,
+                                           contents,
+                                           rel->r_offset,
+                                           relocation,
+                                           rel->r_addend);
+             break;
+           }
+       }
 
       if (r != bfd_reloc_ok)
-        {
-          const char *msg = NULL;
-          arelent bfd_reloc;
-
-          lm32_info_to_howto_rela (input_bfd, &bfd_reloc, rel);
-          howto = bfd_reloc.howto;
-
-          if (h != NULL)
-            name = h->root.root.string;
-          else
-            {
-              name = (bfd_elf_string_from_elf_section
-                      (input_bfd, symtab_hdr->sh_link, sym->st_name));
-              if (name == NULL || *name == '\0')
-                name = bfd_section_name (input_bfd, sec);
-            }
-
-          switch (r)
-            {
+       {
+         const char *msg = NULL;
+         arelent bfd_reloc;
+
+         if (! lm32_info_to_howto_rela (input_bfd, &bfd_reloc, rel))
+           continue;
+         howto = bfd_reloc.howto;
+
+         if (h != NULL)
+           name = h->root.root.string;
+         else
+           {
+             name = (bfd_elf_string_from_elf_section
+                     (input_bfd, symtab_hdr->sh_link, sym->st_name));
+             if (name == NULL || *name == '\0')
+               name = bfd_section_name (sec);
+           }
+
+         switch (r)
+           {
            case bfd_reloc_overflow:
              if ((h != NULL)
-                 && (h->root.type == bfd_link_hash_undefweak))
-               break;
-             if (! ((*info->callbacks->reloc_overflow)
-                    (info, (h ? &h->root : NULL), name, howto->name,
-                     (bfd_vma) 0, input_bfd, input_section, rel->r_offset)))
-               return FALSE;
+                && (h->root.type == bfd_link_hash_undefweak))
+               break;
+             (*info->callbacks->reloc_overflow)
+               (info, (h ? &h->root : NULL), name, howto->name,
+                (bfd_vma) 0, input_bfd, input_section, rel->r_offset);
+             break;
+
+           case bfd_reloc_undefined:
+             (*info->callbacks->undefined_symbol)
+               (info, name, input_bfd, input_section, rel->r_offset, TRUE);
              break;
 
-            case bfd_reloc_undefined:
-              if (! ((*info->callbacks->undefined_symbol)
-                     (info, name, input_bfd, input_section,
-                      rel->r_offset, TRUE)))
-                return FALSE;
-              break;
-
-            case bfd_reloc_outofrange:
-              msg = _("internal error: out of range error");
-              goto common_error;
-
-            case bfd_reloc_notsupported:
-              msg = _("internal error: unsupported relocation error");
-              goto common_error;
-
-            case bfd_reloc_dangerous:
-              msg = _("internal error: dangerous error");
-              goto common_error;
-
-            default:
-              msg = _("internal error: unknown error");
-              /* fall through */
-
-            common_error:
-              if (!((*info->callbacks->warning)
-                    (info, msg, name, input_bfd, input_section,
-                     rel->r_offset)))
-                return FALSE;
-              break;
-            }
-        }
+           case bfd_reloc_outofrange:
+             msg = _("internal error: out of range error");
+             goto common_error;
+
+           case bfd_reloc_notsupported:
+             msg = _("internal error: unsupported relocation error");
+             goto common_error;
+
+           case bfd_reloc_dangerous:
+             msg = _("internal error: dangerous error");
+             goto common_error;
+
+           default:
+             msg = _("internal error: unknown error");
+             /* fall through */
+
+           common_error:
+             (*info->callbacks->warning) (info, msg, name, input_bfd,
+                                          input_section, rel->r_offset);
+             break;
+           }
+       }
     }
 
   return TRUE;
@@ -1202,10 +1094,10 @@ lm32_elf_relocate_section (bfd *output_bfd,
 
 static asection *
 lm32_elf_gc_mark_hook (asection *sec,
-                       struct bfd_link_info *info,
-                       Elf_Internal_Rela *rel,
-                       struct elf_link_hash_entry *h,
-                       Elf_Internal_Sym *sym)
+                      struct bfd_link_info *info,
+                      Elf_Internal_Rela *rel,
+                      struct elf_link_hash_entry *h,
+                      Elf_Internal_Sym *sym)
 {
   if (h != NULL)
     switch (ELF32_R_TYPE (rel->r_info))
@@ -1218,68 +1110,13 @@ lm32_elf_gc_mark_hook (asection *sec,
   return _bfd_elf_gc_mark_hook (sec, info, rel, h, sym);
 }
 
-static bfd_boolean
-lm32_elf_gc_sweep_hook (bfd *abfd,
-                        struct bfd_link_info *info ATTRIBUTE_UNUSED,
-                        asection *sec,
-                        const Elf_Internal_Rela *relocs ATTRIBUTE_UNUSED)
-{
-  /* Update the got entry reference counts for the section being removed.  */
-  Elf_Internal_Shdr *symtab_hdr;
-  struct elf_link_hash_entry **sym_hashes;
-  bfd_signed_vma *local_got_refcounts;
-  const Elf_Internal_Rela *rel, *relend;
-
-  elf_section_data (sec)->local_dynrel = NULL;
-
-  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
-  sym_hashes = elf_sym_hashes (abfd);
-  local_got_refcounts = elf_local_got_refcounts (abfd);
-
-  relend = relocs + sec->reloc_count;
-  for (rel = relocs; rel < relend; rel++)
-    {
-      unsigned long r_symndx;
-      struct elf_link_hash_entry *h = NULL;
-
-      r_symndx = ELF32_R_SYM (rel->r_info);
-      if (r_symndx >= symtab_hdr->sh_info)
-       {
-         h = sym_hashes[r_symndx - symtab_hdr->sh_info];
-         while (h->root.type == bfd_link_hash_indirect
-                || h->root.type == bfd_link_hash_warning)
-           h = (struct elf_link_hash_entry *) h->root.u.i.link;
-       }
-
-      switch (ELF32_R_TYPE (rel->r_info))
-       {
-       case R_LM32_16_GOT:
-         if (h != NULL)
-           {
-             if (h->got.refcount > 0)
-               h->got.refcount--;
-           }
-         else
-           {
-             if (local_got_refcounts && local_got_refcounts[r_symndx] > 0)
-               local_got_refcounts[r_symndx]--;
-           }
-         break;
-
-       default:
-         break;
-       }
-    }
-  return TRUE;
-}
-
 /* Look through the relocs for a section during the first phase.  */
 
 static bfd_boolean
 lm32_elf_check_relocs (bfd *abfd,
-                       struct bfd_link_info *info,
-                       asection *sec,
-                       const Elf_Internal_Rela *relocs)
+                      struct bfd_link_info *info,
+                      asection *sec,
+                      const Elf_Internal_Rela *relocs)
 {
   Elf_Internal_Shdr *symtab_hdr;
   struct elf_link_hash_entry **sym_hashes, **sym_hashes_end;
@@ -1288,7 +1125,16 @@ lm32_elf_check_relocs (bfd *abfd,
   struct elf_lm32_link_hash_table *htab;
   bfd *dynobj;
 
-  if (info->relocatable)
+  if (bfd_link_relocatable (info))
+    return TRUE;
+
+  /* Don't do anything special with non-loaded, non-alloced sections.
+     In particular, any relocs in such sections should not affect GOT
+     and PLT reference counting (ie. we don't allow them to create GOT
+     or PLT entries), there's no possibility or desire to optimize TLS
+     relocs, and there's not much point in propagating relocs to shared
+     libs that the dynamic linker won't relocate.  */
+  if ((sec->flags & SEC_ALLOC) == 0)
     return TRUE;
 
   symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
@@ -1313,7 +1159,7 @@ lm32_elf_check_relocs (bfd *abfd,
       r_symndx = ELF32_R_SYM (rel->r_info);
       r_type = ELF32_R_TYPE (rel->r_info);
       if (r_symndx < symtab_hdr->sh_info)
-        h = NULL;
+       h = NULL;
       else
        {
          h = sym_hashes[r_symndx - symtab_hdr->sh_info];
@@ -1323,94 +1169,96 @@ lm32_elf_check_relocs (bfd *abfd,
        }
 
       /* Some relocs require a global offset table.  */
-      if (htab->sgot == NULL)
-        {
-          switch (r_type)
-            {
-            case R_LM32_16_GOT:
-            case R_LM32_GOTOFF_HI16:
-            case R_LM32_GOTOFF_LO16:
-              if (dynobj == NULL)
-                htab->root.dynobj = dynobj = abfd;
-              if (! create_got_section (dynobj, info))
-                return FALSE;
-              break;
-            }
-        }
+      if (htab->root.sgot == NULL)
+       {
+         switch (r_type)
+           {
+           case R_LM32_16_GOT:
+           case R_LM32_GOTOFF_HI16:
+           case R_LM32_GOTOFF_LO16:
+             if (dynobj == NULL)
+               htab->root.dynobj = dynobj = abfd;
+             if (!_bfd_elf_create_got_section (dynobj, info))
+               return FALSE;
+             break;
+           }
+       }
 
       /* Some relocs require a rofixup table. */
       if (IS_FDPIC (abfd))
-        {
-          switch (r_type)
-            {
-            case R_LM32_32:
-              /* FDPIC requires a GOT if there is a .rofixup section
-                 (Normal ELF doesn't). */
-              if (dynobj == NULL)
-                htab->root.dynobj = dynobj = abfd;
-              if (! create_got_section (dynobj, info))
-                return FALSE;
-              /* Create .rofixup section */
-              if (htab->sfixup32 == NULL)
-                {
-                  if (! create_rofixup_section (abfd, info))
-                    return FALSE;
-                }
-              break;
-            case R_LM32_16_GOT:
-            case R_LM32_GOTOFF_HI16:
-            case R_LM32_GOTOFF_LO16:
-              /* Create .rofixup section.  */
-              if (htab->sfixup32 == NULL)
-                {
-                  if (! create_rofixup_section (abfd, info))
-                    return FALSE;
-                }
-              break;
-            }
-        }
+       {
+         switch (r_type)
+           {
+           case R_LM32_32:
+             /* FDPIC requires a GOT if there is a .rofixup section
+                (Normal ELF doesn't). */
+             if (dynobj == NULL)
+               htab->root.dynobj = dynobj = abfd;
+             if (!_bfd_elf_create_got_section (dynobj, info))
+               return FALSE;
+             /* Create .rofixup section */
+             if (htab->sfixup32 == NULL)
+               {
+                 if (! create_rofixup_section (dynobj, info))
+                   return FALSE;
+               }
+             break;
+           case R_LM32_16_GOT:
+           case R_LM32_GOTOFF_HI16:
+           case R_LM32_GOTOFF_LO16:
+             /* Create .rofixup section.  */
+             if (htab->sfixup32 == NULL)
+               {
+                 if (dynobj == NULL)
+                   htab->root.dynobj = dynobj = abfd;
+                 if (! create_rofixup_section (dynobj, info))
+                   return FALSE;
+               }
+             break;
+           }
+       }
 
       switch (r_type)
        {
        case R_LM32_16_GOT:
-          if (h != NULL)
-            h->got.refcount += 1;
-          else
-            {
-              bfd_signed_vma *local_got_refcounts;
-
-              /* This is a global offset table entry for a local symbol.  */
-              local_got_refcounts = elf_local_got_refcounts (abfd);
-              if (local_got_refcounts == NULL)
-                {
-                  bfd_size_type size;
-
-                  size = symtab_hdr->sh_info;
-                  size *= sizeof (bfd_signed_vma);
-                  local_got_refcounts = bfd_zalloc (abfd, size);
-                  if (local_got_refcounts == NULL)
-                    return FALSE;
-                  elf_local_got_refcounts (abfd) = local_got_refcounts;
-                }
-              local_got_refcounts[r_symndx] += 1;
-            }
-          break;
-
-        /* This relocation describes the C++ object vtable hierarchy.
-           Reconstruct it for later use during GC.  */
-        case R_LM32_GNU_VTINHERIT:
-          if (!bfd_elf_gc_record_vtinherit (abfd, sec, h, rel->r_offset))
-            return FALSE;
-          break;
-
-        /* This relocation describes which C++ vtable entries are actually
-           used.  Record for later use during GC.  */
-        case R_LM32_GNU_VTENTRY:
-          if (!bfd_elf_gc_record_vtentry (abfd, sec, h, rel->r_addend))
-            return FALSE;
-          break;
-
-        }
+         if (h != NULL)
+           h->got.refcount += 1;
+         else
+           {
+             bfd_signed_vma *local_got_refcounts;
+
+             /* This is a global offset table entry for a local symbol.  */
+             local_got_refcounts = elf_local_got_refcounts (abfd);
+             if (local_got_refcounts == NULL)
+               {
+                 bfd_size_type size;
+
+                 size = symtab_hdr->sh_info;
+                 size *= sizeof (bfd_signed_vma);
+                 local_got_refcounts = bfd_zalloc (abfd, size);
+                 if (local_got_refcounts == NULL)
+                   return FALSE;
+                 elf_local_got_refcounts (abfd) = local_got_refcounts;
+               }
+             local_got_refcounts[r_symndx] += 1;
+           }
+         break;
+
+       /* This relocation describes the C++ object vtable hierarchy.
+          Reconstruct it for later use during GC.  */
+       case R_LM32_GNU_VTINHERIT:
+         if (!bfd_elf_gc_record_vtinherit (abfd, sec, h, rel->r_offset))
+           return FALSE;
+         break;
+
+       /* This relocation describes which C++ vtable entries are actually
+          used.  Record for later use during GC.  */
+       case R_LM32_GNU_VTENTRY:
+         if (!bfd_elf_gc_record_vtentry (abfd, sec, h, rel->r_addend))
+           return FALSE;
+         break;
+
+       }
     }
 
   return TRUE;
@@ -1433,8 +1281,8 @@ lm32_elf_finish_dynamic_sections (bfd *output_bfd,
 
   dynobj = htab->root.dynobj;
 
-  sgot = htab->sgotplt;
-  sdyn = bfd_get_section_by_name (dynobj, ".dynamic");
+  sgot = htab->root.sgotplt;
+  sdyn = bfd_get_linker_section (dynobj, ".dynamic");
 
   if (htab->root.dynamic_sections_created)
     {
@@ -1447,111 +1295,91 @@ lm32_elf_finish_dynamic_sections (bfd *output_bfd,
       dynconend = (Elf32_External_Dyn *) (sdyn->contents + sdyn->size);
 
       for (; dyncon < dynconend; dyncon++)
-        {
-          Elf_Internal_Dyn dyn;
-          asection *s;
-
-          bfd_elf32_swap_dyn_in (dynobj, dyncon, &dyn);
-
-          switch (dyn.d_tag)
-            {
-            default:
-              break;
-
-            case DT_PLTGOT:
-              s = htab->sgot->output_section;
-              goto get_vma;
-            case DT_JMPREL:
-              s = htab->srelplt->output_section;
-            get_vma:
-              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 = htab->srelplt->output_section;
-              BFD_ASSERT (s != NULL);
+       {
+         Elf_Internal_Dyn dyn;
+         asection *s;
+
+         bfd_elf32_swap_dyn_in (dynobj, dyncon, &dyn);
+
+         switch (dyn.d_tag)
+           {
+           default:
+             break;
+
+           case DT_PLTGOT:
+             s = htab->root.sgotplt;
+             goto get_vma;
+           case DT_JMPREL:
+             s = htab->root.srelplt;
+           get_vma:
+             dyn.d_un.d_ptr = s->output_section->vma + s->output_offset;
+             bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
+             break;
+
+           case DT_PLTRELSZ:
+             s = htab->root.srelplt;
              dyn.d_un.d_val = s->size;
-              bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
-              break;
-
-            case DT_RELASZ:
-              /* My reading of the SVR4 ABI indicates that the
-                 procedure linkage table relocs (DT_JMPREL) should be
-                 included in the overall relocs (DT_RELA).  This is
-                 what Solaris does.  However, UnixWare can not handle
-                 that case.  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.  */
-              if (htab->srelplt != NULL)
-                {
-                  s = htab->srelplt->output_section;
-                 dyn.d_un.d_val -= s->size;
-                }
-              bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
-              break;
-            }
-        }
+             bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
+             break;
+           }
+       }
 
       /* Fill in the first entry in the procedure linkage table.  */
-      splt = htab->splt;
+      splt = htab->root.splt;
       if (splt && splt->size > 0)
-        {
-          if (info->shared)
-            {
-              bfd_put_32 (output_bfd, PLT0_PIC_ENTRY_WORD0, splt->contents);
-              bfd_put_32 (output_bfd, PLT0_PIC_ENTRY_WORD1, splt->contents + 4);
-              bfd_put_32 (output_bfd, PLT0_PIC_ENTRY_WORD2, splt->contents + 8);
-              bfd_put_32 (output_bfd, PLT0_PIC_ENTRY_WORD3, splt->contents + 12);
-              bfd_put_32 (output_bfd, PLT0_PIC_ENTRY_WORD4, splt->contents + 16);
-            }
-          else
-            {
-              unsigned long addr;
-              /* addr = .got + 4 */
-              addr = sgot->output_section->vma + sgot->output_offset + 4;
-              bfd_put_32 (output_bfd,
+       {
+         if (bfd_link_pic (info))
+           {
+             bfd_put_32 (output_bfd, PLT0_PIC_ENTRY_WORD0, splt->contents);
+             bfd_put_32 (output_bfd, PLT0_PIC_ENTRY_WORD1, splt->contents + 4);
+             bfd_put_32 (output_bfd, PLT0_PIC_ENTRY_WORD2, splt->contents + 8);
+             bfd_put_32 (output_bfd, PLT0_PIC_ENTRY_WORD3, splt->contents + 12);
+             bfd_put_32 (output_bfd, PLT0_PIC_ENTRY_WORD4, splt->contents + 16);
+           }
+         else
+           {
+             unsigned long addr;
+             /* addr = .got + 4 */
+             addr = sgot->output_section->vma + sgot->output_offset + 4;
+             bfd_put_32 (output_bfd,
                          PLT0_ENTRY_WORD0 | ((addr >> 16) & 0xffff),
                          splt->contents);
-              bfd_put_32 (output_bfd,
+             bfd_put_32 (output_bfd,
                          PLT0_ENTRY_WORD1 | (addr & 0xffff),
                          splt->contents + 4);
-              bfd_put_32 (output_bfd, PLT0_ENTRY_WORD2, splt->contents + 8);
-              bfd_put_32 (output_bfd, PLT0_ENTRY_WORD3, splt->contents + 12);
-              bfd_put_32 (output_bfd, PLT0_ENTRY_WORD4, splt->contents + 16);
-            }
-
-          elf_section_data (splt->output_section)->this_hdr.sh_entsize =
-            PLT_ENTRY_SIZE;
-        }
+             bfd_put_32 (output_bfd, PLT0_ENTRY_WORD2, splt->contents + 8);
+             bfd_put_32 (output_bfd, PLT0_ENTRY_WORD3, splt->contents + 12);
+             bfd_put_32 (output_bfd, PLT0_ENTRY_WORD4, splt->contents + 16);
+           }
+
+         elf_section_data (splt->output_section)->this_hdr.sh_entsize =
+           PLT_ENTRY_SIZE;
+       }
     }
 
   /* Fill in the first three entries in the global offset table.  */
   if (sgot && sgot->size > 0)
     {
       if (sdyn == NULL)
-        bfd_put_32 (output_bfd, (bfd_vma) 0, sgot->contents);
+       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,
+                   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);
 
       /* FIXME:  This can be null if create_dynamic_sections wasn't called. */
       if (elf_section_data (sgot->output_section) != NULL)
-        elf_section_data (sgot->output_section)->this_hdr.sh_entsize = 4;
+       elf_section_data (sgot->output_section)->this_hdr.sh_entsize = 4;
     }
 
   if (lm32fdpic_fixup32_section (info))
     {
       struct elf_link_hash_entry *hgot = elf_hash_table (info)->hgot;
       bfd_vma got_value = hgot->root.u.def.value
-            + hgot->root.u.def.section->output_section->vma
-            + hgot->root.u.def.section->output_offset;
+           + hgot->root.u.def.section->output_section->vma
+           + hgot->root.u.def.section->output_offset;
       struct bfd_link_hash_entry *hend;
 
       /* Last entry is pointer to GOT.  */
@@ -1559,35 +1387,39 @@ lm32_elf_finish_dynamic_sections (bfd *output_bfd,
 
       /* Check we wrote enough entries.  */
       if (lm32fdpic_fixup32_section (info)->size
-              != (lm32fdpic_fixup32_section (info)->reloc_count * 4))
-        {
-          (*_bfd_error_handler)
-            ("LINKER BUG: .rofixup section size mismatch: size/4 %d != relocs %d",
-            lm32fdpic_fixup32_section (info)->size/4,
-            lm32fdpic_fixup32_section (info)->reloc_count);
-          return FALSE;
-        }
+             != (lm32fdpic_fixup32_section (info)->reloc_count * 4))
+       {
+         _bfd_error_handler
+           ("LINKER BUG: .rofixup section size mismatch: size/4 %" PRId64
+            " != relocs %d",
+           (int64_t) (lm32fdpic_fixup32_section (info)->size / 4),
+           lm32fdpic_fixup32_section (info)->reloc_count);
+         return FALSE;
+       }
 
       hend = bfd_link_hash_lookup (info->hash, "__ROFIXUP_END__",
-              FALSE, FALSE, TRUE);
+             FALSE, FALSE, TRUE);
       if (hend
-          && (hend->type == bfd_link_hash_defined
-              || hend->type == bfd_link_hash_defweak))
-        {
-          bfd_vma value =
-            lm32fdpic_fixup32_section (info)->output_section->vma
-            + lm32fdpic_fixup32_section (info)->output_offset
-            + lm32fdpic_fixup32_section (info)->size
-            - hend->u.def.section->output_section->vma
-            - hend->u.def.section->output_offset;
-          BFD_ASSERT (hend->u.def.value == value);
-          if (hend->u.def.value != value)
-            {
-              (*_bfd_error_handler)
-                ("LINKER BUG: .rofixup section hend->u.def.value != value: %ld != %ld", hend->u.def.value, value);
-              return FALSE;
-            }
-        }
+         && (hend->type == bfd_link_hash_defined
+             || hend->type == bfd_link_hash_defweak)
+         && hend->u.def.section->output_section != NULL)
+       {
+         bfd_vma value =
+           lm32fdpic_fixup32_section (info)->output_section->vma
+           + lm32fdpic_fixup32_section (info)->output_offset
+           + lm32fdpic_fixup32_section (info)->size
+           - hend->u.def.section->output_section->vma
+           - hend->u.def.section->output_offset;
+         BFD_ASSERT (hend->u.def.value == value);
+         if (hend->u.def.value != value)
+           {
+             _bfd_error_handler
+               ("LINKER BUG: .rofixup section hend->u.def.value != value: %"
+                PRId64 " != %" PRId64,
+                (int64_t) hend->u.def.value, (int64_t) value);
+             return FALSE;
+           }
+       }
     }
 
   return TRUE;
@@ -1620,47 +1452,47 @@ lm32_elf_finish_dynamic_symbol (bfd *output_bfd,
       Elf_Internal_Rela rela;
 
       /* This symbol has an entry in the procedure linkage table.  Set
-         it up.  */
+        it up.  */
       BFD_ASSERT (h->dynindx != -1);
 
-      splt = htab->splt;
-      sgot = htab->sgotplt;
-      srela = htab->srelplt;
+      splt = htab->root.splt;
+      sgot = htab->root.sgotplt;
+      srela = htab->root.srelplt;
       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 is reserved.  */
+        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 is reserved.  */
       plt_index = h->plt.offset / PLT_ENTRY_SIZE - 1;
 
       /* 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.  */
+       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.  */
-      if (! info->shared)
-        {
-          /* TODO */
-        }
+      if (! bfd_link_pic (info))
+       {
+         /* TODO */
+       }
       else
-        {
-          /* TODO */
-        }
+       {
+         /* TODO */
+       }
 
       /* 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), /* same offset */
-                  sgot->contents + got_offset);
+                 (splt->output_section->vma
+                  + splt->output_offset
+                  + h->plt.offset
+                  + 12), /* same offset */
+                 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);
+                      + sgot->output_offset
+                      + got_offset);
       rela.r_info = ELF32_R_INFO (h->dynindx, R_LM32_JMP_SLOT);
       rela.r_addend = 0;
       loc = srela->contents;
@@ -1668,11 +1500,11 @@ lm32_elf_finish_dynamic_symbol (bfd *output_bfd,
       bfd_elf32_swap_reloca_out (output_bfd, &rela, loc);
 
       if (!h->def_regular)
-        {
-          /* Mark the symbol as undefined, rather than as defined in
-             the .plt section.  Leave the value alone.  */
-          sym->st_shndx = SHN_UNDEF;
-        }
+       {
+         /* Mark the symbol as undefined, rather than as defined in
+            the .plt section.  Leave the value alone.  */
+         sym->st_shndx = SHN_UNDEF;
+       }
 
     }
 
@@ -1683,38 +1515,38 @@ lm32_elf_finish_dynamic_symbol (bfd *output_bfd,
       Elf_Internal_Rela rela;
 
       /* This symbol has an entry in the global offset table.  Set it
-         up.  */
-      sgot = htab->sgot;
-      srela = htab->srelgot;
+        up.  */
+      sgot = htab->root.sgot;
+      srela = htab->root.srelgot;
       BFD_ASSERT (sgot != NULL && srela != NULL);
 
       rela.r_offset = (sgot->output_section->vma
-                       + sgot->output_offset
-                       + (h->got.offset &~ 1));
+                      + sgot->output_offset
+                      + (h->got.offset &~ 1));
 
       /* If this is a -Bsymbolic link, and the symbol is defined
-         locally, we just want to emit a RELATIVE 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
+        locally, we just want to emit a RELATIVE 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 (bfd_link_pic (info)
+         && (info->symbolic
              || h->dynindx == -1
              || h->forced_local)
-          && h->def_regular)
-        {
-          rela.r_info = ELF32_R_INFO (0, R_LM32_RELATIVE);
-          rela.r_addend = (h->root.u.def.value
-                           + h->root.u.def.section->output_section->vma
-                           + h->root.u.def.section->output_offset);
-        }
+         && h->def_regular)
+       {
+         rela.r_info = ELF32_R_INFO (0, R_LM32_RELATIVE);
+         rela.r_addend = (h->root.u.def.value
+                          + h->root.u.def.section->output_section->vma
+                          + h->root.u.def.section->output_offset);
+       }
       else
-        {
+       {
          BFD_ASSERT ((h->got.offset & 1) == 0);
-          bfd_put_32 (output_bfd, (bfd_vma) 0, sgot->contents + h->got.offset);
-          rela.r_info = ELF32_R_INFO (h->dynindx, R_LM32_GLOB_DAT);
-          rela.r_addend = 0;
-        }
+         bfd_put_32 (output_bfd, (bfd_vma) 0, sgot->contents + h->got.offset);
+         rela.r_info = ELF32_R_INFO (h->dynindx, R_LM32_GLOB_DAT);
+         rela.r_addend = 0;
+       }
 
       loc = srela->contents;
       loc += srela->reloc_count * sizeof (Elf32_External_Rela);
@@ -1729,16 +1561,15 @@ lm32_elf_finish_dynamic_symbol (bfd *output_bfd,
 
       /* This symbols 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));
+                 && (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");
+      s = bfd_get_linker_section (htab->root.dynobj, ".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);
+                      + h->root.u.def.section->output_section->vma
+                      + h->root.u.def.section->output_offset);
       rela.r_info = ELF32_R_INFO (h->dynindx, R_LM32_COPY);
       rela.r_addend = 0;
       loc = s->contents;
@@ -1748,22 +1579,23 @@ lm32_elf_finish_dynamic_symbol (bfd *output_bfd,
     }
 
   /* Mark some specially defined symbols as absolute.  */
-  if (strcmp (h->root.root.string, "_DYNAMIC") == 0
-      || h == htab->root.hgot)
+  if (h == htab->root.hdynamic || h == htab->root.hgot)
     sym->st_shndx = SHN_ABS;
 
   return TRUE;
 }
 
 static enum elf_reloc_type_class
-lm32_elf_reloc_type_class (const Elf_Internal_Rela *rela)
+lm32_elf_reloc_type_class (const struct bfd_link_info *info ATTRIBUTE_UNUSED,
+                          const asection *rel_sec ATTRIBUTE_UNUSED,
+                          const Elf_Internal_Rela *rela)
 {
   switch ((int) ELF32_R_TYPE (rela->r_info))
     {
     case R_LM32_RELATIVE:  return reloc_class_relative;
     case R_LM32_JMP_SLOT:  return reloc_class_plt;
     case R_LM32_COPY:      return reloc_class_copy;
-    default:              return reloc_class_normal;
+    default:              return reloc_class_normal;
     }
 }
 
@@ -1778,8 +1610,6 @@ lm32_elf_adjust_dynamic_symbol (struct bfd_link_info *info,
                                struct elf_link_hash_entry *h)
 {
   struct elf_lm32_link_hash_table *htab;
-  struct elf_lm32_link_hash_entry *eh;
-  struct elf_lm32_dyn_relocs *p;
   bfd *dynobj;
   asection *s;
 
@@ -1787,11 +1617,11 @@ lm32_elf_adjust_dynamic_symbol (struct bfd_link_info *info,
 
   /* Make sure we know what is going on here.  */
   BFD_ASSERT (dynobj != NULL
-              && (h->needs_plt
-                  || h->u.weakdef != NULL
-                  || (h->def_dynamic
-                      && h->ref_regular
-                      && !h->def_regular)));
+             && (h->needs_plt
+                 || h->is_weakalias
+                 || (h->def_dynamic
+                     && h->ref_regular
+                     && !h->def_regular)));
 
   /* If this is a function, put it in the procedure linkage table.  We
      will fill in the contents of the procedure linkage table later,
@@ -1799,20 +1629,20 @@ lm32_elf_adjust_dynamic_symbol (struct bfd_link_info *info,
   if (h->type == STT_FUNC
       || h->needs_plt)
     {
-      if (! info->shared
-          && !h->def_dynamic
-          && !h->ref_dynamic
+      if (! bfd_link_pic (info)
+         && !h->def_dynamic
+         && !h->ref_dynamic
          && h->root.type != bfd_link_hash_undefweak
          && h->root.type != bfd_link_hash_undefined)
-        {
-          /* This case can occur if we saw a PLT 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 PCREL
-             reloc instead.  */
-          h->plt.offset = (bfd_vma) -1;
-          h->needs_plt = 0;
-        }
+       {
+         /* This case can occur if we saw a PLT 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 PCREL
+            reloc instead.  */
+         h->plt.offset = (bfd_vma) -1;
+         h->needs_plt = 0;
+       }
 
       return TRUE;
     }
@@ -1822,12 +1652,12 @@ lm32_elf_adjust_dynamic_symbol (struct bfd_link_info *info,
   /* 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->u.weakdef != NULL)
+  if (h->is_weakalias)
     {
-      BFD_ASSERT (h->u.weakdef->root.type == bfd_link_hash_defined
-                  || h->u.weakdef->root.type == bfd_link_hash_defweak);
-      h->root.u.def.section = h->u.weakdef->root.u.def.section;
-      h->root.u.def.value = h->u.weakdef->root.u.def.value;
+      struct elf_link_hash_entry *def = weakdef (h);
+      BFD_ASSERT (def->root.type == bfd_link_hash_defined);
+      h->root.u.def.section = def->root.u.def.section;
+      h->root.u.def.value = def->root.u.def.value;
       return TRUE;
     }
 
@@ -1838,7 +1668,7 @@ lm32_elf_adjust_dynamic_symbol (struct bfd_link_info *info,
      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)
+  if (bfd_link_pic (info))
     return TRUE;
 
   /* If there are no references to this symbol that do not use the
@@ -1847,36 +1677,20 @@ lm32_elf_adjust_dynamic_symbol (struct bfd_link_info *info,
     return TRUE;
 
   /* If -z nocopyreloc was given, we won't generate them either.  */
-  if (info->nocopyreloc)
+  if (0 && info->nocopyreloc)
     {
       h->non_got_ref = 0;
       return TRUE;
     }
 
-  eh = (struct elf_lm32_link_hash_entry *) h;
-  for (p = eh->dyn_relocs; p != NULL; p = p->next)
-    {
-      s = p->sec->output_section;
-      if (s != NULL && (s->flags & (SEC_READONLY | SEC_HAS_CONTENTS)) != 0)
-        break;
-    }
-
-  /* If we didn't find any dynamic relocs in sections which needs the
-     copy reloc, then we'll be keeping the dynamic relocs and avoiding
-     the copy reloc.  */
-  if (p == NULL)
+  /* If we don't find any dynamic relocs in read-only sections, then
+     we'll be keeping the dynamic relocs and avoiding the copy reloc.  */
+  if (0 && !_bfd_elf_readonly_dynrelocs (h))
     {
       h->non_got_ref = 0;
       return TRUE;
     }
 
-  if (h->size == 0)
-    {
-      (*_bfd_error_handler) (_("dynamic variable `%s' is zero size"),
-                            h->root.root.string);
-      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
@@ -1898,7 +1712,7 @@ lm32_elf_adjust_dynamic_symbol (struct bfd_link_info *info,
      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)
+  if ((h->root.u.def.section->flags & SEC_ALLOC) != 0 && h->size != 0)
     {
       asection *srel;
 
@@ -1908,7 +1722,7 @@ lm32_elf_adjust_dynamic_symbol (struct bfd_link_info *info,
       h->needs_copy = 1;
     }
 
-  return _bfd_elf_adjust_dynamic_copy (h, s);
+  return _bfd_elf_adjust_dynamic_copy (info, h, s);
 }
 
 /* Allocate space in .plt, .got and associated reloc sections for
@@ -1919,75 +1733,66 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void * inf)
 {
   struct bfd_link_info *info;
   struct elf_lm32_link_hash_table *htab;
-  struct elf_lm32_link_hash_entry *eh;
-  struct elf_lm32_dyn_relocs *p;
+  struct elf_dyn_relocs *p;
 
   if (h->root.type == bfd_link_hash_indirect)
     return TRUE;
 
-  if (h->root.type == bfd_link_hash_warning)
-    /* When warning symbols are created, they **replace** the "real"
-       entry in the hash table, thus we never get to see the real
-       symbol in a hash traversal.  So look at it now.  */
-    h = (struct elf_link_hash_entry *) h->root.u.i.link;
-
   info = (struct bfd_link_info *) inf;
   htab = lm32_elf_hash_table (info);
   if (htab == NULL)
     return FALSE;
 
-  eh = (struct elf_lm32_link_hash_entry *) h;
-
   if (htab->root.dynamic_sections_created
       && h->plt.refcount > 0)
     {
       /* Make sure this symbol is output as a dynamic symbol.
-         Undefined weak syms won't yet be marked as dynamic.  */
+        Undefined weak syms won't yet be marked as dynamic.  */
       if (h->dynindx == -1
-          && !h->forced_local)
-        {
-          if (! bfd_elf_link_record_dynamic_symbol (info, h))
-            return FALSE;
-        }
-
-      if (WILL_CALL_FINISH_DYNAMIC_SYMBOL (1, info->shared, h))
-        {
-          asection *s = htab->splt;
-
-          /* If this is the first .plt entry, make room for the special
-             first entry.  */
-          if (s->size == 0)
-            s->size += PLT_ENTRY_SIZE;
-
-          h->plt.offset = s->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->def_regular)
-            {
-              h->root.u.def.section = s;
-              h->root.u.def.value = h->plt.offset;
-            }
-
-          /* Make room for this entry.  */
-          s->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.  */
-          htab->sgotplt->size += 4;
-
-          /* We also need to make an entry in the .rel.plt section.  */
-          htab->srelplt->size += sizeof (Elf32_External_Rela);
-        }
+         && !h->forced_local)
+       {
+         if (! bfd_elf_link_record_dynamic_symbol (info, h))
+           return FALSE;
+       }
+
+      if (WILL_CALL_FINISH_DYNAMIC_SYMBOL (1, bfd_link_pic (info), h))
+       {
+         asection *s = htab->root.splt;
+
+         /* If this is the first .plt entry, make room for the special
+            first entry.  */
+         if (s->size == 0)
+           s->size += PLT_ENTRY_SIZE;
+
+         h->plt.offset = s->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 (! bfd_link_pic (info)
+             && !h->def_regular)
+           {
+             h->root.u.def.section = s;
+             h->root.u.def.value = h->plt.offset;
+           }
+
+         /* Make room for this entry.  */
+         s->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.  */
+         htab->root.sgotplt->size += 4;
+
+         /* We also need to make an entry in the .rel.plt section.  */
+         htab->root.srelplt->size += sizeof (Elf32_External_Rela);
+       }
       else
-        {
-          h->plt.offset = (bfd_vma) -1;
-          h->needs_plt = 0;
-        }
+       {
+         h->plt.offset = (bfd_vma) -1;
+         h->needs_plt = 0;
+       }
     }
   else
     {
@@ -2001,26 +1806,26 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void * inf)
       bfd_boolean dyn;
 
       /* Make sure this symbol is output as a dynamic symbol.
-         Undefined weak syms won't yet be marked as dynamic.  */
+        Undefined weak syms won't yet be marked as dynamic.  */
       if (h->dynindx == -1
-          && !h->forced_local)
-        {
-          if (! bfd_elf_link_record_dynamic_symbol (info, h))
-            return FALSE;
-        }
+         && !h->forced_local)
+       {
+         if (! bfd_elf_link_record_dynamic_symbol (info, h))
+           return FALSE;
+       }
 
-      s = htab->sgot;
+      s = htab->root.sgot;
 
       h->got.offset = s->size;
       s->size += 4;
       dyn = htab->root.dynamic_sections_created;
-      if (WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, info->shared, h))
-        htab->srelgot->size += sizeof (Elf32_External_Rela);
+      if (WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, bfd_link_pic (info), h))
+       htab->root.srelgot->size += sizeof (Elf32_External_Rela);
     }
   else
     h->got.offset = (bfd_vma) -1;
 
-  if (eh->dyn_relocs == NULL)
+  if (h->dyn_relocs == NULL)
     return TRUE;
 
   /* In the shared -Bsymbolic case, discard space allocated for
@@ -2029,32 +1834,32 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void * inf)
      space for pc-relative relocs that have become local due to symbol
      visibility changes.  */
 
-  if (info->shared)
+  if (bfd_link_pic (info))
     {
       if (h->def_regular
-          && (h->forced_local
-              || info->symbolic))
-        {
-          struct elf_lm32_dyn_relocs **pp;
-
-          for (pp = &eh->dyn_relocs; (p = *pp) != NULL;)
-            {
-              p->count -= p->pc_count;
-              p->pc_count = 0;
-              if (p->count == 0)
-                *pp = p->next;
-              else
-                pp = &p->next;
-            }
-        }
+         && (h->forced_local
+             || info->symbolic))
+       {
+         struct elf_dyn_relocs **pp;
+
+         for (pp = &h->dyn_relocs; (p = *pp) != NULL;)
+           {
+             p->count -= p->pc_count;
+             p->pc_count = 0;
+             if (p->count == 0)
+               *pp = p->next;
+             else
+               pp = &p->next;
+           }
+       }
 
       /* Also discard relocs on undefined weak syms with non-default
         visibility.  */
-      if (eh->dyn_relocs != NULL
+      if (h->dyn_relocs != NULL
          && h->root.type == bfd_link_hash_undefweak)
        {
          if (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT)
-           eh->dyn_relocs = NULL;
+           h->dyn_relocs = NULL;
 
          /* Make sure undefined weak symbols are output as a dynamic
             symbol in PIEs.  */
@@ -2069,38 +1874,38 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void * inf)
   else
     {
       /* For the non-shared case, discard space for relocs against
-         symbols which turn out to need copy relocs or are not
-         dynamic.  */
+        symbols which turn out to need copy relocs or are not
+        dynamic.  */
 
       if (!h->non_got_ref
-          && ((h->def_dynamic
-               && !h->def_regular)
-              || (htab->root.dynamic_sections_created
-                  && (h->root.type == bfd_link_hash_undefweak
-                      || h->root.type == bfd_link_hash_undefined))))
-        {
-          /* Make sure this symbol is output as a dynamic symbol.
-             Undefined weak syms won't yet be marked as dynamic.  */
-          if (h->dynindx == -1
-              && !h->forced_local)
-            {
-              if (! bfd_elf_link_record_dynamic_symbol (info, h))
-                return FALSE;
-            }
-
-          /* If that succeeded, we know we'll be keeping all the
-             relocs.  */
-          if (h->dynindx != -1)
-            goto keep;
-        }
-
-      eh->dyn_relocs = NULL;
+         && ((h->def_dynamic
+              && !h->def_regular)
+             || (htab->root.dynamic_sections_created
+                 && (h->root.type == bfd_link_hash_undefweak
+                     || h->root.type == bfd_link_hash_undefined))))
+       {
+         /* Make sure this symbol is output as a dynamic symbol.
+            Undefined weak syms won't yet be marked as dynamic.  */
+         if (h->dynindx == -1
+             && !h->forced_local)
+           {
+             if (! bfd_elf_link_record_dynamic_symbol (info, h))
+               return FALSE;
+           }
+
+         /* If that succeeded, we know we'll be keeping all the
+            relocs.  */
+         if (h->dynindx != -1)
+           goto keep;
+       }
+
+      h->dyn_relocs = NULL;
 
     keep: ;
     }
 
   /* Finally, allocate space.  */
-  for (p = eh->dyn_relocs; p != NULL; p = p->next)
+  for (p = h->dyn_relocs; p != NULL; p = p->next)
     {
       asection *sreloc = elf_section_data (p->sec)->sreloc;
       sreloc->size += p->count * sizeof (Elf32_External_Rela);
@@ -2109,40 +1914,11 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void * inf)
   return TRUE;
 }
 
-/* Find any dynamic relocs that apply to read-only sections.  */
-
-static bfd_boolean
-readonly_dynrelocs (struct elf_link_hash_entry *h, void * inf)
-{
-  struct elf_lm32_link_hash_entry *eh;
-  struct elf_lm32_dyn_relocs *p;
-
-  if (h->root.type == bfd_link_hash_warning)
-    h = (struct elf_link_hash_entry *) h->root.u.i.link;
-
-  eh = (struct elf_lm32_link_hash_entry *) h;
-  for (p = eh->dyn_relocs; p != NULL; p = p->next)
-    {
-      asection *s = p->sec->output_section;
-
-      if (s != NULL && (s->flags & SEC_READONLY) != 0)
-        {
-          struct bfd_link_info *info = (struct bfd_link_info *) inf;
-
-          info->flags |= DF_TEXTREL;
-
-          /* Not an error, just cut short the traversal.  */
-          return FALSE;
-        }
-    }
-  return TRUE;
-}
-
 /* Set the sizes of the dynamic sections.  */
 
 static bfd_boolean
 lm32_elf_size_dynamic_sections (bfd *output_bfd,
-                                struct bfd_link_info *info)
+                               struct bfd_link_info *info)
 {
   struct elf_lm32_link_hash_table *htab;
   bfd *dynobj;
@@ -2160,9 +1936,9 @@ lm32_elf_size_dynamic_sections (bfd *output_bfd,
   if (htab->root.dynamic_sections_created)
     {
       /* Set the contents of the .interp section to the interpreter.  */
-      if (info->executable)
+      if (bfd_link_executable (info) && !info->nointerp)
        {
-         s = bfd_get_section_by_name (dynobj, ".interp");
+         s = bfd_get_linker_section (dynobj, ".interp");
          BFD_ASSERT (s != NULL);
          s->size = sizeof ELF_DYNAMIC_INTERPRETER;
          s->contents = (unsigned char *) ELF_DYNAMIC_INTERPRETER;
@@ -2171,7 +1947,7 @@ lm32_elf_size_dynamic_sections (bfd *output_bfd,
 
   /* Set up .got offsets for local syms, and space for local dynamic
      relocs.  */
-  for (ibfd = info->input_bfds; ibfd != NULL; ibfd = ibfd->link_next)
+  for (ibfd = info->input_bfds; ibfd != NULL; ibfd = ibfd->link.next)
     {
       bfd_signed_vma *local_got;
       bfd_signed_vma *end_local_got;
@@ -2180,56 +1956,56 @@ lm32_elf_size_dynamic_sections (bfd *output_bfd,
       asection *srel;
 
       if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour)
-        continue;
+       continue;
 
       for (s = ibfd->sections; s != NULL; s = s->next)
-        {
-          struct elf_lm32_dyn_relocs *p;
-
-          for (p = ((struct elf_lm32_dyn_relocs *)
-                    elf_section_data (s)->local_dynrel);
-               p != NULL;
-               p = p->next)
-            {
-              if (! bfd_is_abs_section (p->sec)
-                  && bfd_is_abs_section (p->sec->output_section))
-                {
-                  /* Input section has been discarded, either because
-                     it is a copy of a linkonce section or due to
-                     linker script /DISCARD/, so we'll be discarding
-                     the relocs too.  */
-                }
-              else if (p->count != 0)
-                {
-                  srel = elf_section_data (p->sec)->sreloc;
-                  srel->size += p->count * sizeof (Elf32_External_Rela);
-                  if ((p->sec->output_section->flags & SEC_READONLY) != 0)
-                    info->flags |= DF_TEXTREL;
-                }
-            }
-        }
+       {
+         struct elf_dyn_relocs *p;
+
+         for (p = ((struct elf_dyn_relocs *)
+                   elf_section_data (s)->local_dynrel);
+              p != NULL;
+              p = p->next)
+           {
+             if (! bfd_is_abs_section (p->sec)
+                 && bfd_is_abs_section (p->sec->output_section))
+               {
+                 /* Input section has been discarded, either because
+                    it is a copy of a linkonce section or due to
+                    linker script /DISCARD/, so we'll be discarding
+                    the relocs too.  */
+               }
+             else if (p->count != 0)
+               {
+                 srel = elf_section_data (p->sec)->sreloc;
+                 srel->size += p->count * sizeof (Elf32_External_Rela);
+                 if ((p->sec->output_section->flags & SEC_READONLY) != 0)
+                   info->flags |= DF_TEXTREL;
+               }
+           }
+       }
 
       local_got = elf_local_got_refcounts (ibfd);
       if (!local_got)
-        continue;
+       continue;
 
       symtab_hdr = &elf_tdata (ibfd)->symtab_hdr;
       locsymcount = symtab_hdr->sh_info;
       end_local_got = local_got + locsymcount;
-      s = htab->sgot;
-      srel = htab->srelgot;
+      s = htab->root.sgot;
+      srel = htab->root.srelgot;
       for (; local_got < end_local_got; ++local_got)
-        {
-          if (*local_got > 0)
-            {
-              *local_got = s->size;
-              s->size += 4;
-              if (info->shared)
-                srel->size += sizeof (Elf32_External_Rela);
-            }
-          else
-            *local_got = (bfd_vma) -1;
-        }
+       {
+         if (*local_got > 0)
+           {
+             *local_got = s->size;
+             s->size += 4;
+             if (bfd_link_pic (info))
+               srel->size += sizeof (Elf32_External_Rela);
+           }
+         else
+           *local_got = (bfd_vma) -1;
+       }
     }
 
   /* Allocate global sym .plt and .got entries, and space for global
@@ -2242,55 +2018,55 @@ lm32_elf_size_dynamic_sections (bfd *output_bfd,
   for (s = dynobj->sections; s != NULL; s = s->next)
     {
       if ((s->flags & SEC_LINKER_CREATED) == 0)
-        continue;
+       continue;
 
-      if (s == htab->splt
-          || s == htab->sgot
-          || s == htab->sgotplt
+      if (s == htab->root.splt
+         || s == htab->root.sgot
+         || s == htab->root.sgotplt
          || s == htab->sdynbss)
-        {
-          /* Strip this section if we don't need it; see the
-             comment below.  */
-        }
-      else if (CONST_STRNEQ (bfd_get_section_name (dynobj, s), ".rela"))
-        {
-          if (s->size != 0 && s != htab->srelplt)
-            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;
-        }
+       {
+         /* Strip this section if we don't need it; see the
+            comment below.  */
+       }
+      else if (CONST_STRNEQ (bfd_section_name (s), ".rela"))
+       {
+         if (s->size != 0 && s != htab->root.srelplt)
+           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
        /* It's not one of our sections, so don't allocate space.  */
        continue;
 
       if (s->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.  */
-          s->flags |= SEC_EXCLUDE;
-          continue;
-        }
+       {
+         /* 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.  */
+         s->flags |= SEC_EXCLUDE;
+         continue;
+       }
 
       if ((s->flags & SEC_HAS_CONTENTS) == 0)
        continue;
 
       /* Allocate memory for the section contents.  We use bfd_zalloc
-         here in case unused entries are not reclaimed before the
-         section's contents are written out.  This should not happen,
-         but this way if it does, we get a R_LM32_NONE reloc instead
-         of garbage.  */
+        here in case unused entries are not reclaimed before the
+        section's contents are written out.  This should not happen,
+        but this way if it does, we get a R_LM32_NONE reloc instead
+        of garbage.  */
       s->contents = bfd_zalloc (dynobj, s->size);
       if (s->contents == NULL)
-        return FALSE;
+       return FALSE;
     }
 
   if (htab->root.dynamic_sections_created)
@@ -2303,41 +2079,41 @@ lm32_elf_size_dynamic_sections (bfd *output_bfd,
 #define add_dynamic_entry(TAG, VAL) \
   _bfd_elf_add_dynamic_entry (info, TAG, VAL)
 
-     if (info->executable)
+     if (bfd_link_executable (info))
        {
          if (! add_dynamic_entry (DT_DEBUG, 0))
            return FALSE;
        }
 
-      if (htab->splt->size != 0)
-        {
-          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 (htab->root.splt->size != 0)
+       {
+         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 any dynamic relocs apply to a read-only section,
-             then we need a DT_TEXTREL entry.  */
-          if ((info->flags & DF_TEXTREL) == 0)
-            elf_link_hash_traverse (&htab->root, readonly_dynrelocs,
-                                    info);
-
-          if ((info->flags & DF_TEXTREL) != 0)
-            {
-              if (! add_dynamic_entry (DT_TEXTREL, 0))
-                return FALSE;
-            }
-        }
+       {
+         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 any dynamic relocs apply to a read-only section,
+            then we need a DT_TEXTREL entry.  */
+         if ((info->flags & DF_TEXTREL) == 0)
+           elf_link_hash_traverse (&htab->root,
+                                   _bfd_elf_maybe_set_textrel, info);
+
+         if ((info->flags & DF_TEXTREL) != 0)
+           {
+             if (! add_dynamic_entry (DT_TEXTREL, 0))
+               return FALSE;
+           }
+       }
     }
 #undef add_dynamic_entry
 
@@ -2349,121 +2125,122 @@ lm32_elf_size_dynamic_sections (bfd *output_bfd,
       int r32_count = 0;
       int rgot_count = 0;
       /* Look for deleted sections.  */
-      for (ibfd = info->input_bfds; ibfd != NULL; ibfd = ibfd->link_next)
-        {
-          for (s = ibfd->sections; s != NULL; s = s->next)
-            {
-              if (s->reloc_count)
-                {
-                  /* Count relocs that need .rofixup entires.  */
-                  Elf_Internal_Rela *internal_relocs, *end;
-                  internal_relocs = elf_section_data (s)->relocs;
-                  if (internal_relocs == NULL)
-                    internal_relocs = (_bfd_elf_link_read_relocs (ibfd, s, NULL, NULL, FALSE));
-                  if (internal_relocs != NULL)
-                    {
-                      end = internal_relocs + s->reloc_count;
-                      while (internal_relocs < end)
-                        {
-                          Elf_Internal_Shdr *symtab_hdr = &elf_tdata (ibfd)->symtab_hdr;
-                          struct elf_link_hash_entry **sym_hashes = elf_sym_hashes (ibfd);
-                          unsigned long r_symndx;
-                          struct elf_link_hash_entry *h;
-
-                          symtab_hdr = &elf_tdata (ibfd)->symtab_hdr;
-                          sym_hashes = elf_sym_hashes (ibfd);
-                          r_symndx = ELF32_R_SYM (internal_relocs->r_info);
-                          h = NULL;
-                          if (r_symndx < symtab_hdr->sh_info)
-                            {
-                            }
-                          else
-                            {
-                              h = sym_hashes[r_symndx - symtab_hdr->sh_info];
-                              while (h->root.type == bfd_link_hash_indirect
-                                     || h->root.type == bfd_link_hash_warning)
-                                h = (struct elf_link_hash_entry *) h->root.u.i.link;
-                              }
-
-                          /* Don't generate entries for weak symbols.  */
-                          if (!h || (h && h->root.type != bfd_link_hash_undefweak))
-                            {
-                              if (!elf_discarded_section (s) && !((bfd_get_section_flags (ibfd, s) & SEC_ALLOC) == 0))
-                                {
-                                  switch (ELF32_R_TYPE (internal_relocs->r_info))
-                                    {
-                                    case R_LM32_32:
-                                      r32_count++;
-                                      break;
-                                    case R_LM32_16_GOT:
-                                      rgot_count++;
-                                      break;
-                                    }
-                                }
-                            }
-                          else
-                            {
-                              struct weak_symbol_list *current, *new_entry;
-                              /* Is this symbol already in the list?  */
-                              for (current = list_start; current; current = current->next)
-                                {
-                                  if (!strcmp (current->name, h->root.root.string))
-                                    break;
-                                }
-                              if (!current && !elf_discarded_section (s) && (bfd_get_section_flags (ibfd, s) & SEC_ALLOC))
-                                {
-                                  /* Will this have an entry in the GOT.  */
-                                  if (ELF32_R_TYPE (internal_relocs->r_info) == R_LM32_16_GOT)
-                                    {
-                                      /* Create a new entry.  */
-                                      new_entry = malloc (sizeof (struct weak_symbol_list));
-                                      if (!new_entry)
-                                        return FALSE;
-                                      new_entry->name = h->root.root.string;
-                                      new_entry->next = NULL;
-                                      /* Add to list */
-                                      if (list_start == NULL)
-                                        {
-                                          list_start = new_entry;
-                                          list_end = new_entry;
-                                        }
-                                      else
-                                        {
-                                          list_end->next = new_entry;
-                                          list_end = new_entry;
-                                        }
-                                      /* Increase count of undefined weak symbols in the got.  */
-                                      rgot_weak_count++;
-                                    }
-                                }
-                            }
-                          internal_relocs++;
-                        }
-                    }
-                  else
-                    return FALSE;
-                }
-            }
-        }
+      for (ibfd = info->input_bfds; ibfd != NULL; ibfd = ibfd->link.next)
+       {
+         for (s = ibfd->sections; s != NULL; s = s->next)
+           {
+             if (s->reloc_count)
+               {
+                 /* Count relocs that need .rofixup entires.  */
+                 Elf_Internal_Rela *internal_relocs, *end;
+                 internal_relocs = elf_section_data (s)->relocs;
+                 if (internal_relocs == NULL)
+                   internal_relocs = (_bfd_elf_link_read_relocs (ibfd, s, NULL, NULL, FALSE));
+                 if (internal_relocs != NULL)
+                   {
+                     end = internal_relocs + s->reloc_count;
+                     while (internal_relocs < end)
+                       {
+                         Elf_Internal_Shdr *symtab_hdr = &elf_tdata (ibfd)->symtab_hdr;
+                         struct elf_link_hash_entry **sym_hashes = elf_sym_hashes (ibfd);
+                         unsigned long r_symndx;
+                         struct elf_link_hash_entry *h;
+
+                         symtab_hdr = &elf_tdata (ibfd)->symtab_hdr;
+                         sym_hashes = elf_sym_hashes (ibfd);
+                         r_symndx = ELF32_R_SYM (internal_relocs->r_info);
+                         h = NULL;
+                         if (r_symndx < symtab_hdr->sh_info)
+                           {
+                           }
+                         else
+                           {
+                             h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+                             while (h->root.type == bfd_link_hash_indirect
+                                    || h->root.type == bfd_link_hash_warning)
+                               h = (struct elf_link_hash_entry *) h->root.u.i.link;
+                             }
+
+                         /* Don't generate entries for weak symbols.  */
+                         if (!h || (h && h->root.type != bfd_link_hash_undefweak))
+                           {
+                             if (!discarded_section (s) && !((bfd_section_flags (s) & SEC_ALLOC) == 0))
+                               {
+                                 switch (ELF32_R_TYPE (internal_relocs->r_info))
+                                   {
+                                   case R_LM32_32:
+                                     r32_count++;
+                                     break;
+                                   case R_LM32_16_GOT:
+                                     rgot_count++;
+                                     break;
+                                   }
+                               }
+                           }
+                         else
+                           {
+                             struct weak_symbol_list *current, *new_entry;
+                             /* Is this symbol already in the list?  */
+                             for (current = list_start; current; current = current->next)
+                               {
+                                 if (!strcmp (current->name, h->root.root.string))
+                                   break;
+                               }
+                             if (!current && !discarded_section (s) && (bfd_section_flags (s) & SEC_ALLOC))
+                               {
+                                 /* Will this have an entry in the GOT.  */
+                                 if (ELF32_R_TYPE (internal_relocs->r_info) == R_LM32_16_GOT)
+                                   {
+                                     /* Create a new entry.  */
+                                     new_entry = malloc (sizeof (struct weak_symbol_list));
+                                     if (!new_entry)
+                                       return FALSE;
+                                     new_entry->name = h->root.root.string;
+                                     new_entry->next = NULL;
+                                     /* Add to list */
+                                     if (list_start == NULL)
+                                       {
+                                         list_start = new_entry;
+                                         list_end = new_entry;
+                                       }
+                                     else
+                                       {
+                                         list_end->next = new_entry;
+                                         list_end = new_entry;
+                                       }
+                                     /* Increase count of undefined weak symbols in the got.  */
+                                     rgot_weak_count++;
+                                   }
+                               }
+                           }
+                         internal_relocs++;
+                       }
+                   }
+                 else
+                   return FALSE;
+               }
+           }
+       }
       /* Free list.  */
       while (list_start)
-        {
-          list_end = list_start->next;
-          free (list_start);
-          list_start = list_end;
-        }
+       {
+         list_end = list_start->next;
+         free (list_start);
+         list_start = list_end;
+       }
 
       /* Size sections.  */
-      lm32fdpic_fixup32_section (info)->size = (r32_count + (htab->sgot->size / 4) - rgot_weak_count + 1) * 4;
+      lm32fdpic_fixup32_section (info)->size
+       = (r32_count + (htab->root.sgot->size / 4) - rgot_weak_count + 1) * 4;
       if (lm32fdpic_fixup32_section (info)->size == 0)
-        lm32fdpic_fixup32_section (info)->flags |= SEC_EXCLUDE;
+       lm32fdpic_fixup32_section (info)->flags |= SEC_EXCLUDE;
       else
-        {
-          lm32fdpic_fixup32_section (info)->contents =
-            bfd_zalloc (dynobj, lm32fdpic_fixup32_section (info)->size);
-          if (lm32fdpic_fixup32_section (info)->contents == NULL)
-           return FALSE;
-        }
+       {
+         lm32fdpic_fixup32_section (info)->contents =
+            bfd_zalloc (dynobj, lm32fdpic_fixup32_section (info)->size);
+         if (lm32fdpic_fixup32_section (info)->contents == NULL)
+           return FALSE;
+       }
     }
 
   return TRUE;
@@ -2486,18 +2263,18 @@ lm32_elf_create_dynamic_sections (bfd *abfd, struct bfd_link_info *info)
 
   /* Make sure we have a GOT - For the case where we have a dynamic object
      but none of the relocs in check_relocs */
-  if (! create_got_section (abfd, info))
+  if (!_bfd_elf_create_got_section (abfd, info))
     return FALSE;
   if (IS_FDPIC (abfd) && (htab->sfixup32 == NULL))
     {
       if (! create_rofixup_section (abfd, info))
-        return FALSE;
+       return FALSE;
     }
 
   /* We need to create .plt, .rel[a].plt, .got, .got.plt, .dynbss, and
      .rel[a].bss sections.  */
   flags = (SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS | SEC_IN_MEMORY
-           | SEC_LINKER_CREATED);
+          | SEC_LINKER_CREATED);
 
   pltflags = flags;
   pltflags |= SEC_CODE;
@@ -2506,191 +2283,81 @@ lm32_elf_create_dynamic_sections (bfd *abfd, struct bfd_link_info *info)
   if (bed->plt_readonly)
     pltflags |= SEC_READONLY;
 
-  s = bfd_make_section_with_flags (abfd, ".plt", pltflags);
-  htab->splt = s;
+  s = bfd_make_section_anyway_with_flags (abfd, ".plt", pltflags);
+  htab->root.splt = s;
   if (s == NULL
-      || ! bfd_set_section_alignment (abfd, s, bed->plt_alignment))
+      || !bfd_set_section_alignment (s, bed->plt_alignment))
     return FALSE;
 
   if (bed->want_plt_sym)
     {
       /* Define the symbol _PROCEDURE_LINKAGE_TABLE_ at the start of the
-         .plt section.  */
+        .plt section.  */
       struct bfd_link_hash_entry *bh = NULL;
       struct elf_link_hash_entry *h;
 
       if (! (_bfd_generic_link_add_one_symbol
-             (info, abfd, "_PROCEDURE_LINKAGE_TABLE_", BSF_GLOBAL, s,
-              (bfd_vma) 0, NULL, FALSE,
-              get_elf_backend_data (abfd)->collect, &bh)))
-        return FALSE;
+            (info, abfd, "_PROCEDURE_LINKAGE_TABLE_", BSF_GLOBAL, s,
+             (bfd_vma) 0, NULL, FALSE,
+             get_elf_backend_data (abfd)->collect, &bh)))
+       return FALSE;
       h = (struct elf_link_hash_entry *) bh;
       h->def_regular = 1;
       h->type = STT_OBJECT;
       htab->root.hplt = h;
 
-      if (info->shared
-          && ! bfd_elf_link_record_dynamic_symbol (info, h))
-        return FALSE;
+      if (bfd_link_pic (info)
+         && ! bfd_elf_link_record_dynamic_symbol (info, h))
+       return FALSE;
     }
 
-  s = bfd_make_section_with_flags (abfd,
-                                  bed->default_use_rela_p ? ".rela.plt" : ".rel.plt",
-                                  flags | SEC_READONLY);
-  htab->srelplt = s;
+  s = bfd_make_section_anyway_with_flags (abfd,
+                                         bed->default_use_rela_p
+                                         ? ".rela.plt" : ".rel.plt",
+                                         flags | SEC_READONLY);
+  htab->root.srelplt = s;
   if (s == NULL
-      || ! bfd_set_section_alignment (abfd, s, ptralign))
+      || !bfd_set_section_alignment (s, ptralign))
     return FALSE;
 
-  if (htab->sgot == NULL
-      && ! create_got_section (abfd, info))
+  if (htab->root.sgot == NULL
+      && !_bfd_elf_create_got_section (abfd, info))
     return FALSE;
 
-  {
-    const char *secname;
-    char *relname;
-    flagword secflags;
-    asection *sec;
-
-    for (sec = abfd->sections; sec; sec = sec->next)
-      {
-        secflags = bfd_get_section_flags (abfd, sec);
-        if ((secflags & (SEC_DATA | SEC_LINKER_CREATED))
-            || ((secflags & SEC_HAS_CONTENTS) != SEC_HAS_CONTENTS))
-          continue;
-        secname = bfd_get_section_name (abfd, sec);
-        relname = bfd_malloc ((bfd_size_type) strlen (secname) + 6);
-        strcpy (relname, ".rela");
-        strcat (relname, secname);
-        if (bfd_get_section_by_name (abfd, secname))
-          continue;
-        s = bfd_make_section_with_flags (abfd, relname,
-                                        flags | SEC_READONLY);
-        if (s == NULL
-            || ! bfd_set_section_alignment (abfd, s, ptralign))
-          return FALSE;
-      }
-  }
-
   if (bed->want_dynbss)
     {
       /* The .dynbss section is a place to put symbols which are defined
-         by dynamic objects, are referenced by regular objects, and are
-         not functions.  We must allocate space for them in the process
-         image and use a R_*_COPY reloc to tell the dynamic linker to
-         initialize them at run time.  The linker script puts the .dynbss
-         section into the .bss section of the final image.  */
-      s = bfd_make_section_with_flags (abfd, ".dynbss",
-                                      SEC_ALLOC | SEC_LINKER_CREATED);
+        by dynamic objects, are referenced by regular objects, and are
+        not functions.  We must allocate space for them in the process
+        image and use a R_*_COPY reloc to tell the dynamic linker to
+        initialize them at run time.  The linker script puts the .dynbss
+        section into the .bss section of the final image.  */
+      s = bfd_make_section_anyway_with_flags (abfd, ".dynbss",
+                                             SEC_ALLOC | SEC_LINKER_CREATED);
       htab->sdynbss = s;
       if (s == NULL)
-        return FALSE;
+       return FALSE;
       /* The .rel[a].bss section holds copy relocs.  This section is not
-         normally needed.  We need to create it here, though, so that the
-         linker will map it to an output section.  We can't just create it
-         only if we need it, because we will not know whether we need it
-         until we have seen all the input files, and the first time the
-         main linker code calls BFD after examining all the input files
-         (size_dynamic_sections) the input sections have already been
-         mapped to the output sections.  If the section turns out not to
-         be needed, we can discard it later.  We will never need this
-         section when generating a shared object, since they do not use
-         copy relocs.  */
-      if (! info->shared)
-        {
-          s = bfd_make_section_with_flags (abfd,
-                                          (bed->default_use_rela_p
-                                           ? ".rela.bss" : ".rel.bss"),
-                                          flags | SEC_READONLY);
-          htab->srelbss = s;
-          if (s == NULL
-              || ! bfd_set_section_alignment (abfd, s, ptralign))
-            return FALSE;
-        }
-    }
-
-  return TRUE;
-}
-
-/* Copy the extra info we tack onto an elf_link_hash_entry.  */
-
-static void
-lm32_elf_copy_indirect_symbol (struct bfd_link_info *info,
-                               struct elf_link_hash_entry *dir,
-                               struct elf_link_hash_entry *ind)
-{
-  struct elf_lm32_link_hash_entry * edir;
-  struct elf_lm32_link_hash_entry * eind;
-
-  edir = (struct elf_lm32_link_hash_entry *) dir;
-  eind = (struct elf_lm32_link_hash_entry *) ind;
-
-  if (eind->dyn_relocs != NULL)
-    {
-      if (edir->dyn_relocs != NULL)
-        {
-          struct elf_lm32_dyn_relocs **pp;
-          struct elf_lm32_dyn_relocs *p;
-
-          /* Add reloc counts against the indirect sym to the direct sym
-             list.  Merge any entries against the same section.  */
-          for (pp = &eind->dyn_relocs; (p = *pp) != NULL;)
-            {
-              struct elf_lm32_dyn_relocs *q;
-
-              for (q = edir->dyn_relocs; q != NULL; q = q->next)
-                if (q->sec == p->sec)
-                  {
-                    q->pc_count += p->pc_count;
-                    q->count += p->count;
-                    *pp = p->next;
-                    break;
-                  }
-              if (q == NULL)
-                pp = &p->next;
-            }
-          *pp = edir->dyn_relocs;
-        }
-
-      edir->dyn_relocs = eind->dyn_relocs;
-      eind->dyn_relocs = NULL;
-    }
-
-  _bfd_elf_link_hash_copy_indirect (info, dir, ind);
-}
-
-static bfd_boolean
-lm32_elf_always_size_sections (bfd *output_bfd,
-                                struct bfd_link_info *info)
-{
-  if (!info->relocatable)
-    {
-      struct elf_link_hash_entry *h;
-
-      /* Force a PT_GNU_STACK segment to be created.  */
-      if (! elf_tdata (output_bfd)->stack_flags)
-       elf_tdata (output_bfd)->stack_flags = PF_R | PF_W | PF_X;
-
-      /* Define __stacksize if it's not defined yet.  */
-      h = elf_link_hash_lookup (elf_hash_table (info), "__stacksize",
-                               FALSE, FALSE, FALSE);
-      if (! h || h->root.type != bfd_link_hash_defined
-         || h->type != STT_OBJECT
-         || !h->def_regular)
+        normally needed.  We need to create it here, though, so that the
+        linker will map it to an output section.  We can't just create it
+        only if we need it, because we will not know whether we need it
+        until we have seen all the input files, and the first time the
+        main linker code calls BFD after examining all the input files
+        (size_dynamic_sections) the input sections have already been
+        mapped to the output sections.  If the section turns out not to
+        be needed, we can discard it later.  We will never need this
+        section when generating a shared object, since they do not use
+        copy relocs.  */
+      if (! bfd_link_pic (info))
        {
-         struct bfd_link_hash_entry *bh = NULL;
-
-         if (!(_bfd_generic_link_add_one_symbol
-               (info, output_bfd, "__stacksize",
-                BSF_GLOBAL, bfd_abs_section_ptr, DEFAULT_STACK_SIZE,
-                (const char *) NULL, FALSE,
-                get_elf_backend_data (output_bfd)->collect, &bh)))
+         s = bfd_make_section_anyway_with_flags (abfd,
+                                                 (bed->default_use_rela_p
+                                                  ? ".rela.bss" : ".rel.bss"),
+                                                 flags | SEC_READONLY);
+         htab->srelbss = s;
+         if (s == NULL
+             || !bfd_set_section_alignment (s, ptralign))
            return FALSE;
-
-         h = (struct elf_link_hash_entry *) bh;
-         h->def_regular = 1;
-         h->type = STT_OBJECT;
-         /* This one must NOT be hidden.  */
        }
     }
 
@@ -2698,117 +2365,22 @@ lm32_elf_always_size_sections (bfd *output_bfd,
 }
 
 static bfd_boolean
-lm32_elf_modify_segment_map (bfd *output_bfd,
-                            struct bfd_link_info *info)
+lm32_elf_always_size_sections (bfd *output_bfd, struct bfd_link_info *info)
 {
-  struct elf_segment_map *m;
-
-  /* objcopy and strip preserve what's already there using elf32_lm32fdpic_copy_
-     private_bfd_data ().  */
-  if (! info)
-    return TRUE;
-
-  for (m = elf_tdata (output_bfd)->segment_map; m != NULL; m = m->next)
-    if (m->p_type == PT_GNU_STACK)
-      break;
-
-  if (m)
+  if (!bfd_link_relocatable (info))
     {
-      asection *sec = bfd_get_section_by_name (output_bfd, ".stack");
-      struct elf_link_hash_entry *h;
+      if (!bfd_elf_stack_segment_size (output_bfd, info,
+                                      "__stacksize", DEFAULT_STACK_SIZE))
+       return FALSE;
 
+      asection *sec = bfd_get_section_by_name (output_bfd, ".stack");
       if (sec)
-       {
-         /* Obtain the pointer to the __stacksize symbol.  */
-         h = elf_link_hash_lookup (elf_hash_table (info), "__stacksize",
-                                   FALSE, FALSE, FALSE);
-         while (h->root.type == bfd_link_hash_indirect
-                || h->root.type == bfd_link_hash_warning)
-           h = (struct elf_link_hash_entry *)h->root.u.i.link;
-         BFD_ASSERT (h->root.type == bfd_link_hash_defined);
-
-         /* Set the section size from the symbol value.  We
-            intentionally ignore the symbol section.  */
-         if (h->root.type == bfd_link_hash_defined)
-           sec->size = h->root.u.def.value;
-         else
-           sec->size = DEFAULT_STACK_SIZE;
-
-         /* Add the stack section to the PT_GNU_STACK segment,
-            such that its size and alignment requirements make it
-            to the segment.  */
-         m->sections[m->count] = sec;
-         m->count++;
-       }
-    }
-
-  return TRUE;
-}
-
-static bfd_boolean
-lm32_elf_modify_program_headers (bfd *output_bfd,
-                                      struct bfd_link_info *info)
-{
-  struct elf_obj_tdata *tdata = elf_tdata (output_bfd);
-  struct elf_segment_map *m;
-  Elf_Internal_Phdr *p;
-
-  if (! info)
-    return TRUE;
-
-  for (p = tdata->phdr, m = tdata->segment_map; m != NULL; m = m->next, p++)
-    if (m->p_type == PT_GNU_STACK)
-      break;
-
-  if (m)
-    {
-      struct elf_link_hash_entry *h;
-
-      /* Obtain the pointer to the __stacksize symbol.  */
-      h = elf_link_hash_lookup (elf_hash_table (info), "__stacksize",
-                               FALSE, FALSE, FALSE);
-      if (h)
-       {
-         while (h->root.type == bfd_link_hash_indirect
-                || h->root.type == bfd_link_hash_warning)
-           h = (struct elf_link_hash_entry *) h->root.u.i.link;
-         BFD_ASSERT (h->root.type == bfd_link_hash_defined);
-       }
-
-      /* Set the header p_memsz from the symbol value.  We
-        intentionally ignore the symbol section.  */
-      if (h && h->root.type == bfd_link_hash_defined)
-       p->p_memsz = h->root.u.def.value;
-      else
-       p->p_memsz = DEFAULT_STACK_SIZE;
-
-      p->p_align = 8;
+       sec->size = info->stacksize >= 0 ? info->stacksize : 0;
     }
 
   return TRUE;
 }
 
-
-static bfd_boolean
-lm32_elf_copy_private_bfd_data (bfd *ibfd, bfd *obfd)
-{
-  if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour
-      || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
-    return TRUE;
-
-  BFD_ASSERT (!elf_flags_init (obfd)
-             || elf_elfheader (obfd)->e_flags == elf_elfheader (ibfd)->e_flags);
-
-  elf_elfheader (obfd)->e_flags = elf_elfheader (ibfd)->e_flags;
-  elf_flags_init (obfd) = TRUE;
-
-  /* Copy object attributes.  */
-  _bfd_elf_copy_obj_attributes (ibfd, obfd);
-
-  return TRUE;
-}
-
-
 static bfd_boolean
 lm32_elf_fdpic_copy_private_bfd_data (bfd *ibfd, bfd *obfd)
 {
@@ -2818,7 +2390,7 @@ lm32_elf_fdpic_copy_private_bfd_data (bfd *ibfd, bfd *obfd)
       || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
     return TRUE;
 
-  if (! lm32_elf_copy_private_bfd_data (ibfd, obfd))
+  if (! _bfd_elf_copy_private_bfd_data (ibfd, obfd))
     return FALSE;
 
   if (! elf_tdata (ibfd) || ! elf_tdata (ibfd)->phdr
@@ -2852,39 +2424,40 @@ lm32_elf_fdpic_copy_private_bfd_data (bfd *ibfd, bfd *obfd)
 }
 
 
-#define ELF_ARCH                bfd_arch_lm32
-#define ELF_MACHINE_CODE        EM_LATTICEMICO32
-#define ELF_MAXPAGESIZE         0x1000
-
-#define TARGET_BIG_SYM          bfd_elf32_lm32_vec
-#define TARGET_BIG_NAME         "elf32-lm32"
-
-#define bfd_elf32_bfd_reloc_type_lookup         lm32_reloc_type_lookup
-#define bfd_elf32_bfd_reloc_name_lookup         lm32_reloc_name_lookup
-#define elf_info_to_howto                       lm32_info_to_howto_rela
-#define elf_info_to_howto_rel                   0
-#define elf_backend_rela_normal                 1
-#define elf_backend_object_p                    lm32_elf_object_p
-#define elf_backend_final_write_processing      lm32_elf_final_write_processing
-#define elf_backend_can_gc_sections             1
-#define elf_backend_can_refcount                1
-#define elf_backend_gc_mark_hook                lm32_elf_gc_mark_hook
-#define elf_backend_gc_sweep_hook               lm32_elf_gc_sweep_hook
-#define elf_backend_plt_readonly                1
-#define elf_backend_want_got_plt                1
-#define elf_backend_want_plt_sym                0
-#define elf_backend_got_header_size             12
-#define bfd_elf32_bfd_link_hash_table_create    lm32_elf_link_hash_table_create
-#define elf_backend_check_relocs                lm32_elf_check_relocs
-#define elf_backend_reloc_type_class            lm32_elf_reloc_type_class
-#define elf_backend_copy_indirect_symbol        lm32_elf_copy_indirect_symbol
-#define elf_backend_size_dynamic_sections       lm32_elf_size_dynamic_sections
-#define elf_backend_omit_section_dynsym         ((bfd_boolean (*) (bfd *, struct bfd_link_info *, asection *)) bfd_true)
-#define elf_backend_create_dynamic_sections     lm32_elf_create_dynamic_sections
-#define elf_backend_finish_dynamic_sections     lm32_elf_finish_dynamic_sections
-#define elf_backend_adjust_dynamic_symbol       lm32_elf_adjust_dynamic_symbol
-#define elf_backend_finish_dynamic_symbol       lm32_elf_finish_dynamic_symbol
-#define elf_backend_relocate_section            lm32_elf_relocate_section
+#define ELF_ARCH               bfd_arch_lm32
+#define ELF_TARGET_ID          LM32_ELF_DATA
+#define ELF_MACHINE_CODE       EM_LATTICEMICO32
+#define ELF_MAXPAGESIZE                0x1000
+
+#define TARGET_BIG_SYM         lm32_elf32_vec
+#define TARGET_BIG_NAME                "elf32-lm32"
+
+#define bfd_elf32_bfd_reloc_type_lookup                lm32_reloc_type_lookup
+#define bfd_elf32_bfd_reloc_name_lookup                lm32_reloc_name_lookup
+#define elf_info_to_howto                      lm32_info_to_howto_rela
+#define elf_info_to_howto_rel                  NULL
+#define elf_backend_rela_normal                        1
+#define elf_backend_object_p                   lm32_elf_object_p
+#define elf_backend_final_write_processing     lm32_elf_final_write_processing
+#define elf_backend_stack_align                        8
+#define elf_backend_can_gc_sections            1
+#define elf_backend_can_refcount               1
+#define elf_backend_gc_mark_hook               lm32_elf_gc_mark_hook
+#define elf_backend_plt_readonly               1
+#define elf_backend_want_got_plt               1
+#define elf_backend_want_plt_sym               0
+#define elf_backend_got_header_size            12
+#define elf_backend_dtrel_excludes_plt         1
+#define bfd_elf32_bfd_link_hash_table_create   lm32_elf_link_hash_table_create
+#define elf_backend_check_relocs               lm32_elf_check_relocs
+#define elf_backend_reloc_type_class           lm32_elf_reloc_type_class
+#define elf_backend_size_dynamic_sections      lm32_elf_size_dynamic_sections
+#define elf_backend_omit_section_dynsym                _bfd_elf_omit_section_dynsym_all
+#define elf_backend_create_dynamic_sections    lm32_elf_create_dynamic_sections
+#define elf_backend_finish_dynamic_sections    lm32_elf_finish_dynamic_sections
+#define elf_backend_adjust_dynamic_symbol      lm32_elf_adjust_dynamic_symbol
+#define elf_backend_finish_dynamic_symbol      lm32_elf_finish_dynamic_symbol
+#define elf_backend_relocate_section           lm32_elf_relocate_section
 
 #include "elf32-target.h"
 
@@ -2893,19 +2466,15 @@ lm32_elf_fdpic_copy_private_bfd_data (bfd *ibfd, bfd *obfd)
 
 
 #undef  TARGET_BIG_SYM
-#define TARGET_BIG_SYM          bfd_elf32_lm32fdpic_vec
-#undef  TARGET_BIG_NAME
+#define TARGET_BIG_SYM         lm32_elf32_fdpic_vec
+#undef TARGET_BIG_NAME
 #define TARGET_BIG_NAME                "elf32-lm32fdpic"
 #undef elf32_bed
 #define        elf32_bed               elf32_lm32fdpic_bed
 
-#undef  elf_backend_always_size_sections
-#define elf_backend_always_size_sections        lm32_elf_always_size_sections
-#undef  elf_backend_modify_segment_map
-#define elf_backend_modify_segment_map          lm32_elf_modify_segment_map
-#undef  elf_backend_modify_program_headers
-#define elf_backend_modify_program_headers      lm32_elf_modify_program_headers
-#undef  bfd_elf32_bfd_copy_private_bfd_data
-#define bfd_elf32_bfd_copy_private_bfd_data     lm32_elf_fdpic_copy_private_bfd_data
+#undef elf_backend_always_size_sections
+#define elf_backend_always_size_sections       lm32_elf_always_size_sections
+#undef bfd_elf32_bfd_copy_private_bfd_data
+#define bfd_elf32_bfd_copy_private_bfd_data    lm32_elf_fdpic_copy_private_bfd_data
 
 #include "elf32-target.h"
This page took 0.106268 seconds and 4 git commands to generate.