* elf32-s390: Major rework that introduces all recent changes to

the s390 backends.  Get a closer match to elf32-i386.
(elf_s390_relocate_section): Make use of dynamic section short-cuts.
Localise vars, and delay setting.  Better error reporting, replace
BFD_ASSERT with abort.  Check ELF_LINK_HASH_DEF_DYNAMIC to see if a
symbol is not defined in the regular object file and tread the weak
definition as the normal one.  Don't discard relocs for undefweak or
undefined symbols and check !DEF_REGULAR as well as DEF_DYNAMIC in
test for avoided copy relocs.  Reinstate fudge for unresolved relocs
in debugging sections.
(elf32_s390_adjust_dynamic_symbol): Handle nocopyreloc.  Don't do copy
reloc processing for weakdefs.  Remove redundant casts and aborts.
Delay setting of vars until needed.  Move creation of dynamic symbols
and allocation of .plt and .rela.plt to allocate_dynrelocs.  Replace
BFD_ASSERT with abort.  Discard .plt entries for everything with
plt.refcount <= 0.
(elf_s390_check_relocs):  Don't allocate space for dynamic relocs,
.got or .relgot here but do it in allocate_dynrelocs.  Reference count
possible .plt and .got entries.  Don't test input section SEC_READONLY
here to try to avoid copy relocs, and keep dyn_relocs regardless of
ELF_LINK_NON_GOT_REF.  Don't set DF_TEXTREL here.  Delay setting of
variables until needed.  Remove separate switch stmt for creating .got
section.  Initialise local_got_refcounts to 0.  Cache pointer to
"sreloc" section in elf_section_data. Tweak condition under which .got
created.  Report files with bad relocation section names.
(elf_s390_finish_dynamic_symbol): Don't copy relocs for symbols that
have been forced local.  Use same test to decide if we can use a
relative reloc for got as elf_s390_relocate_section.  Expand SHN_UNDEF
comment.  Move expressions out of function calls.  Replace BFD_ASSERT
with abort.
(elf_s390_finish_dynamic_sections): Migrate common code out of switch
statement.  Replace BFD_ASSERT with abort.
(elf_s390_size_dynamic_sections): Call readonly_dynrelocs. Rename "i"
to "ibfd".  Allocate space for local dyn relocs.  Use DF_TEXTREL flag
instead of looking up section names for DT_TEXTREL.  Replace
BFD_ASSERT with abort.  Zero out the dynamic allocated content space.
Add a comment to remind us that one day this ought to be fixed.
(struct elf_s390_link_hash_entry): Rename "root" to "elf".
(struct elf_s390_link_hash_table): Likewise.
(elf_s390_link_hash_newfunc): Rename to link_hash_newfunc and get
rid of unnecessary casts.
(struct elf_s390_dyn_relocs): Add "sec", and "pc_count" fields.
Remove "section" field.
(elf_s390_gc_sweep_hook): Sweep dyn_relocs and local_dynrel.
Reference count possible .plt entries.  Don't deallocate .got and
.relgot space here.
(struct elf_s390_pcrel_relocs_copied): Rename to elf_s390_dyn_relocs.
Update comment.
(struct elf_s390_link_hash_entry): Rename pcrel_relocs_copied to
dyn_relocs.
(elf_s390_discard_copies):  Delete.
(elf_s390_link_hash_traverse): Delete.
(bfd_elf32_bfd_final_link): Delete.  (ie. use regular final link
rather than gc variety).
(struct elf_s390_link_hash_table): Add sgot, sgotplt, srelgot, splt,
srelplt, sdynbss, srelbss fields.
(elf_s390_link_hash_table_create): Init them.
(WILL_CALL_FINISH_DYNAMIC_SYMBOL): Define.
(allocate_dynrelocs): New function.
(create_got_section): New function.
(elf_backend_can_refcount): Define.
(elf_backend_copy_indirect_symbol): Define.
(elf_s390_copy_indirect_symbol): New function.
(elf_s390_create_dynamic_sections): New function.
(readonly_dynrelocs): New function.
* elf64-s390x: Likewise.

3 files changed, 2314 insertions, 1742 deletions

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 9aa309a..e189fe5 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,72 @@
+2001-11-08  Martin Schwidefsky  <schwidefsky@de.ibm.com>
+
+	* elf32-s390: Major rework that introduces all recent changes to
+	the s390 backends.  Get a closer match to elf32-i386.
+	(elf_s390_relocate_section): Make use of dynamic section short-cuts.
+	Localise vars, and delay setting.  Better error reporting, replace
+	BFD_ASSERT with abort.  Check ELF_LINK_HASH_DEF_DYNAMIC to see if a
+	symbol is not defined in the regular object file and tread the weak
+	definition as the normal one.  Don't discard relocs for undefweak or
+	undefined symbols and check !DEF_REGULAR as well as DEF_DYNAMIC in
+	test for avoided copy relocs.  Reinstate fudge for unresolved relocs
+	in debugging sections.
+	(elf32_s390_adjust_dynamic_symbol): Handle nocopyreloc.  Don't do copy
+	reloc processing for weakdefs.  Remove redundant casts and aborts.
+	Delay setting of vars until needed.  Move creation of dynamic symbols
+	and allocation of .plt and .rela.plt to allocate_dynrelocs.  Replace
+	BFD_ASSERT with abort.  Discard .plt entries for everything with
+	plt.refcount <= 0.
+	(elf_s390_check_relocs):  Don't allocate space for dynamic relocs,
+	.got or .relgot here but do it in allocate_dynrelocs.  Reference count
+	possible .plt and .got entries.  Don't test input section SEC_READONLY
+	here to try to avoid copy relocs, and keep dyn_relocs regardless of
+	ELF_LINK_NON_GOT_REF.  Don't set DF_TEXTREL here.  Delay setting of
+	variables until needed.  Remove separate switch stmt for creating .got
+	section.  Initialise local_got_refcounts to 0.  Cache pointer to
+	"sreloc" section in elf_section_data. Tweak condition under which .got
+	created.  Report files with bad relocation section names.
+	(elf_s390_finish_dynamic_symbol): Don't copy relocs for symbols that
+	have been forced local.  Use same test to decide if we can use a
+	relative reloc for got as elf_s390_relocate_section.  Expand SHN_UNDEF
+	comment.  Move expressions out of function calls.  Replace BFD_ASSERT
+	with abort.
+	(elf_s390_finish_dynamic_sections): Migrate common code out of switch
+	statement.  Replace BFD_ASSERT with abort.
+	(elf_s390_size_dynamic_sections): Call readonly_dynrelocs. Rename "i"
+	to "ibfd".  Allocate space for local dyn relocs.  Use DF_TEXTREL flag
+	instead of looking up section names for DT_TEXTREL.  Replace
+	BFD_ASSERT with abort.  Zero out the dynamic allocated content space.
+	Add a comment to remind us that one day this ought to be fixed.
+	(struct elf_s390_link_hash_entry): Rename "root" to "elf".
+	(struct elf_s390_link_hash_table): Likewise.
+	(elf_s390_link_hash_newfunc): Rename to link_hash_newfunc and get
+	rid of unnecessary casts.
+	(struct elf_s390_dyn_relocs): Add "sec", and "pc_count" fields.
+	Remove "section" field.
+	(elf_s390_gc_sweep_hook): Sweep dyn_relocs and local_dynrel.
+	Reference count possible .plt entries.  Don't deallocate .got and
+	.relgot space here.
+	(struct elf_s390_pcrel_relocs_copied): Rename to elf_s390_dyn_relocs.
+	Update comment.
+	(struct elf_s390_link_hash_entry): Rename pcrel_relocs_copied to
+	dyn_relocs.
+	(elf_s390_discard_copies):  Delete.
+	(elf_s390_link_hash_traverse): Delete.
+	(bfd_elf32_bfd_final_link): Delete.  (ie. use regular final link
+	rather than gc variety).
+	(struct elf_s390_link_hash_table): Add sgot, sgotplt, srelgot, splt,
+	srelplt, sdynbss, srelbss fields.
+	(elf_s390_link_hash_table_create): Init them.
+	(WILL_CALL_FINISH_DYNAMIC_SYMBOL): Define.
+	(allocate_dynrelocs): New function.
+	(create_got_section): New function.
+	(elf_backend_can_refcount): Define.
+	(elf_backend_copy_indirect_symbol): Define.
+	(elf_s390_copy_indirect_symbol): New function.
+	(elf_s390_create_dynamic_sections): New function.
+	(readonly_dynrelocs): New function.
+	* elf64-s390x: Likewise.
+
 2001-11-07  Jakub Jelinek  <jakub@redhat.com>
 
 	* Makefile.am (BFD32_BACKENDS): Add elf-strtab.lo.
diff --git a/bfd/elf32-s390.c b/bfd/elf32-s390.c
index ca51540..f09410b 100644
--- a/bfd/elf32-s390.c
+++ b/bfd/elf32-s390.c
@@ -29,22 +29,33 @@ static reloc_howto_type *elf_s390_reloc_type_lookup
   PARAMS ((bfd *, bfd_reloc_code_real_type));
 static void elf_s390_info_to_howto
   PARAMS ((bfd *, arelent *, Elf_Internal_Rela *));
-static boolean elf_s390_is_local_label_name PARAMS ((bfd *, const char *));
-static struct bfd_hash_entry *elf_s390_link_hash_newfunc
+static boolean elf_s390_is_local_label_name
+  PARAMS ((bfd *, const char *));
+static struct bfd_hash_entry *link_hash_newfunc
   PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *, const char *));
 static struct bfd_link_hash_table *elf_s390_link_hash_table_create
   PARAMS ((bfd *));
+static boolean create_got_section
+  PARAMS((bfd *, struct bfd_link_info *));
+static boolean elf_s390_create_dynamic_sections
+  PARAMS((bfd *, struct bfd_link_info *));
+static void elf_s390_copy_indirect_symbol
+  PARAMS ((struct elf_link_hash_entry *, struct elf_link_hash_entry *));
 static boolean elf_s390_check_relocs
   PARAMS ((bfd *, struct bfd_link_info *, asection *,
 	   const Elf_Internal_Rela *));
 static asection *elf_s390_gc_mark_hook
   PARAMS ((bfd *, struct bfd_link_info *, Elf_Internal_Rela *,
-	   struct elf_link_hash_entry *, Elf_Internal_Sym *sym));
+	   struct elf_link_hash_entry *, Elf_Internal_Sym *));
 static boolean elf_s390_gc_sweep_hook
   PARAMS ((bfd *, struct bfd_link_info *, asection *,
 	   const Elf_Internal_Rela *));
 static boolean elf_s390_adjust_dynamic_symbol
   PARAMS ((struct bfd_link_info *, struct elf_link_hash_entry *));
+static boolean allocate_dynrelocs
+  PARAMS ((struct elf_link_hash_entry *, PTR));
+static boolean readonly_dynrelocs
+  PARAMS ((struct elf_link_hash_entry *, PTR));
 static boolean elf_s390_size_dynamic_sections
   PARAMS ((bfd *, struct bfd_link_info *));
 static boolean elf_s390_relocate_section
@@ -53,11 +64,11 @@ static boolean elf_s390_relocate_section
 static boolean elf_s390_finish_dynamic_symbol
   PARAMS ((bfd *, struct bfd_link_info *, struct elf_link_hash_entry *,
 	   Elf_Internal_Sym *));
+static enum elf_reloc_type_class elf_s390_reloc_type_class
+  PARAMS ((const Elf_Internal_Rela *));
 static boolean elf_s390_finish_dynamic_sections
   PARAMS ((bfd *, struct bfd_link_info *));
 static boolean elf_s390_object_p PARAMS ((bfd *));
-static enum elf_reloc_type_class elf_s390_reloc_type_class
-  PARAMS ((const Elf_Internal_Rela *));
 
 #define USE_RELA 1		/* We want RELA relocations, not REL.  */
 
@@ -112,54 +123,55 @@ elf_s390_reloc_type_lookup (abfd, code)
      bfd *abfd ATTRIBUTE_UNUSED;
      bfd_reloc_code_real_type code;
 {
-  switch (code) {
-  case BFD_RELOC_NONE:
-    return &elf_howto_table[(int) R_390_NONE];
-  case BFD_RELOC_8:
-    return &elf_howto_table[(int) R_390_8];
-  case BFD_RELOC_390_12:
-    return &elf_howto_table[(int) R_390_12];
-  case BFD_RELOC_16:
-    return &elf_howto_table[(int) R_390_16];
-  case BFD_RELOC_32:
-    return &elf_howto_table[(int) R_390_32];
-  case BFD_RELOC_CTOR:
-    return &elf_howto_table[(int) R_390_32];
-  case BFD_RELOC_32_PCREL:
-    return &elf_howto_table[(int) R_390_PC32];
-  case BFD_RELOC_390_GOT12:
-    return &elf_howto_table[(int) R_390_GOT12];
-  case BFD_RELOC_32_GOT_PCREL:
-    return &elf_howto_table[(int) R_390_GOT32];
-  case BFD_RELOC_390_PLT32:
-    return &elf_howto_table[(int) R_390_PLT32];
-  case BFD_RELOC_390_COPY:
-    return &elf_howto_table[(int) R_390_COPY];
-  case BFD_RELOC_390_GLOB_DAT:
-    return &elf_howto_table[(int) R_390_GLOB_DAT];
-  case BFD_RELOC_390_JMP_SLOT:
-    return &elf_howto_table[(int) R_390_JMP_SLOT];
-  case BFD_RELOC_390_RELATIVE:
-    return &elf_howto_table[(int) R_390_RELATIVE];
-  case BFD_RELOC_32_GOTOFF:
-    return &elf_howto_table[(int) R_390_GOTOFF];
-  case BFD_RELOC_390_GOTPC:
-    return &elf_howto_table[(int) R_390_GOTPC];
-  case BFD_RELOC_390_GOT16:
-    return &elf_howto_table[(int) R_390_GOT16];
-  case BFD_RELOC_16_PCREL:
-    return &elf_howto_table[(int) R_390_PC16];
-  case BFD_RELOC_390_PC16DBL:
-    return &elf_howto_table[(int) R_390_PC16DBL];
-  case BFD_RELOC_390_PLT16DBL:
-    return &elf_howto_table[(int) R_390_PLT16DBL];
-  case BFD_RELOC_VTABLE_INHERIT:
-    return &elf32_s390_vtinherit_howto;
-  case BFD_RELOC_VTABLE_ENTRY:
-    return &elf32_s390_vtentry_howto;
-  default:
-    break;
-  }
+  switch (code) 
+    {
+    case BFD_RELOC_NONE:
+      return &elf_howto_table[(int) R_390_NONE];
+    case BFD_RELOC_8:
+      return &elf_howto_table[(int) R_390_8];
+    case BFD_RELOC_390_12:
+      return &elf_howto_table[(int) R_390_12];
+    case BFD_RELOC_16:
+      return &elf_howto_table[(int) R_390_16];
+    case BFD_RELOC_32:
+      return &elf_howto_table[(int) R_390_32];
+    case BFD_RELOC_CTOR:
+      return &elf_howto_table[(int) R_390_32];
+    case BFD_RELOC_32_PCREL:
+      return &elf_howto_table[(int) R_390_PC32];
+    case BFD_RELOC_390_GOT12:
+      return &elf_howto_table[(int) R_390_GOT12];
+    case BFD_RELOC_32_GOT_PCREL:
+      return &elf_howto_table[(int) R_390_GOT32];
+    case BFD_RELOC_390_PLT32:
+      return &elf_howto_table[(int) R_390_PLT32];
+    case BFD_RELOC_390_COPY:
+      return &elf_howto_table[(int) R_390_COPY];
+    case BFD_RELOC_390_GLOB_DAT:
+      return &elf_howto_table[(int) R_390_GLOB_DAT];
+    case BFD_RELOC_390_JMP_SLOT:
+      return &elf_howto_table[(int) R_390_JMP_SLOT];
+    case BFD_RELOC_390_RELATIVE:
+      return &elf_howto_table[(int) R_390_RELATIVE];
+    case BFD_RELOC_32_GOTOFF:
+      return &elf_howto_table[(int) R_390_GOTOFF];
+    case BFD_RELOC_390_GOTPC:
+      return &elf_howto_table[(int) R_390_GOTPC];
+    case BFD_RELOC_390_GOT16:
+      return &elf_howto_table[(int) R_390_GOT16];
+    case BFD_RELOC_16_PCREL:
+      return &elf_howto_table[(int) R_390_PC16];
+    case BFD_RELOC_390_PC16DBL:
+      return &elf_howto_table[(int) R_390_PC16DBL];
+    case BFD_RELOC_390_PLT16DBL:
+      return &elf_howto_table[(int) R_390_PLT16DBL];
+    case BFD_RELOC_VTABLE_INHERIT:
+      return &elf32_s390_vtinherit_howto;
+    case BFD_RELOC_VTABLE_ENTRY:
+      return &elf32_s390_vtentry_howto;
+    default:
+      break;
+    }
   return 0;
 }
 
@@ -206,11 +218,6 @@ elf_s390_is_local_label_name (abfd, name)
 
 #define ELF_DYNAMIC_INTERPRETER "/usr/lib/ld.so.1"
 
-/* The nop opcode we use.  */
-
-#define s390_NOP 0x07070707
-
-
 /* The size in bytes of the first entry in the procedure linkage table.  */
 #define PLT_FIRST_ENTRY_SIZE 32
 /* The size in bytes of an entry in the procedure linkage table.  */
@@ -365,53 +372,50 @@ PLT0:
 #define PLT_FIRST_ENTRY_WORD5     0x07f10000
 
 /* The s390 linker needs to keep track of the number of relocs that it
-   decides to copy in check_relocs for each symbol.  This is so that
-   it can discard PC relative relocs if it doesn't need them when
-   linking with -Bsymbolic.  We store the information in a field
-   extending the regular ELF linker hash table.  */
-
-/* This structure keeps track of the number of PC relative relocs we
-   have copied for a given symbol.  */
+   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_s390_pcrel_relocs_copied
+struct elf_s390_dyn_relocs
 {
-  /* Next section.  */
-  struct elf_s390_pcrel_relocs_copied *next;
-  /* A section in dynobj.  */
-  asection *section;
-  /* Number of relocs copied in this section.  */
+  struct elf_s390_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;
 };
 
 /* s390 ELF linker hash entry.  */
 
 struct elf_s390_link_hash_entry
 {
-  struct elf_link_hash_entry root;
+  struct elf_link_hash_entry elf;
 
-  /* Number of PC relative relocs copied for this symbol.  */
-  struct elf_s390_pcrel_relocs_copied *pcrel_relocs_copied;
+  /* Track dynamic relocs copied for this symbol.  */
+  struct elf_s390_dyn_relocs *dyn_relocs;
 };
 
 /* s390 ELF linker hash table.  */
 
 struct elf_s390_link_hash_table
 {
-  struct elf_link_hash_table root;
-};
+  struct elf_link_hash_table elf;
 
-/* Declare this now that the above structures are defined.  */
-
-static boolean elf_s390_discard_copies
-  PARAMS ((struct elf_s390_link_hash_entry *, PTR));
-
-/* Traverse an s390 ELF linker hash table.  */
-
-#define elf_s390_link_hash_traverse(table, func, info)			\
-  (elf_link_hash_traverse						\
-   (&(table)->root,							\
-    (boolean (*) PARAMS ((struct elf_link_hash_entry *, PTR))) (func),	\
-    (info)))
+  /* Short-cuts to get to dynamic linker sections.  */
+  asection *sgot;
+  asection *sgotplt;
+  asection *srelgot;
+  asection *splt;
+  asection *srelplt;
+  asection *sdynbss;
+  asection *srelbss;
+};
 
 /* Get the s390 ELF linker hash table from a link_info structure.  */
 
@@ -421,33 +425,32 @@ static boolean elf_s390_discard_copies
 /* Create an entry in an s390 ELF linker hash table.  */
 
 static struct bfd_hash_entry *
-elf_s390_link_hash_newfunc (entry, table, string)
+link_hash_newfunc (entry, table, string)
      struct bfd_hash_entry *entry;
      struct bfd_hash_table *table;
      const char *string;
 {
-  struct elf_s390_link_hash_entry *ret =
-    (struct elf_s390_link_hash_entry *) entry;
-
   /* Allocate the structure if it has not already been allocated by a
      subclass.  */
-  if (ret == (struct elf_s390_link_hash_entry *) NULL)
-    ret = ((struct elf_s390_link_hash_entry *)
-	   bfd_hash_allocate (table,
-			      sizeof (struct elf_s390_link_hash_entry)));
-  if (ret == (struct elf_s390_link_hash_entry *) NULL)
-    return (struct bfd_hash_entry *) ret;
-
+  if (entry == NULL)
+    {
+      entry = bfd_hash_allocate (table,
+				 sizeof (struct elf_s390_link_hash_entry));
+      if (entry == NULL)
+	return entry;
+    }
+  
   /* Call the allocation method of the superclass.  */
-  ret = ((struct elf_s390_link_hash_entry *)
-	 _bfd_elf_link_hash_newfunc ((struct bfd_hash_entry *) ret,
-				     table, string));
-  if (ret != (struct elf_s390_link_hash_entry *) NULL)
+  entry = _bfd_elf_link_hash_newfunc (entry, table, string);
+  if (entry != NULL)
     {
-      ret->pcrel_relocs_copied = NULL;
+      struct elf_s390_link_hash_entry *eh;
+      
+      eh = (struct elf_s390_link_hash_entry *) entry;
+      eh->dyn_relocs = NULL;
     }
 
-  return (struct bfd_hash_entry *) ret;
+  return entry;
 }
 
 /* Create an s390 ELF linker hash table.  */
@@ -460,19 +463,134 @@ elf_s390_link_hash_table_create (abfd)
   bfd_size_type amt = sizeof (struct elf_s390_link_hash_table);
 
   ret = (struct elf_s390_link_hash_table *) bfd_alloc (abfd, amt);
-  if (ret == (struct elf_s390_link_hash_table *) NULL)
+  if (ret == NULL)
     return NULL;
 
-  if (! _bfd_elf_link_hash_table_init (&ret->root, abfd,
-				       elf_s390_link_hash_newfunc))
+  if (! _bfd_elf_link_hash_table_init (&ret->elf, abfd, link_hash_newfunc))
     {
       bfd_release (abfd, ret);
       return NULL;
     }
 
-  return &ret->root.root;
+  ret->sgot = NULL;
+  ret->sgotplt = NULL;
+  ret->srelgot = NULL;
+  ret->splt = NULL;
+  ret->srelplt = NULL;
+  ret->sdynbss = NULL;
+  ret->srelbss = NULL;
+
+  return &ret->elf.root;
+}
+
+/* Create .got, .gotplt, and .rela.got sections in DYNOBJ, and set up
+   shortcuts to them in our hash table.  */
+
+static boolean
+create_got_section (dynobj, info)
+     bfd *dynobj;
+     struct bfd_link_info *info;
+{
+  struct elf_s390_link_hash_table *htab;
+
+  if (! _bfd_elf_create_got_section (dynobj, info))
+    return false;
+
+  htab = elf_s390_hash_table (info);
+  htab->sgot = bfd_get_section_by_name (dynobj, ".got");
+  htab->sgotplt = bfd_get_section_by_name (dynobj, ".got.plt");
+  if (!htab->sgot || !htab->sgotplt)
+    abort ();
+
+  htab->srelgot = bfd_make_section (dynobj, ".rela.got");
+  if (htab->srelgot == NULL
+      || ! bfd_set_section_flags (dynobj, htab->srelgot,
+				  (SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS
+				   | SEC_IN_MEMORY | SEC_LINKER_CREATED
+				   | SEC_READONLY))
+      || ! bfd_set_section_alignment (dynobj, htab->srelgot, 2))
+    return false;
+  return true;
+}
+
+/* Create .plt, .rela.plt, .got, .got.plt, .rela.got, .dynbss, and
+   .rela.bss sections in DYNOBJ, and set up shortcuts to them in our
+   hash table.  */
+
+static boolean
+elf_s390_create_dynamic_sections (dynobj, info)
+     bfd *dynobj;
+     struct bfd_link_info *info;
+{
+  struct elf_s390_link_hash_table *htab;
+
+  htab = elf_s390_hash_table (info);
+  if (!htab->sgot && !create_got_section (dynobj, info))
+    return false;
+
+  if (!_bfd_elf_create_dynamic_sections (dynobj, info))
+    return false;
+
+  htab->splt = bfd_get_section_by_name (dynobj, ".plt");
+  htab->srelplt = bfd_get_section_by_name (dynobj, ".rela.plt");
+  htab->sdynbss = bfd_get_section_by_name (dynobj, ".dynbss");
+  if (!info->shared)
+    htab->srelbss = bfd_get_section_by_name (dynobj, ".rela.bss");
+
+  if (!htab->splt || !htab->srelplt || !htab->sdynbss
+      || (!info->shared && !htab->srelbss))
+    abort ();
+
+  return true;
 }
 
+/* Copy the extra info we tack onto an elf_link_hash_entry.  */
+
+static void
+elf_s390_copy_indirect_symbol (dir, ind)
+     struct elf_link_hash_entry *dir, *ind;
+{
+  struct elf_s390_link_hash_entry *edir, *eind;
+
+  edir = (struct elf_s390_link_hash_entry *) dir;
+  eind = (struct elf_s390_link_hash_entry *) ind;
+
+  if (eind->dyn_relocs != NULL)
+    {
+      if (edir->dyn_relocs != NULL)
+	{
+	  struct elf_s390_dyn_relocs **pp;
+	  struct elf_s390_dyn_relocs *p;
+
+	  if (ind->root.type == bfd_link_hash_indirect)
+	    abort ();
+
+	  /* Add reloc counts against the weak sym to the strong sym
+	     list.  Merge any entries against the same section.  */
+	  for (pp = &eind->dyn_relocs; (p = *pp) != NULL; )
+	    {
+	      struct elf_s390_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 (dir, ind);
+}
 
 /* Look through the relocs for a section during the first phase, and
    allocate space in the global offset table or procedure linkage
@@ -485,26 +603,20 @@ elf_s390_check_relocs (abfd, info, sec, relocs)
      asection *sec;
      const Elf_Internal_Rela *relocs;
 {
-  bfd *dynobj;
+  struct elf_s390_link_hash_table *htab;
   Elf_Internal_Shdr *symtab_hdr;
   struct elf_link_hash_entry **sym_hashes;
-  bfd_signed_vma *local_got_refcounts;
   const Elf_Internal_Rela *rel;
   const Elf_Internal_Rela *rel_end;
-  asection *sgot;
-  asection *srelgot;
   asection *sreloc;
 
   if (info->relocateable)
     return true;
 
-  dynobj = elf_hash_table (info)->dynobj;
+  htab = elf_s390_hash_table (info);
   symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
   sym_hashes = elf_sym_hashes (abfd);
-  local_got_refcounts = elf_local_got_offsets (abfd);
 
-  sgot = NULL;
-  srelgot = NULL;
   sreloc = NULL;
 
   rel_end = relocs + sec->reloc_count;
@@ -515,110 +627,60 @@ elf_s390_check_relocs (abfd, info, sec, relocs)
 
       r_symndx = ELF32_R_SYM (rel->r_info);
 
+      if (r_symndx >= NUM_SHDR_ENTRIES (symtab_hdr))
+	{
+	  (*_bfd_error_handler) (_("%s: bad symbol index: %d"),
+				 bfd_archive_filename (abfd),
+				 r_symndx);
+	  return false;
+	}
+
       if (r_symndx < symtab_hdr->sh_info)
 	h = NULL;
       else
 	h = sym_hashes[r_symndx - symtab_hdr->sh_info];
 
-      /* Some relocs require a global offset table.  */
-      if (dynobj == NULL)
-	{
-	  switch (ELF32_R_TYPE (rel->r_info))
-	    {
-	    case R_390_GOT12:
-            case R_390_GOT16:
-	    case R_390_GOT32:
-	    case R_390_GOTOFF:
-	    case R_390_GOTPC:
-	      elf_hash_table (info)->dynobj = dynobj = abfd;
-	      if (! _bfd_elf_create_got_section (dynobj, info))
-		return false;
-	      break;
-
-	    default:
-	      break;
-	    }
-	}
-
-
       switch (ELF32_R_TYPE (rel->r_info))
 	{
 	case R_390_GOT12:
         case R_390_GOT16:
 	case R_390_GOT32:
 	  /* This symbol requires a global offset table entry.  */
-
-	  if (sgot == NULL)
-	    {
-	      sgot = bfd_get_section_by_name (dynobj, ".got");
-	      BFD_ASSERT (sgot != NULL);
-	    }
-
-
-	  if (srelgot == NULL
-	      && (h != NULL || info->shared))
-	    {
-	      srelgot = bfd_get_section_by_name (dynobj, ".rela.got");
-	      if (srelgot == NULL)
-		{
-		  srelgot = bfd_make_section (dynobj, ".rela.got");
-		  if (srelgot == NULL
-		      || ! bfd_set_section_flags (dynobj, srelgot,
-						  (SEC_ALLOC
-						   | SEC_LOAD
-						   | SEC_HAS_CONTENTS
-						   | SEC_IN_MEMORY
-						   | SEC_LINKER_CREATED
-						   | SEC_READONLY))
-		      || ! bfd_set_section_alignment (dynobj, srelgot, 2))
-		    return false;
-		}
-	    }
-
 	  if (h != NULL)
 	    {
-	      if (h->got.refcount == 0)
-		{
-		  /* Make sure this symbol is output as a dynamic symbol.  */
-		  if (h->dynindx == -1)
-		    {
-		      if (! bfd_elf32_link_record_dynamic_symbol (info, h))
-			return false;
-		    }
-
-		  sgot->_raw_size += 4;
-		  srelgot->_raw_size += sizeof (Elf32_External_Rela);
-		}
 	      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_signed_vma *)
-		                         bfd_zalloc (abfd, size);
+		  local_got_refcounts = ((bfd_signed_vma *)
+					 bfd_zalloc (abfd, size));
 		  if (local_got_refcounts == NULL)
 		    return false;
 		  elf_local_got_refcounts (abfd) = local_got_refcounts;
 		}
-	      if (local_got_refcounts[r_symndx] == 0)
-		{
-		  sgot->_raw_size += 4;
-		  if (info->shared)
-		    {
-		      /* If we are generating a shared object, we need to
-			 output a R_390_RELATIVE reloc so that the dynamic
-			 linker can adjust this GOT entry.  */
-		      srelgot->_raw_size += sizeof (Elf32_External_Rela);
-		    }
-		}
 	      local_got_refcounts[r_symndx] += 1;
 	    }
+	  /* Fall through */
+
+	case R_390_GOTOFF:
+	case R_390_GOTPC:
+	  if (htab->sgot == NULL)
+	    {
+	      if (htab->elf.dynobj == NULL)
+		htab->elf.dynobj = abfd;
+	      if (!create_got_section (htab->elf.dynobj, info))
+		return false;
+	    }
 	  break;
 
         case R_390_PLT16DBL:
@@ -645,38 +707,67 @@ elf_s390_check_relocs (abfd, info, sec, relocs)
         case R_390_PC16:
         case R_390_PC16DBL:
 	case R_390_PC32:
-	  if (h != NULL)
-	    h->elf_link_hash_flags |= ELF_LINK_NON_GOT_REF;
+	  if (h != NULL && !info->shared)
+	    {
+	      /* If this reloc is in a read-only section, we might
+		 need a copy reloc.  We can't check reliably at this
+		 stage whether the section is read-only, as input
+		 sections have not yet been mapped to output sections.
+		 Tentatively set the flag for now, and correct in
+		 adjust_dynamic_symbol.  */
+	      h->elf_link_hash_flags |= ELF_LINK_NON_GOT_REF;
+	
+	      /* We may need a .plt entry if the function this reloc
+		 refers to is in a shared lib.  */
+	      h->plt.refcount += 1;
+	    }
 
 	  /* If we are creating a shared library, and this is a reloc
-             against a global symbol, or a non PC relative reloc
-             against a local symbol, then we need to copy the reloc
-             into the shared library.  However, if we are linking with
-             -Bsymbolic, we do not need to copy a reloc against a
-             global symbol which is defined in an object we are
-             including in the link (i.e., DEF_REGULAR is set).  At
-             this point we have not seen all the input files, so it is
-             possible that DEF_REGULAR is not set now but will be set
-             later (it is never cleared).  We account for that
-             possibility below by storing information in the
-             pcrel_relocs_copied field of the hash table entry.  */
-	  if (info->shared
-              && (sec->flags & SEC_ALLOC) != 0
-	      && ((ELF32_R_TYPE (rel->r_info) != R_390_PC16 &&
-                   ELF32_R_TYPE (rel->r_info) != R_390_PC16DBL &&
-                   ELF32_R_TYPE (rel->r_info) != R_390_PC32)
-		  || (h != NULL
-		      && (! info->symbolic
-			  || (h->elf_link_hash_flags
-			      & ELF_LINK_HASH_DEF_REGULAR) == 0))))
+	     against a global symbol, or a non PC relative reloc
+	     against a local symbol, then we need to copy the reloc
+	     into the shared library.  However, if we are linking with
+	     -Bsymbolic, we do not need to copy a reloc against a
+	     global symbol which is defined in an object we are
+	     including in the link (i.e., DEF_REGULAR is set).  At
+	     this point we have not seen all the input files, so it is
+	     possible that DEF_REGULAR is not set now but will be set
+	     later (it is never cleared).  In case of a weak definition,
+	     DEF_REGULAR may be cleared later by a strong definition in
+	     a shared library. We account for that possibility below by
+	     storing information in the relocs_copied field of the hash
+	     table entry.  A similar situation occurs when creating
+	     shared libraries and symbol visibility changes render the
+	     symbol local.
+
+	     If on the other hand, we are creating an executable, we
+	     may need to keep relocations for symbols satisfied by a
+	     dynamic library if we manage to avoid copy relocs for the
+	     symbol.  */
+	  if ((info->shared
+	       && (sec->flags & SEC_ALLOC) != 0
+	       && ((ELF32_R_TYPE (rel->r_info) != R_390_PC16 
+		    && ELF32_R_TYPE (rel->r_info) != R_390_PC16DBL
+		    && ELF32_R_TYPE (rel->r_info) != R_390_PC32)
+		   || (h != NULL
+		       && (! info->symbolic
+			   || h->root.type == bfd_link_hash_defweak
+			   || (h->elf_link_hash_flags
+			       & ELF_LINK_HASH_DEF_REGULAR) == 0))))
+	      || (!info->shared
+		  && (sec->flags & SEC_ALLOC) != 0
+		  && h != NULL
+		  && (h->root.type == bfd_link_hash_defweak
+		      || (h->elf_link_hash_flags
+			  & ELF_LINK_HASH_DEF_REGULAR) == 0)))
 	    {
-	      /* When creating a shared object, we must copy these
-                 reloc types into the output file.  We create a reloc
-                 section in dynobj and make room for this reloc.  */
+	      /* We must copy these reloc types into the output file.
+		 Create a reloc section in dynobj and make room for
+		 this reloc.  */
 	      if (sreloc == NULL)
 		{
 		  const char *name;
-
+		  bfd *dynobj;
+		
 		  name = (bfd_elf_string_from_elf_section
 			  (abfd,
 			   elf_elfheader (abfd)->e_shstrndx,
@@ -684,10 +775,19 @@ elf_s390_check_relocs (abfd, info, sec, relocs)
 		  if (name == NULL)
 		    return false;
 
-		  BFD_ASSERT (strncmp (name, ".rela", 5) == 0
-			      && strcmp (bfd_get_section_name (abfd, sec),
-					 name + 5) == 0);
+		  if (strncmp (name, ".rela", 5) != 0
+		      || strcmp (bfd_get_section_name (abfd, sec),
+				 name + 5) != 0)
+		    {
+		      (*_bfd_error_handler)
+			(_("%s: bad relocation section name `%s\'"),
+			 bfd_archive_filename (abfd), name);
+		    }
+
+		  if (htab->elf.dynobj == NULL)
+		    htab->elf.dynobj = abfd;
 
+		  dynobj = htab->elf.dynobj;
 		  sreloc = bfd_get_section_by_name (dynobj, name);
 		  if (sreloc == NULL)
 		    {
@@ -703,66 +803,61 @@ elf_s390_check_relocs (abfd, info, sec, relocs)
 			  || ! bfd_set_section_alignment (dynobj, sreloc, 2))
 			return false;
 		    }
-		  if (sec->flags & SEC_READONLY)
-		    info->flags |= DF_TEXTREL;
+		  elf_section_data (sec)->sreloc = sreloc;
 		}
 
-	      sreloc->_raw_size += sizeof (Elf32_External_Rela);
-
-	      /* If we are linking with -Bsymbolic, and this is a
-                 global symbol, we count the number of PC relative
-                 relocations we have entered for this symbol, so that
-                 we can discard them again if the symbol is later
-                 defined by a regular object.  Note that this function
-                 is only called if we are using an elf_s390 linker
-                 hash table, which means that h is really a pointer to
-                 an elf_s390_link_hash_entry.  */
-	      if (h != NULL
-		  && (ELF32_R_TYPE (rel->r_info) == R_390_PC16 ||
-                      ELF32_R_TYPE (rel->r_info) == R_390_PC16DBL ||
-                      ELF32_R_TYPE (rel->r_info) == R_390_PC32))
+	      /* If this is a global symbol, we count the number of
+		 relocations we need for this symbol.  */
+	      if (h != NULL)
 		{
 		  struct elf_s390_link_hash_entry *eh;
-		  struct elf_s390_pcrel_relocs_copied *p;
+		  struct elf_s390_dyn_relocs *p;
 
 		  eh = (struct elf_s390_link_hash_entry *) h;
+		  p = eh->dyn_relocs;
 
-		  for (p = eh->pcrel_relocs_copied; p != NULL; p = p->next)
-		    if (p->section == sreloc)
-		      break;
-
-		  if (p == NULL)
+		  if (p == NULL || p->sec != sec)
 		    {
-		      p = ((struct elf_s390_pcrel_relocs_copied *)
-			   bfd_alloc (dynobj, (bfd_size_type) sizeof *p));
+		      bfd_size_type amt = sizeof *p;
+		      p = ((struct elf_s390_dyn_relocs *)
+			   bfd_alloc (htab->elf.dynobj, amt));
 		      if (p == NULL)
 			return false;
-		      p->next = eh->pcrel_relocs_copied;
-		      eh->pcrel_relocs_copied = p;
-		      p->section = sreloc;
+		      p->next = eh->dyn_relocs;
+		      eh->dyn_relocs = p;
+		      p->sec = sec;
 		      p->count = 0;
+		      p->pc_count = 0;
 		    }
-
-		  ++p->count;
+		  
+		  p->count += 1;
+		  if (ELF32_R_TYPE (rel->r_info) == R_390_PC16
+		      || ELF32_R_TYPE (rel->r_info) == R_390_PC16DBL
+		      || ELF32_R_TYPE (rel->r_info) == R_390_PC32)
+		    p->pc_count += 1;
+		}
+	      else
+		{
+		  /* Track dynamic relocs needed for local syms too.  */
+		  elf_section_data (sec)->local_dynrel += 1;
 		}
 	    }
-
 	  break;
-
+	
 	  /* This relocation describes the C++ object vtable hierarchy.
 	     Reconstruct it for later use during GC.  */
         case R_390_GNU_VTINHERIT:
           if (!_bfd_elf32_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_390_GNU_VTENTRY:
-          if (!_bfd_elf32_gc_record_vtentry (abfd, sec, h, rel->r_addend))
+          if (!_bfd_elf32_gc_record_vtentry (abfd, sec, h, rel->r_offset))
             return false;
           break;
-
+	
 	default:
 	  break;
 	}
@@ -823,10 +918,10 @@ elf_s390_gc_mark_hook (abfd, info, rel, h, sym)
 
 static boolean
 elf_s390_gc_sweep_hook (abfd, info, sec, relocs)
-     bfd *abfd ATTRIBUTE_UNUSED;
-     struct bfd_link_info *info ATTRIBUTE_UNUSED;
-     asection *sec ATTRIBUTE_UNUSED;
-     const Elf_Internal_Rela *relocs ATTRIBUTE_UNUSED;
+     bfd *abfd;
+     struct bfd_link_info *info;
+     asection *sec;
+     const Elf_Internal_Rela *relocs;
 {
   Elf_Internal_Shdr *symtab_hdr;
   struct elf_link_hash_entry **sym_hashes;
@@ -835,19 +930,16 @@ elf_s390_gc_sweep_hook (abfd, info, sec, relocs)
   unsigned long r_symndx;
   struct elf_link_hash_entry *h;
   bfd *dynobj;
-  asection *sgot;
-  asection *srelgot;
 
-  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
-  sym_hashes = elf_sym_hashes (abfd);
-  local_got_refcounts = elf_local_got_refcounts (abfd);
+  elf_section_data (sec)->local_dynrel = 0;
 
   dynobj = elf_hash_table (info)->dynobj;
   if (dynobj == NULL)
     return true;
 
-  sgot = bfd_get_section_by_name (dynobj, ".got");
-  srelgot = bfd_get_section_by_name (dynobj, ".rela.got");
+  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++)
@@ -863,27 +955,48 @@ elf_s390_gc_sweep_hook (abfd, info, sec, relocs)
 	  {
 	    h = sym_hashes[r_symndx - symtab_hdr->sh_info];
 	    if (h->got.refcount > 0)
-	      {
-		h->got.refcount -= 1;
-		if (h->got.refcount == 0)
-		  {
-		    sgot->_raw_size -= 4;
-		    srelgot->_raw_size -= sizeof (Elf32_External_Rela);
-		  }
-	      }
+	      h->got.refcount -= 1;
 	  }
 	else if (local_got_refcounts != NULL)
 	  {
 	    if (local_got_refcounts[r_symndx] > 0)
-	      {
-		local_got_refcounts[r_symndx] -= 1;
-		if (local_got_refcounts[r_symndx] == 0)
-		  {
-		    sgot->_raw_size -= 4;
-		    if (info->shared)
-		      srelgot->_raw_size -= sizeof (Elf32_External_Rela);
-		  }
-	      }
+	      local_got_refcounts[r_symndx] -= 1;
+	  }
+	break;
+
+      case R_390_8:
+      case R_390_12:
+      case R_390_16:
+      case R_390_32:
+      case R_390_PC16:
+      case R_390_PC16DBL:
+      case R_390_PC32:
+	r_symndx = ELF32_R_SYM (rel->r_info);
+	if (r_symndx >= symtab_hdr->sh_info)
+	  {
+	    struct elf_s390_link_hash_entry *eh;
+	    struct elf_s390_dyn_relocs **pp;
+	    struct elf_s390_dyn_relocs *p;
+
+	    h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+
+	    if (!info->shared && h->plt.refcount > 0)
+	      h->plt.refcount -= 1;
+
+	    eh = (struct elf_s390_link_hash_entry *) h;
+
+	    for (pp = &eh->dyn_relocs; (p = *pp) != NULL; pp = &p->next)
+	      if (p->sec == sec)
+		{
+		  if (ELF32_R_TYPE (rel->r_info) == R_390_PC16
+		      || ELF32_R_TYPE (rel->r_info) == R_390_PC16DBL
+		      || ELF32_R_TYPE (rel->r_info) == R_390_PC32)
+		    p->pc_count -= 1;
+		  p->count -= 1;
+		  if (p->count == 0)
+		    *pp = p->next;
+		  break;
+		}
 	  }
 	break;
 
@@ -916,33 +1029,22 @@ elf_s390_adjust_dynamic_symbol (info, h)
      struct bfd_link_info *info;
      struct elf_link_hash_entry *h;
 {
-  bfd *dynobj;
+  struct elf_s390_link_hash_table *htab;
+  struct elf_s390_link_hash_entry * eh;
+  struct elf_s390_dyn_relocs *p;
   asection *s;
   unsigned int power_of_two;
 
-  dynobj = elf_hash_table (info)->dynobj;
-
-  /* Make sure we know what is going on here.  */
-  BFD_ASSERT (dynobj != NULL
-	      && ((h->elf_link_hash_flags & ELF_LINK_HASH_NEEDS_PLT)
-		  || h->weakdef != NULL
-		  || ((h->elf_link_hash_flags
-		       & ELF_LINK_HASH_DEF_DYNAMIC) != 0
-		      && (h->elf_link_hash_flags
-			  & ELF_LINK_HASH_REF_REGULAR) != 0
-		      && (h->elf_link_hash_flags
-			  & ELF_LINK_HASH_DEF_REGULAR) == 0)));
-
   /* If this is a function, put it in the procedure linkage table.  We
      will fill in the contents of the procedure linkage table later
      (although we could actually do it here). */
   if (h->type == STT_FUNC
       || (h->elf_link_hash_flags & ELF_LINK_HASH_NEEDS_PLT) != 0)
     {
-      if ((! info->shared
-	   && (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_DYNAMIC) == 0
-	   && (h->elf_link_hash_flags & ELF_LINK_HASH_REF_DYNAMIC) == 0)
-	  || (info->shared && h->plt.refcount <= 0))
+      if (h->plt.refcount <= 0
+	  || (! info->shared
+	      && (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_DYNAMIC) == 0
+	      && (h->elf_link_hash_flags & ELF_LINK_HASH_REF_DYNAMIC) == 0))
 	{
 	  /* This case can occur if we saw a PLT32 reloc in an input
              file, but the symbol was never referred to by a dynamic
@@ -951,54 +1053,16 @@ elf_s390_adjust_dynamic_symbol (info, h)
 	     linkage table, and we can just do a PC32 reloc instead.  */
 	  h->plt.offset = (bfd_vma) -1;
 	  h->elf_link_hash_flags &= ~ELF_LINK_HASH_NEEDS_PLT;
-	  return true;
-	}
-
-      /* Make sure this symbol is output as a dynamic symbol.  */
-      if (h->dynindx == -1)
-	{
-	  if (! bfd_elf32_link_record_dynamic_symbol (info, h))
-	    return false;
 	}
 
-      s = bfd_get_section_by_name (dynobj, ".plt");
-      BFD_ASSERT (s != NULL);
-
-      /* The first entry in .plt is reserved.  */
-      if (s->_raw_size == 0)
-	s->_raw_size = PLT_FIRST_ENTRY_SIZE;
-
-     /* If this symbol is not defined in a regular file, and we are
-       not generating a shared library, then set the symbol to this
-       location in the .plt.  This is required to make function
-       pointers compare as equal between the normal executable and
-       the shared library.  */
-     if (! info->shared
-	&& (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0)
-      {
-	h->root.u.def.section = s;
-	h->root.u.def.value = s->_raw_size;
-      }
-
-      h->plt.offset = s->_raw_size;
-
-      /* Make room for this entry.  */
-      s->_raw_size += PLT_ENTRY_SIZE;
-
-      /* We also need to make an entry in the .got.plt section, which
-	 will be placed in the .got section by the linker script.  */
-      s = bfd_get_section_by_name (dynobj, ".got.plt");
-      BFD_ASSERT (s != NULL);
-      s->_raw_size += GOT_ENTRY_SIZE;
-
-      /* We also need to make an entry in the .rela.plt section.  */
-      s = bfd_get_section_by_name (dynobj, ".rela.plt");
-      BFD_ASSERT (s != NULL);
-      s->_raw_size += sizeof (Elf32_External_Rela);
-
       return true;
     }
   else
+    /* It's possible that we incorrectly decided a .plt reloc was
+       needed for an R_390_PC32 reloc to a non-function sym in
+       check_relocs.  We can't decide accurately between function and
+       non-function syms in check-relocs;  Objects loaded later in
+       the link may change h->type.  So fix it now.  */
     h->plt.offset = (bfd_vma) -1;
 
   /* If this is a weak symbol, and there is a real definition, the
@@ -1028,6 +1092,29 @@ elf_s390_adjust_dynamic_symbol (info, h)
   if ((h->elf_link_hash_flags & ELF_LINK_NON_GOT_REF) == 0)
     return true;
 
+  /* If -z nocopyreloc was given, we won't generate them either.  */
+  if (info->nocopyreloc)
+    {
+      h->elf_link_hash_flags &= ~ELF_LINK_NON_GOT_REF;
+      return true;
+    }
+
+  eh = (struct elf_s390_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) != 0)
+	break;
+    }
+
+  /* If we didn't find any dynamic relocs in read-only sections, then
+     we'll be keeping the dynamic relocs and avoiding the copy reloc.  */ 
+  if (p == NULL)
+    {
+      h->elf_link_hash_flags &= ~ELF_LINK_NON_GOT_REF;
+      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
@@ -1038,20 +1125,14 @@ elf_s390_adjust_dynamic_symbol (info, h)
      both the dynamic object and the regular object will refer to the
      same memory location for the variable.  */
 
-  s = bfd_get_section_by_name (dynobj, ".dynbss");
-  BFD_ASSERT (s != NULL);
+  htab = elf_s390_hash_table (info);
 
-  /* We must generate a R_390_COPY reloc to tell the dynamic linker
-     to copy the initial value out of the dynamic object and into the
-     runtime process image.  We need to remember the offset into the
-     .rel.bss section we are going to use.  */
+  /* We must generate a R_390_COPY reloc to tell the dynamic linker to
+     copy the initial value out of the dynamic object and into the
+     runtime process image.  */
   if ((h->root.u.def.section->flags & SEC_ALLOC) != 0)
     {
-      asection *srel;
-
-      srel = bfd_get_section_by_name (dynobj, ".rela.bss");
-      BFD_ASSERT (srel != NULL);
-      srel->_raw_size += sizeof (Elf32_External_Rela);
+      htab->srelbss->_raw_size += sizeof (Elf32_External_Rela);
       h->elf_link_hash_flags |= ELF_LINK_HASH_NEEDS_COPY;
     }
 
@@ -1062,11 +1143,11 @@ elf_s390_adjust_dynamic_symbol (info, h)
     power_of_two = 3;
 
   /* Apply the required alignment.  */
-  s->_raw_size = BFD_ALIGN (s->_raw_size,
-			    (bfd_size_type) (1 << power_of_two));
-  if (power_of_two > bfd_get_section_alignment (dynobj, s))
+  s = htab->sdynbss;
+  s->_raw_size = BFD_ALIGN (s->_raw_size, (bfd_size_type) (1 << power_of_two));
+  if (power_of_two > bfd_get_section_alignment (htab->elf.dynobj, s))
     {
-      if (! bfd_set_section_alignment (dynobj, s, power_of_two))
+      if (! bfd_set_section_alignment (htab->elf.dynobj, s, power_of_two))
 	return false;
     }
 
@@ -1080,6 +1161,218 @@ elf_s390_adjust_dynamic_symbol (info, h)
   return true;
 }
 
+/* This is the condition under which elf_s390_finish_dynamic_symbol
+   will be called from elflink.h.  If elflink.h doesn't call our
+   finish_dynamic_symbol routine, we'll need to do something about
+   initializing any .plt and .got entries in elf_s390_relocate_section.  */
+#define WILL_CALL_FINISH_DYNAMIC_SYMBOL(DYN, INFO, H) \
+  ((DYN)								\
+   && ((INFO)->shared							\
+       || ((H)->elf_link_hash_flags & ELF_LINK_FORCED_LOCAL) == 0)	\
+   && ((H)->dynindx != -1						\
+       || ((H)->elf_link_hash_flags & ELF_LINK_FORCED_LOCAL) != 0))
+
+/* Allocate space in .plt, .got and associated reloc sections for
+   dynamic relocs.  */
+
+static boolean
+allocate_dynrelocs (h, inf)
+     struct elf_link_hash_entry *h;
+     PTR inf;
+{
+  struct bfd_link_info *info;
+  struct elf_s390_link_hash_table *htab;
+  struct elf_s390_link_hash_entry *eh;
+  struct elf_s390_dyn_relocs *p;
+
+  if (h->root.type == bfd_link_hash_indirect
+      || h->root.type == bfd_link_hash_warning)
+    return true;
+
+  info = (struct bfd_link_info *) inf;
+  htab = elf_s390_hash_table (info);
+
+  if (htab->elf.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.  */
+      if (h->dynindx == -1
+	  && (h->elf_link_hash_flags & ELF_LINK_FORCED_LOCAL) == 0)
+	{
+	  if (! bfd_elf32_link_record_dynamic_symbol (info, h))
+	    return false;
+	}
+
+      if (WILL_CALL_FINISH_DYNAMIC_SYMBOL (1, info, h))
+	{
+	  asection *s = htab->splt;
+
+	  /* If this is the first .plt entry, make room for the special
+	     first entry.  */
+	  if (s->_raw_size == 0)
+	    s->_raw_size += PLT_FIRST_ENTRY_SIZE;
+
+	  h->plt.offset = s->_raw_size;
+
+	  /* If this symbol is not defined in a regular file, and we are
+	     not generating a shared library, then set the symbol to this
+	     location in the .plt.  This is required to make function
+	     pointers compare as equal between the normal executable and
+	     the shared library.  */
+	  if (! info->shared
+	      && (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0)
+	    {
+	      h->root.u.def.section = s;
+	      h->root.u.def.value = h->plt.offset;
+	    }
+	  
+	  /* Make room for this entry.  */
+	  s->_raw_size += PLT_ENTRY_SIZE;
+	  
+	  /* We also need to make an entry in the .got.plt section, which
+	     will be placed in the .got section by the linker script.  */
+	  htab->sgotplt->_raw_size += GOT_ENTRY_SIZE;
+
+	  /* We also need to make an entry in the .rela.plt section.  */
+	  htab->srelplt->_raw_size += sizeof (Elf32_External_Rela);
+	}
+      else
+	{
+ 	  h->plt.offset = (bfd_vma) -1;
+	  h->elf_link_hash_flags &= ~ELF_LINK_HASH_NEEDS_PLT;
+	}
+    } 
+  else
+    {
+      h->plt.offset = (bfd_vma) -1;
+      h->elf_link_hash_flags &= ~ELF_LINK_HASH_NEEDS_PLT;
+    }      
+  
+  if (h->got.refcount > 0)
+    {
+      asection *s;
+      boolean dyn;
+
+      /* 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->elf_link_hash_flags & ELF_LINK_FORCED_LOCAL) == 0)
+	{
+	  if (! bfd_elf32_link_record_dynamic_symbol (info, h))
+	    return false;
+	}
+
+      s = htab->sgot;
+      h->got.offset = s->_raw_size;
+      s->_raw_size += GOT_ENTRY_SIZE;
+      dyn = htab->elf.dynamic_sections_created;
+      if (WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, info, h))
+	htab->srelgot->_raw_size += sizeof (Elf32_External_Rela);
+    }
+  else
+    h->got.offset = (bfd_vma) -1;
+
+  eh = (struct elf_s390_link_hash_entry *) h;
+  if (eh->dyn_relocs == NULL)
+    return true;
+
+  /* In the shared -Bsymbolic case, discard space allocated for
+     dynamic pc-relative relocs against symbols which turn out to be
+     defined in regular objects.  For the normal shared case, discard
+     space for pc-relative relocs that have become local due to symbol
+     visibility changes.  */
+
+  if (info->shared)
+    {
+      if ((h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) != 0
+	  && ((h->elf_link_hash_flags & ELF_LINK_FORCED_LOCAL) != 0
+	      || info->symbolic))
+	{
+	  struct elf_s390_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;
+	    }
+	}
+    }
+  else
+    {
+      /* For the non-shared case, discard space for relocs against
+	 symbols which turn out to need copy relocs or are not
+	 dynamic.  */
+
+      if ((h->elf_link_hash_flags & ELF_LINK_NON_GOT_REF) == 0
+	  && (((h->elf_link_hash_flags & ELF_LINK_HASH_DEF_DYNAMIC) != 0
+	       && (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0)
+	      || (htab->elf.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->elf_link_hash_flags & ELF_LINK_FORCED_LOCAL) == 0)
+	    {
+	      if (! bfd_elf32_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;
+
+    keep:
+    }
+
+  /* Finally, allocate space.  */
+  for (p = eh->dyn_relocs; p != NULL; p = p->next)
+    {
+      asection *sreloc = elf_section_data (p->sec)->sreloc;
+      sreloc->_raw_size += p->count * sizeof (Elf32_External_Rela);
+    }
+
+  return true;
+}
+
+/* Find any dynamic relocs that apply to read-only sections.  */
+
+static boolean
+readonly_dynrelocs (h, inf)
+     struct elf_link_hash_entry *h;
+     PTR inf;
+{
+  struct elf_s390_link_hash_entry *eh;
+  struct elf_s390_dyn_relocs *p;
+
+  eh = (struct elf_s390_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 boolean
@@ -1087,125 +1380,138 @@ elf_s390_size_dynamic_sections (output_bfd, info)
      bfd *output_bfd ATTRIBUTE_UNUSED;
      struct bfd_link_info *info;
 {
+  struct elf_s390_link_hash_table *htab;
   bfd *dynobj;
   asection *s;
   boolean relocs;
-  boolean plt;
+  bfd *ibfd;
 
-  dynobj = elf_hash_table (info)->dynobj;
-  BFD_ASSERT (dynobj != NULL);
+  htab = elf_s390_hash_table (info);
+  dynobj = htab->elf.dynobj;
+  if (dynobj == NULL)
+    abort ();
 
-  if (elf_hash_table (info)->dynamic_sections_created)
+  if (htab->elf.dynamic_sections_created)
     {
       /* Set the contents of the .interp section to the interpreter.  */
       if (! info->shared)
 	{
 	  s = bfd_get_section_by_name (dynobj, ".interp");
-	  BFD_ASSERT (s != NULL);
+	  if (s == NULL)
+	    abort ();
 	  s->_raw_size = sizeof ELF_DYNAMIC_INTERPRETER;
 	  s->contents = (unsigned char *) ELF_DYNAMIC_INTERPRETER;
 	}
     }
-  else
-    {
-      /* We may have created entries in the .rela.got section.
-         However, if we are not creating the dynamic sections, we will
-         not actually use these entries.  Reset the size of .rela.got,
-         which will cause it to get stripped from the output file
-         below.  */
-      s = bfd_get_section_by_name (dynobj, ".rela.got");
-      if (s != NULL)
-	s->_raw_size = 0;
-    }
 
-  /* If this is a -Bsymbolic shared link, then we need to discard all
-     PC relative relocs against symbols defined in a regular object.
-     We allocated space for them in the check_relocs routine, but we
-     will not fill them in in the relocate_section routine.  */
-  if (info->shared)
-    elf_s390_link_hash_traverse (elf_s390_hash_table (info),
-				 elf_s390_discard_copies,
-				 (PTR) info);
-
-  /* The check_relocs and adjust_dynamic_symbol entry points have
-     determined the sizes of the various dynamic sections.  Allocate
-     memory for them.  */
-  plt = false;
-  relocs = false;
-  for (s = dynobj->sections; s != NULL; s = s->next)
+  /* Set up .got offsets for local syms, and space for local dynamic
+     relocs.  */
+  for (ibfd = info->input_bfds; ibfd != NULL; ibfd = ibfd->link_next)
     {
-      const char *name;
-      boolean strip;
+      bfd_signed_vma *local_got;
+      bfd_signed_vma *end_local_got;
+      bfd_size_type locsymcount;
+      Elf_Internal_Shdr *symtab_hdr;
+      asection *srela;
 
-      if ((s->flags & SEC_LINKER_CREATED) == 0)
+      if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour)
 	continue;
 
-      /* It's OK to base decisions on the section name, because none
-	 of the dynobj section names depend upon the input files.  */
-      name = bfd_get_section_name (dynobj, s);
-
-      strip = false;
-
-      if (strcmp (name, ".plt") == 0)
+      for (s = ibfd->sections; s != NULL; s = s->next)
 	{
-	  if (s->_raw_size == 0)
-	    {
-	      /* Strip this section if we don't need it; see the
-                 comment below.  */
-	      strip = true;
-	    }
-	  else
+	  bfd_size_type count = elf_section_data (s)->local_dynrel;
+
+	  if (count != 0)
 	    {
-	      /* Remember whether there is a PLT.  */
-	      plt = true;
+	      srela = elf_section_data (s)->sreloc;
+	      srela->_raw_size += count * sizeof (Elf32_External_Rela);
 	    }
 	}
-      else if (strncmp (name, ".rela", 5) == 0)
+
+      local_got = elf_local_got_refcounts (ibfd);
+      if (!local_got)
+	continue;
+
+      symtab_hdr = &elf_tdata (ibfd)->symtab_hdr;
+      locsymcount = symtab_hdr->sh_info;
+      end_local_got = local_got + locsymcount;
+      s = htab->sgot;
+      srela = htab->srelgot;
+      for (; local_got < end_local_got; ++local_got)
 	{
-	  if (s->_raw_size == 0)
+	  if (*local_got > 0)
 	    {
-	      /* If we don't need this section, strip it from the
-		 output file.  This is to handle .rela.bss and
-		 .rel.plt.  We must create it in
-		 create_dynamic_sections, because it must be created
-		 before the linker maps input sections to output
-		 sections.  The linker does that before
-		 adjust_dynamic_symbol is called, and it is that
-		 function which decides whether anything needs to go
-		 into these sections.  */
-	      strip = true;
+	      *local_got = s->_raw_size;
+	      s->_raw_size += GOT_ENTRY_SIZE;
+	      if (info->shared)
+		srela->_raw_size += sizeof (Elf32_External_Rela);
 	    }
 	  else
-	    {
-	      /* Remember whether there are any reloc sections other
-                 than .rela.plt.  */
-	      if (strcmp (name, ".rela.plt") != 0)
-		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;
-	    }
+	    *local_got = (bfd_vma) -1;
+	}
+    }
+
+  /* Allocate global sym .plt and .got entries, and space for global
+     sym dynamic relocs.  */
+  elf_link_hash_traverse (&htab->elf, allocate_dynrelocs, (PTR) info);
+
+  /* We now have determined the sizes of the various dynamic sections.
+     Allocate memory for them.  */
+  relocs = false;
+  for (s = dynobj->sections; s != NULL; s = s->next)
+    {
+      if ((s->flags & SEC_LINKER_CREATED) == 0)
+	continue;
+
+      if (s == htab->splt
+	  || s == htab->sgot
+	  || s == htab->sgotplt)
+	{
+	  /* Strip this section if we don't need it; see the
+	     comment below.  */
 	}
-      else if (strncmp (name, ".got", 4) != 0)
+      else if (strncmp (bfd_get_section_name (dynobj, s), ".rela", 5) == 0)
+	{
+	  if (s->_raw_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;
+	}
+      else
 	{
 	  /* It's not one of our sections, so don't allocate space.  */
 	  continue;
 	}
 
-      if (strip)
+      if (s->_raw_size == 0)
 	{
+	  /* If we don't need this section, strip it from the
+	     output file.  This is to handle .rela.bss and
+	     .rela.plt.  We must create it in
+	     create_dynamic_sections, because it 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.  */
+
 	  _bfd_strip_section_from_output (info, s);
 	  continue;
 	}
 
-      /* Allocate memory for the section contents.  */
-      s->contents = (bfd_byte *) bfd_alloc (dynobj, s->_raw_size);
-      if (s->contents == NULL && s->_raw_size != 0)
+      /* 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_390_NONE reloc instead
+	 of garbage.  */
+      s->contents = (bfd_byte *) bfd_zalloc (dynobj, s->_raw_size);
+      if (s->contents == NULL)
 	return false;
     }
-
-  if (elf_hash_table (info)->dynamic_sections_created)
+  
+  if (htab->elf.dynamic_sections_created)
     {
       /* Add some entries to the .dynamic section.  We fill in the
 	 values later, in elf_s390_finish_dynamic_sections, but we
@@ -1214,14 +1520,14 @@ elf_s390_size_dynamic_sections (output_bfd, info)
 	 dynamic linker and used by the debugger.  */
 #define add_dynamic_entry(TAG, VAL) \
   bfd_elf32_add_dynamic_entry (info, (bfd_vma) (TAG), (bfd_vma) (VAL))
-
+      
       if (! info->shared)
 	{
 	  if (!add_dynamic_entry (DT_DEBUG, 0))
 	    return false;
 	}
-
-      if (plt)
+      
+      if (htab->splt->_raw_size != 0)
 	{
 	  if (!add_dynamic_entry (DT_PLTGOT, 0)
 	      || !add_dynamic_entry (DT_PLTRELSZ, 0)
@@ -1229,55 +1535,30 @@ elf_s390_size_dynamic_sections (output_bfd, info)
 	      || !add_dynamic_entry (DT_JMPREL, 0))
 	    return false;
 	}
-
+      
       if (relocs)
         {
           if (!add_dynamic_entry (DT_RELA, 0)
               || !add_dynamic_entry (DT_RELASZ, 0)
               || !add_dynamic_entry (DT_RELAENT, sizeof (Elf32_External_Rela)))
 	    return false;
-         }
 
-      if ((info->flags & DF_TEXTREL) != 0)
-	{
-	  if (!add_dynamic_entry (DT_TEXTREL, 0))
-	    return false;
-	  info->flags |= DF_TEXTREL;
+	  /* If any dynamic relocs apply to a read-only section,
+	     then we need a DT_TEXTREL entry.  */
+	  elf_link_hash_traverse (&htab->elf, readonly_dynrelocs, (PTR) info);
+	  
+	  if ((info->flags & DF_TEXTREL) != 0)
+	    {
+	      if (!add_dynamic_entry (DT_TEXTREL, 0))
+		return false;
+	    }
 	}
     }
 #undef add_dynamic_entry
-
+  
   return true;
 }
 
-/* This function is called via elf_s390_link_hash_traverse if we are
-   creating a shared object with -Bsymbolic.  It discards the space
-   allocated to copy PC relative relocs against symbols which are
-   defined in regular objects.  We allocated space for them in the
-   check_relocs routine, but we won't fill them in in the
-   relocate_section routine.  */
-
-/*ARGSUSED*/
-static boolean
-elf_s390_discard_copies (h, inf)
-     struct elf_s390_link_hash_entry *h;
-     PTR inf;
-{
-  struct elf_s390_pcrel_relocs_copied *s;
-  struct bfd_link_info *info = (struct bfd_link_info *) inf;
-
-  /* If a symbol has been forced local or we have found a regular
-     definition for the symbolic link case, then we won't be needing
-     any relocs.  */
-  if ((h->root.elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) != 0
-      && ((h->root.elf_link_hash_flags & ELF_LINK_FORCED_LOCAL) != 0
-	  || info->symbolic))
-    {
-      for (s = h->pcrel_relocs_copied; s != NULL; s = s->next)
-	s->section->_raw_size -= s->count * sizeof (Elf32_External_Rela);
-    }
-  return true;
-}
 /* Relocate a 390 ELF section.  */
 
 static boolean
@@ -1292,30 +1573,18 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
      Elf_Internal_Sym *local_syms;
      asection **local_sections;
 {
-  bfd *dynobj;
+  struct elf_s390_link_hash_table *htab;
   Elf_Internal_Shdr *symtab_hdr;
   struct elf_link_hash_entry **sym_hashes;
   bfd_vma *local_got_offsets;
-  asection *sgot;
-  asection *splt;
-  asection *sreloc;
   Elf_Internal_Rela *rel;
   Elf_Internal_Rela *relend;
 
-  dynobj = elf_hash_table (info)->dynobj;
+  htab = elf_s390_hash_table (info);
   symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
   sym_hashes = elf_sym_hashes (input_bfd);
   local_got_offsets = elf_local_got_offsets (input_bfd);
 
-  sgot = NULL;
-  splt = NULL;
-  sreloc = NULL;
-  if (dynobj != NULL)
-    {
-      splt = bfd_get_section_by_name (dynobj, ".plt");
-      sgot = bfd_get_section_by_name (dynobj, ".got");
-    }
-
   rel = relocs;
   relend = relocs + input_section->reloc_count;
   for (; rel < relend; rel++)
@@ -1326,9 +1595,11 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
       struct elf_link_hash_entry *h;
       Elf_Internal_Sym *sym;
       asection *sec;
+      bfd_vma off;
       bfd_vma relocation;
+      boolean unresolved_reloc;
       bfd_reloc_status_type r;
-
+      
       r_type = ELF32_R_TYPE (rel->r_info);
       if (r_type == (int) R_390_GNU_VTINHERIT
           || r_type == (int) R_390_GNU_VTENTRY)
@@ -1339,9 +1610,9 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
 	  return false;
 	}
       howto = elf_howto_table + r_type;
-
+      
       r_symndx = ELF32_R_SYM (rel->r_info);
-
+      
       if (info->relocateable)
 	{
 	  /* This is a relocateable link.  We don't have to change
@@ -1357,14 +1628,15 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
 		  rel->r_addend += sec->output_offset + sym->st_value;
 		}
 	    }
-
+	  
 	  continue;
 	}
-
+      
       /* This is a final link.  */
       h = NULL;
       sym = NULL;
       sec = NULL;
+      unresolved_reloc = false;
       if (r_symndx < symtab_hdr->sh_info)
 	{
 	  sym = local_syms + r_symndx;
@@ -1379,18 +1651,19 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
 	  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;
+	  
 	  if (h->root.type == bfd_link_hash_defined
 	      || h->root.type == bfd_link_hash_defweak)
 	    {
 	      sec = h->root.u.def.section;
 	      if (r_type == R_390_GOTPC
-		  || ((r_type == R_390_PLT16DBL ||
-                       r_type == R_390_PLT32)
-		      && splt != NULL
+		  || ((r_type == R_390_PLT16DBL
+                       || r_type == R_390_PLT32)
+		      && htab->splt != NULL
 		      && h->plt.offset != (bfd_vma) -1)
-		  || ((r_type == R_390_GOT12 ||
-                       r_type == R_390_GOT16 ||
-                       r_type == R_390_GOT32)
+		  || ((r_type == R_390_GOT12
+                       || r_type == R_390_GOT16
+                       || r_type == R_390_GOT32)
 		      && elf_hash_table (info)->dynamic_sections_created
 		      && (! info->shared
 			  || (! info->symbolic && h->dynindx != -1)
@@ -1400,14 +1673,14 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
 		      && ((! info->symbolic && h->dynindx != -1)
 			  || (h->elf_link_hash_flags
 			      & ELF_LINK_HASH_DEF_REGULAR) == 0)
-		      && ( r_type == R_390_8 ||
-			   r_type == R_390_16 ||
-                           r_type == R_390_32 ||
-                           r_type == R_390_PC16 ||
-                           r_type == R_390_PC16DBL ||
-                           r_type == R_390_PC32)
+		      && (r_type == R_390_8
+			  || r_type == R_390_16
+                          || r_type == R_390_32
+                          || r_type == R_390_PC16
+                          || r_type == R_390_PC16DBL
+                          || r_type == R_390_PC32)
                       && ((input_section->flags & SEC_ALLOC) != 0
-                          /* DWARF will emit R_386_32 relocations in its
+                          /* DWARF will emit R_390_32 relocations in its
                              sections against symbols defined externally
                              in shared libraries.  We can't do anything
                              with them here.  */
@@ -1422,10 +1695,11 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
 		}
 	      else if (sec->output_section == NULL)
 		{
-		  (*_bfd_error_handler)
-		    (_("%s: warning: unresolvable relocation against symbol `%s' from %s section"),
-		     bfd_archive_filename (input_bfd), h->root.root.string,
-		     bfd_get_section_name (input_bfd, input_section));
+		  /* Set a flag that will be cleared later if we find a
+		     relocation value for this symbol.  output_section
+		     is typically NULL for symbols satisfied by a shared
+		     library.  */
+		  unresolved_reloc = true;
 		  relocation = 0;
 		}
 	      else
@@ -1445,13 +1719,13 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
 	      if (! ((*info->callbacks->undefined_symbol)
 		     (info, h->root.root.string, input_bfd,
           	      input_section, rel->r_offset,
-	 	     (!info->shared || info->no_undefined
-		      || ELF_ST_VISIBILITY (h->other)))))
+		      (!info->shared || info->no_undefined
+		       || ELF_ST_VISIBILITY (h->other)))))
 		return false;
 	      relocation = 0;
 	    }
 	}
-
+      
       switch (r_type)
 	{
         case R_390_GOT12:
@@ -1459,18 +1733,20 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
         case R_390_GOT32:
           /* Relocation is to the entry for this symbol in the global
              offset table.  */
-	  BFD_ASSERT (sgot != NULL);
-
+	  if (htab->sgot == NULL)
+	    abort ();
+	  
           if (h != NULL)
             {
-              bfd_vma off;
-
+	      boolean dyn;
+	      
               off = h->got.offset;
-              BFD_ASSERT (off != (bfd_vma) -1);
-
-              if (! elf_hash_table (info)->dynamic_sections_created
+	      dyn = htab->elf.dynamic_sections_created;
+              if (! WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, info, h)
                   || (info->shared
-                      && (info->symbolic || h->dynindx == -1)
+                      && (info->symbolic
+			  || h->dynindx == -1
+			  || (h->elf_link_hash_flags & ELF_LINK_FORCED_LOCAL))
                       && (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR)))
                 {
                   /* This is actually a static link, or it is a
@@ -1490,18 +1766,17 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
                   else
                     {
 		      bfd_put_32 (output_bfd, relocation,
-				  sgot->contents + off);
+				  htab->sgot->contents + off);
                       h->got.offset |= 1;
                     }
                 }
-	      relocation = sgot->output_offset + off;
+	      else
+		unresolved_reloc = false;
             }
           else
             {
-              bfd_vma off;
-
-              BFD_ASSERT (local_got_offsets != NULL
-                          && local_got_offsets[r_symndx] != (bfd_vma) -1);
+	      if (local_got_offsets == NULL)
+		abort ();
 
               off = local_got_offsets[r_symndx];
 
@@ -1512,67 +1787,55 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
                 off &= ~1;
               else
                 {
-                  bfd_put_32 (output_bfd, relocation, sgot->contents + off);
+                  bfd_put_32 (output_bfd, relocation,
+			      htab->sgot->contents + off);
 
                   if (info->shared)
                     {
                       asection *srelgot;
                       Elf_Internal_Rela outrel;
+		      Elf32_External_Rela *loc;
 
-                      srelgot = bfd_get_section_by_name (dynobj, ".rela.got");
-                      BFD_ASSERT (srelgot != NULL);
+                      srelgot = htab->srelgot;
+		      if (srelgot == NULL)
+			abort ();
 
-                      outrel.r_offset = (sgot->output_section->vma
-                                         + sgot->output_offset
+                      outrel.r_offset = (htab->sgot->output_section->vma
+                                         + htab->sgot->output_offset
                                          + off);
                       outrel.r_info = ELF32_R_INFO (0, R_390_RELATIVE);
 		      outrel.r_addend = relocation;
-                      bfd_elf32_swap_reloca_out (output_bfd, &outrel,
-                                                (((Elf32_External_Rela *)
-                                                  srelgot->contents)
-                                                 + srelgot->reloc_count));
-                      ++srelgot->reloc_count;
+		      loc = (Elf32_External_Rela *) srelgot->contents;
+		      loc += srelgot->reloc_count++;
+                      bfd_elf32_swap_reloca_out (output_bfd, &outrel, loc);
                     }
 
                   local_got_offsets[r_symndx] |= 1;
                 }
-
-	      relocation = sgot->output_offset + off;
             }
 
+	  if (off >= (bfd_vma) -2)
+	    abort ();
 
+	  relocation = htab->sgot->output_offset + off;
           break;
 
         case R_390_GOTOFF:
           /* Relocation is relative to the start of the global offset
              table.  */
 
-          if (sgot == NULL)
-            {
-              sgot = bfd_get_section_by_name (dynobj, ".got");
-              BFD_ASSERT (sgot != NULL);
-            }
-
           /* Note that sgot->output_offset is not involved in this
              calculation.  We always want the start of .got.  If we
              defined _GLOBAL_OFFSET_TABLE in a different way, as is
              permitted by the ABI, we might have to change this
              calculation.  */
-          relocation -= sgot->output_section->vma;
-
+          relocation -= htab->sgot->output_section->vma;
           break;
 
         case R_390_GOTPC:
           /* Use global offset table as symbol value.  */
-
-          if (sgot == NULL)
-            {
-              sgot = bfd_get_section_by_name (dynobj, ".got");
-              BFD_ASSERT (sgot != NULL);
-            }
-
-          relocation = sgot->output_section->vma;
-
+          relocation = htab->sgot->output_section->vma;
+	  unresolved_reloc = false;
           break;
 
         case R_390_PLT16DBL:
@@ -1585,7 +1848,8 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
           if (h == NULL)
             break;
 
-          if (h->plt.offset == (bfd_vma) -1 || splt == NULL)
+          if (h->plt.offset == (bfd_vma) -1
+	      || htab->splt == NULL)
             {
               /* We didn't make a PLT entry for this symbol.  This
                  happens when statically linking PIC code, or when
@@ -1593,10 +1857,10 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
               break;
             }
 
-          relocation = (splt->output_section->vma
-                        + splt->output_offset
+          relocation = (htab->splt->output_section->vma
+                        + htab->splt->output_offset
                         + h->plt.offset);
-
+	  unresolved_reloc = false;
           break;
 
         case R_390_8:
@@ -1605,107 +1869,90 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
         case R_390_PC16:
         case R_390_PC16DBL:
         case R_390_PC32:
-          if (info->shared
-              && (input_section->flags & SEC_ALLOC) != 0
-              && ((r_type != R_390_PC16 &&
-                   r_type != R_390_PC16DBL &&
-                   r_type != R_390_PC32)
-                  || (h != NULL
-                      && h->dynindx != -1
-                      && (! info->symbolic
-                          || (h->elf_link_hash_flags
-                              & ELF_LINK_HASH_DEF_REGULAR) == 0))))
+          if ((info->shared
+	       && (input_section->flags & SEC_ALLOC) != 0
+	       && ((r_type != R_390_PC16
+		    && r_type != R_390_PC16DBL
+		    && r_type != R_390_PC32)
+		   || (h != NULL
+		       && h->dynindx != -1
+		       && (! info->symbolic
+			   || (h->elf_link_hash_flags
+			       & ELF_LINK_HASH_DEF_REGULAR) == 0))))
+	      || (!info->shared
+		  && (input_section->flags & SEC_ALLOC) != 0
+		  && h != NULL
+		  && h->dynindx != -1
+		  && (h->elf_link_hash_flags & ELF_LINK_NON_GOT_REF) == 0
+		  && (((h->elf_link_hash_flags
+		       & ELF_LINK_HASH_DEF_DYNAMIC) != 0
+		       && (h->elf_link_hash_flags
+			   & ELF_LINK_HASH_DEF_REGULAR) == 0)
+		      || h->root.type == bfd_link_hash_undefweak
+		      || h->root.type == bfd_link_hash_undefined)))
             {
               Elf_Internal_Rela outrel;
               boolean skip, relocate;
-
-              /* When generating a shared object, these relocations
-                 are copied into the output file to be resolved at run
-                 time.  */
-
-              if (sreloc == NULL)
-                {
-                  const char *name;
-
-                  name = (bfd_elf_string_from_elf_section
-                          (input_bfd,
-                           elf_elfheader (input_bfd)->e_shstrndx,
-                           elf_section_data (input_section)->rel_hdr.sh_name));
-                  if (name == NULL)
-                    return false;
-
-                  BFD_ASSERT (strncmp (name, ".rela", 5) == 0
-                              && strcmp (bfd_get_section_name (input_bfd,
-                                                               input_section),
-                                         name + 5) == 0);
-
-                  sreloc = bfd_get_section_by_name (dynobj, name);
-                  BFD_ASSERT (sreloc != NULL);
-                }
-
+	      asection *sreloc;
+	      Elf32_External_Rela *loc;
+	      
+	      /* When generating a shared object, these relocations
+		 are copied into the output file to be resolved at run
+		 time.  */
+	      
               skip = false;
-
+	      
               if (elf_section_data (input_section)->stab_info == NULL)
                 outrel.r_offset = rel->r_offset;
               else
                 {
-                  bfd_vma off;
-
                   off = (_bfd_stab_section_offset
-                         (output_bfd, &elf_hash_table (info)->stab_info,
-                          input_section,
+                         (output_bfd, htab->elf.stab_info, input_section,
                           &elf_section_data (input_section)->stab_info,
                           rel->r_offset));
                   if (off == (bfd_vma) -1)
                     skip = true;
                   outrel.r_offset = off;
                 }
-
+	      
               outrel.r_offset += (input_section->output_section->vma
                                   + input_section->output_offset);
-
+	      
               if (skip)
                 {
                   memset (&outrel, 0, sizeof outrel);
                   relocate = false;
                 }
-              else if (r_type == R_390_PC16 ||
-                       r_type == R_390_PC16DBL ||
-                       r_type == R_390_PC32)
+              else if (h != NULL
+		       && h->dynindx != -1
+		       && (r_type == R_390_PC16
+			   || r_type == R_390_PC16DBL
+			   || r_type == R_390_PC32
+			   || !info->shared
+			   || !info->symbolic
+			   || (h->elf_link_hash_flags
+			       & ELF_LINK_HASH_DEF_REGULAR) == 0))
                 {
-                  BFD_ASSERT (h != NULL && h->dynindx != -1);
 		  relocate = false;
                   outrel.r_info = ELF32_R_INFO (h->dynindx, r_type);
 		  outrel.r_addend = relocation + rel->r_addend;
                 }
               else
                 {
-                  /* h->dynindx may be -1 if this symbol was marked to
-                     become local.  */
-                  if (h == NULL
-                      || ((info->symbolic || h->dynindx == -1)
-                          && (h->elf_link_hash_flags
-                              & ELF_LINK_HASH_DEF_REGULAR) != 0))
-                    {
-                      relocate = true;
-                      outrel.r_info = ELF32_R_INFO (0, R_390_RELATIVE);
-		      outrel.r_addend = relocation + rel->r_addend;
-                    }
-		  else
-		    {
-		      BFD_ASSERT (h->dynindx != -1);
-		      relocate = false;
-		      outrel.r_info = ELF32_R_INFO (h->dynindx, R_390_32);
-		      outrel.r_addend = relocation + rel->r_addend;
-		    }
+		  /* This symbol is local, or marked to become local.  */
+		  relocate = true;
+		  outrel.r_info = ELF32_R_INFO (0, R_390_RELATIVE);
+		  outrel.r_addend = relocation + rel->r_addend;
                 }
-
-              bfd_elf32_swap_reloca_out (output_bfd, &outrel,
-                                        (((Elf32_External_Rela *)
-                                          sreloc->contents)
-                                         + sreloc->reloc_count));
-              ++sreloc->reloc_count;
-
+	      
+	      sreloc = elf_section_data (input_section)->sreloc;
+	      if (sreloc == NULL)
+		abort ();
+	      
+	      loc = (Elf32_External_Rela *) sreloc->contents;
+	      loc += sreloc->reloc_count++;
+	      bfd_elf32_swap_reloca_out (output_bfd, &outrel, loc);
+	      
               /* If this reloc is against an external symbol, we do
                  not want to fiddle with the addend.  Otherwise, we
                  need to include the symbol value so that it becomes
@@ -1713,50 +1960,65 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
               if (! relocate)
                 continue;
             }
-
-          break;
-
-        default:
-          break;
-        }
-
+	  
+	  break;
+	  
+	default:
+	  break;
+	}
+      
+      if (unresolved_reloc
+	  && !(info->shared
+	       && (input_section->flags & SEC_DEBUGGING) != 0
+	       && (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_DYNAMIC) != 0))
+	(*_bfd_error_handler)
+	  (_("%s(%s+0x%lx): unresolvable relocation against symbol `%s'"),
+	   bfd_archive_filename (input_bfd),
+	   bfd_get_section_name (input_bfd, input_section),
+	   (long) rel->r_offset,
+	   h->root.root.string);
+      
       r = _bfd_final_link_relocate (howto, input_bfd, input_section,
-				      contents, rel->r_offset,
-				      relocation, rel->r_addend);
-
+				    contents, rel->r_offset,
+				    relocation, rel->r_addend);
+      
       if (r != bfd_reloc_ok)
 	{
-	  switch (r)
+	  const char *name;
+	  
+	  if (h != NULL)
+	    name = h->root.root.string;
+	  else
 	    {
-	    default:
-	    case bfd_reloc_outofrange:
-	      abort ();
-	    case bfd_reloc_overflow:
-	      {
-		const char *name;
-
-		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)
-		      return false;
-		    if (*name == '\0')
-		      name = bfd_section_name (input_bfd, sec);
-		  }
-		if (! ((*info->callbacks->reloc_overflow)
-		       (info, name, howto->name, (bfd_vma) 0,
-			input_bfd, input_section, rel->r_offset)))
-		  return false;
-	      }
-	      break;
+	      name = bfd_elf_string_from_elf_section (input_bfd,
+						      symtab_hdr->sh_link,
+						      sym->st_name);
+	      if (name == NULL)
+		return false;
+	      if (*name == '\0')
+		name = bfd_section_name (input_bfd, sec);
+	    }
+	  
+	  if (r == bfd_reloc_overflow)
+	    {
+	      
+	      if (! ((*info->callbacks->reloc_overflow)
+		     (info, name, howto->name, (bfd_vma) 0,
+		      input_bfd, input_section, rel->r_offset)))
+		return false;
+	    }
+	  else
+	    {
+	      (*_bfd_error_handler)
+		(_("%s(%s+0x%lx): reloc against `%s': error %d"),
+		 bfd_archive_filename (input_bfd),
+		 bfd_get_section_name (input_bfd, input_section),
+		 (long) rel->r_offset, name, (int) r);
+	      return false;
 	    }
 	}
     }
-
+  
   return true;
 }
 
@@ -1770,29 +2032,26 @@ elf_s390_finish_dynamic_symbol (output_bfd, info, h, sym)
      struct elf_link_hash_entry *h;
      Elf_Internal_Sym *sym;
 {
-  bfd *dynobj;
-
-  dynobj = elf_hash_table (info)->dynobj;
-
+  struct elf_s390_link_hash_table *htab;
+  
+  htab = elf_s390_hash_table (info);
+  
   if (h->plt.offset != (bfd_vma) -1)
     {
-      asection *splt;
-      asection *srela;
+      bfd_vma plt_index;
+      bfd_vma got_offset;
       Elf_Internal_Rela rela;
+      Elf32_External_Rela *loc;
       bfd_vma relative_offset;
-      bfd_vma got_offset;
-      bfd_vma plt_index;
-      asection *sgot;
-
+      
       /* This symbol has an entry in the procedure linkage table.  Set
          it up.  */
-
-      BFD_ASSERT (h->dynindx != -1);
-
-      splt = bfd_get_section_by_name (dynobj, ".plt");
-      sgot = bfd_get_section_by_name (dynobj, ".got.plt");
-      srela = bfd_get_section_by_name (dynobj, ".rela.plt");
-      BFD_ASSERT (splt != NULL && sgot != NULL && srela != NULL);
+      
+      if (h->dynindx == -1
+	  || htab->splt == NULL
+	  || htab->sgotplt == NULL
+	  || htab->srelplt == NULL)
+	abort ();
 
       /* Calc. index no.
          Current offset - size first entry / entry size.  */
@@ -1813,122 +2072,122 @@ elf_s390_finish_dynamic_symbol (output_bfd, info, h, sym)
 
       /* Fill in the entry in the procedure linkage table.  */
       if (!info->shared)
-       {
-        bfd_put_32 (output_bfd, (bfd_vma) PLT_ENTRY_WORD0,
-                    splt->contents + h->plt.offset);
-        bfd_put_32 (output_bfd, (bfd_vma) PLT_ENTRY_WORD1,
-                    splt->contents + h->plt.offset + 4);
-        bfd_put_32 (output_bfd, (bfd_vma) PLT_ENTRY_WORD2,
-                    splt->contents + h->plt.offset + 8);
-        bfd_put_32 (output_bfd, (bfd_vma) PLT_ENTRY_WORD3,
-                    splt->contents + h->plt.offset + 12);
-        bfd_put_32 (output_bfd, (bfd_vma) PLT_ENTRY_WORD4,
-                    splt->contents + h->plt.offset + 16);
-        bfd_put_32 (output_bfd, (bfd_vma) 0 + (relative_offset << 16),
-                    splt->contents + h->plt.offset + 20);
-        bfd_put_32 (output_bfd,
-                    (sgot->output_section->vma
-		     + sgot->output_offset
-		     + got_offset),
-                     splt->contents + h->plt.offset + 24);
-       }
+	{
+          bfd_put_32 (output_bfd, (bfd_vma) PLT_ENTRY_WORD0,
+		      htab->splt->contents + h->plt.offset);
+	  bfd_put_32 (output_bfd, (bfd_vma) PLT_ENTRY_WORD1,
+		      htab->splt->contents + h->plt.offset + 4);
+	  bfd_put_32 (output_bfd, (bfd_vma) PLT_ENTRY_WORD2,
+		      htab->splt->contents + h->plt.offset + 8);
+	  bfd_put_32 (output_bfd, (bfd_vma) PLT_ENTRY_WORD3,
+		      htab->splt->contents + h->plt.offset + 12);
+	  bfd_put_32 (output_bfd, (bfd_vma) PLT_ENTRY_WORD4,
+		      htab->splt->contents + h->plt.offset + 16);
+	  bfd_put_32 (output_bfd, (bfd_vma) 0+(relative_offset << 16),
+		      htab->splt->contents + h->plt.offset + 20);
+	  bfd_put_32 (output_bfd,
+		      (htab->sgotplt->output_section->vma
+		       + htab->sgotplt->output_offset
+		       + got_offset),
+		      htab->splt->contents + h->plt.offset + 24);
+	}
       else if (got_offset < 4096)
-       {
-        bfd_put_32 (output_bfd, (bfd_vma) PLT_PIC12_ENTRY_WORD0 + got_offset,
-                    splt->contents + h->plt.offset);
-        bfd_put_32 (output_bfd, (bfd_vma) PLT_PIC12_ENTRY_WORD1,
-                    splt->contents + h->plt.offset + 4);
-        bfd_put_32 (output_bfd, (bfd_vma) PLT_PIC12_ENTRY_WORD2,
-                    splt->contents + h->plt.offset + 8);
-        bfd_put_32 (output_bfd, (bfd_vma) PLT_PIC12_ENTRY_WORD3,
-                    splt->contents + h->plt.offset + 12);
-        bfd_put_32 (output_bfd, (bfd_vma) PLT_PIC12_ENTRY_WORD4,
-                    splt->contents + h->plt.offset + 16);
-        bfd_put_32 (output_bfd, (bfd_vma) 0 + (relative_offset << 16),
-                    splt->contents + h->plt.offset + 20);
-        bfd_put_32 (output_bfd, (bfd_vma) 0,
-                    splt->contents + h->plt.offset + 24);
-       }
+	{
+	  bfd_put_32 (output_bfd, (bfd_vma) PLT_PIC12_ENTRY_WORD0 + got_offset,
+		      htab->splt->contents + h->plt.offset);
+	  bfd_put_32 (output_bfd, (bfd_vma) PLT_PIC12_ENTRY_WORD1,
+		      htab->splt->contents + h->plt.offset + 4);
+	  bfd_put_32 (output_bfd, (bfd_vma) PLT_PIC12_ENTRY_WORD2,
+		      htab->splt->contents + h->plt.offset + 8);
+	  bfd_put_32 (output_bfd, (bfd_vma) PLT_PIC12_ENTRY_WORD3,
+		      htab->splt->contents + h->plt.offset + 12);
+	  bfd_put_32 (output_bfd, (bfd_vma) PLT_PIC12_ENTRY_WORD4,
+		      htab->splt->contents + h->plt.offset + 16);
+	  bfd_put_32 (output_bfd, (bfd_vma) 0+(relative_offset << 16),
+		      htab->splt->contents + h->plt.offset + 20);
+	  bfd_put_32 (output_bfd, (bfd_vma) 0,
+		      htab->splt->contents + h->plt.offset + 24);
+	}
       else if (got_offset < 32768)
-       {
-        bfd_put_32 (output_bfd, (bfd_vma) PLT_PIC16_ENTRY_WORD0 + got_offset,
-                    splt->contents + h->plt.offset);
-        bfd_put_32 (output_bfd, (bfd_vma) PLT_PIC16_ENTRY_WORD1,
-                    splt->contents + h->plt.offset + 4);
-        bfd_put_32 (output_bfd, (bfd_vma) PLT_PIC16_ENTRY_WORD2,
-                    splt->contents + h->plt.offset + 8);
-        bfd_put_32 (output_bfd, (bfd_vma) PLT_PIC16_ENTRY_WORD3,
-                    splt->contents + h->plt.offset + 12);
-        bfd_put_32 (output_bfd, (bfd_vma) PLT_PIC16_ENTRY_WORD4,
-                    splt->contents + h->plt.offset + 16);
-        bfd_put_32 (output_bfd, (bfd_vma) 0 + (relative_offset << 16),
-                    splt->contents + h->plt.offset + 20);
-        bfd_put_32 (output_bfd, (bfd_vma) 0,
-                    splt->contents + h->plt.offset + 24);
-       }
+	{
+	  bfd_put_32 (output_bfd, (bfd_vma) PLT_PIC16_ENTRY_WORD0 + got_offset,
+		      htab->splt->contents + h->plt.offset);
+	  bfd_put_32 (output_bfd, (bfd_vma) PLT_PIC16_ENTRY_WORD1,
+		      htab->splt->contents + h->plt.offset + 4);
+	  bfd_put_32 (output_bfd, (bfd_vma) PLT_PIC16_ENTRY_WORD2,
+		      htab->splt->contents + h->plt.offset + 8);
+	  bfd_put_32 (output_bfd, (bfd_vma) PLT_PIC16_ENTRY_WORD3,
+		      htab->splt->contents + h->plt.offset + 12);
+	  bfd_put_32 (output_bfd, (bfd_vma) PLT_PIC16_ENTRY_WORD4,
+		      htab->splt->contents + h->plt.offset + 16);
+	  bfd_put_32 (output_bfd, (bfd_vma) 0+(relative_offset << 16),
+		      htab->splt->contents + h->plt.offset + 20);
+	  bfd_put_32 (output_bfd, (bfd_vma) 0,
+		      htab->splt->contents + h->plt.offset + 24);
+	}
       else
-       {
-        bfd_put_32 (output_bfd, (bfd_vma) PLT_PIC_ENTRY_WORD0,
-		    splt->contents + h->plt.offset);
-        bfd_put_32 (output_bfd, (bfd_vma) PLT_PIC_ENTRY_WORD1,
-		    splt->contents + h->plt.offset + 4);
-        bfd_put_32 (output_bfd, (bfd_vma) PLT_PIC_ENTRY_WORD2,
-		    splt->contents + h->plt.offset + 8);
-        bfd_put_32 (output_bfd, (bfd_vma) PLT_PIC_ENTRY_WORD3,
-		    splt->contents + h->plt.offset + 12);
-        bfd_put_32 (output_bfd, (bfd_vma) PLT_PIC_ENTRY_WORD4,
-		    splt->contents + h->plt.offset + 16);
-        bfd_put_32 (output_bfd, (bfd_vma) 0 + (relative_offset << 16),
-		    splt->contents + h->plt.offset + 20);
-        bfd_put_32 (output_bfd, got_offset,
-		    splt->contents + h->plt.offset + 24);
-       }
+	{
+	  bfd_put_32 (output_bfd, (bfd_vma) PLT_PIC_ENTRY_WORD0,
+		      htab->splt->contents + h->plt.offset);
+	  bfd_put_32 (output_bfd, (bfd_vma) PLT_PIC_ENTRY_WORD1,
+		      htab->splt->contents + h->plt.offset + 4);
+	  bfd_put_32 (output_bfd, (bfd_vma) PLT_PIC_ENTRY_WORD2,
+		      htab->splt->contents + h->plt.offset + 8);
+	  bfd_put_32 (output_bfd, (bfd_vma) PLT_PIC_ENTRY_WORD3,
+		      htab->splt->contents + h->plt.offset + 12);
+	  bfd_put_32 (output_bfd, (bfd_vma) PLT_PIC_ENTRY_WORD4,
+		      htab->splt->contents + h->plt.offset + 16);
+	  bfd_put_32 (output_bfd, (bfd_vma) 0+(relative_offset << 16),
+		      htab->splt->contents + h->plt.offset + 20);
+	  bfd_put_32 (output_bfd, got_offset,
+		      htab->splt->contents + h->plt.offset + 24);
+	}
       /* Insert offset into  reloc. table here.  */
       bfd_put_32 (output_bfd, plt_index * sizeof (Elf32_External_Rela),
-                  splt->contents + h->plt.offset + 28);
-      /* Fill in the entry in the .rela.plt section.  */
-      rela.r_offset = (sgot->output_section->vma
-		       + sgot->output_offset
-		       + got_offset);
-      rela.r_info = ELF32_R_INFO (h->dynindx, R_390_JMP_SLOT);
-      rela.r_addend = 0;
-      bfd_elf32_swap_reloca_out (output_bfd, &rela,
-				 ((Elf32_External_Rela *) srela->contents
-				  + plt_index ));
+                  htab->splt->contents + h->plt.offset + 28);
 
       /* Fill in the entry in the global offset table.
          Points to instruction after GOT offset.  */
       bfd_put_32 (output_bfd,
-		  (splt->output_section->vma
-		   + splt->output_offset
+		  (htab->splt->output_section->vma
+		   + htab->splt->output_offset
 		   + h->plt.offset
 		   + 12),
-		  sgot->contents + got_offset);
-
+		  htab->sgotplt->contents + got_offset);
 
+      /* Fill in the entry in the .rela.plt section.  */
+      rela.r_offset = (htab->sgotplt->output_section->vma
+		       + htab->sgotplt->output_offset
+		       + got_offset);
+      rela.r_info = ELF32_R_INFO (h->dynindx, R_390_JMP_SLOT);
+      rela.r_addend = 0;
+      loc = (Elf32_External_Rela *) htab->srelplt->contents + plt_index;
+      bfd_elf32_swap_reloca_out (output_bfd, &rela, loc);
+  
       if ((h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0)
 	{
 	  /* Mark the symbol as undefined, rather than as defined in
-	     the .plt section.  Leave the value alone.  */
+	     the .plt section.  Leave the value alone.  This is a clue
+	     for the dynamic linker, to make function pointer
+	     comparisons work between an application and shared
+	     library.  */  
 	  sym->st_shndx = SHN_UNDEF;
 	}
     }
-
+  
   if (h->got.offset != (bfd_vma) -1)
     {
-      asection *sgot;
-      asection *srela;
       Elf_Internal_Rela rela;
+      Elf32_External_Rela *loc;
 
       /* This symbol has an entry in the global offset table.  Set it
          up.  */
 
-      sgot = bfd_get_section_by_name (dynobj, ".got");
-      srela = bfd_get_section_by_name (dynobj, ".rela.got");
-      BFD_ASSERT (sgot != NULL && srela != NULL);
+      if (htab->sgot == NULL || htab->srelgot == NULL)
+	abort ();
 
-      rela.r_offset = (sgot->output_section->vma
-		       + sgot->output_offset
+      rela.r_offset = (htab->sgot->output_section->vma
+		       + htab->sgot->output_offset
 		       + (h->got.offset &~ (bfd_vma) 1));
 
       /* If this is a static link, or it is a -Bsymbolic link and the
@@ -1936,55 +2195,52 @@ elf_s390_finish_dynamic_symbol (output_bfd, info, h, sym)
 	 of a version file, we just want to emit a RELATIVE reloc.
 	 The entry in the global offset table will already have been
 	 initialized in the relocate_section function.  */
-      if (! elf_hash_table (info)->dynamic_sections_created
-	  || (info->shared
-	      && (info->symbolic || h->dynindx == -1)
-	      && (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR)))
-        {
-          rela.r_info = ELF32_R_INFO (0, R_390_RELATIVE);
-          rela.r_addend = (h->root.u.def.value
+      if (info->shared
+	  && (info->symbolic
+	      || h->dynindx == -1
+	      || (h->elf_link_hash_flags & ELF_LINK_FORCED_LOCAL))
+	  && (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR))
+	{
+	  BFD_ASSERT((h->got.offset & 1) != 0);
+	  rela.r_info = ELF32_R_INFO (0, R_390_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);
+	  bfd_put_32 (output_bfd, (bfd_vma) 0, htab->sgot->contents + h->got.offset);
 	  rela.r_info = ELF32_R_INFO (h->dynindx, R_390_GLOB_DAT);
           rela.r_addend = 0;
         }
 
-      bfd_elf32_swap_reloca_out (output_bfd, &rela,
-				 ((Elf32_External_Rela *) srela->contents
-				  + srela->reloc_count));
-      ++srela->reloc_count;
+      loc = (Elf32_External_Rela *) htab->srelgot->contents;
+      loc += htab->srelgot->reloc_count++;
+      bfd_elf32_swap_reloca_out (output_bfd, &rela, loc);
     }
 
   if ((h->elf_link_hash_flags & ELF_LINK_HASH_NEEDS_COPY) != 0)
     {
-      asection *s;
       Elf_Internal_Rela rela;
+      Elf32_External_Rela *loc;
 
       /* 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));
-
-
-      s = bfd_get_section_by_name (h->root.u.def.section->owner,
-				   ".rela.bss");
-      BFD_ASSERT (s != NULL);
+      if (h->dynindx == -1
+	  || (h->root.type != bfd_link_hash_defined
+	      && h->root.type != bfd_link_hash_defweak)
+	  || htab->srelbss == NULL)
+	abort ();
 
       rela.r_offset = (h->root.u.def.value
 		       + h->root.u.def.section->output_section->vma
 		       + h->root.u.def.section->output_offset);
       rela.r_info = ELF32_R_INFO (h->dynindx, R_390_COPY);
       rela.r_addend = 0;
-      bfd_elf32_swap_reloca_out (output_bfd, &rela,
-				 ((Elf32_External_Rela *) s->contents
-				  + s->reloc_count));
-      ++s->reloc_count;
+      loc = (Elf32_External_Rela *) htab->srelbss->contents;
+      loc += htab->srelbss->reloc_count++;
+      bfd_elf32_swap_reloca_out (output_bfd, &rela, loc);
     }
 
   /* Mark some specially defined symbols as absolute.  */
@@ -1996,6 +2252,26 @@ elf_s390_finish_dynamic_symbol (output_bfd, info, h, sym)
   return true;
 }
 
+/* Used to decide how to sort relocs in an optimal manner for the
+   dynamic linker, before writing them out.  */
+
+static enum elf_reloc_type_class
+elf_s390_reloc_type_class (rela)
+     const Elf_Internal_Rela *rela;
+{
+  switch ((int) ELF32_R_TYPE (rela->r_info))
+    {
+    case R_390_RELATIVE:
+      return reloc_class_relative;
+    case R_390_JMP_SLOT:
+      return reloc_class_plt;
+    case R_390_COPY:
+      return reloc_class_copy;
+    default:
+      return reloc_class_normal;
+    }
+}
+
 /* Finish up the dynamic sections.  */
 
 static boolean
@@ -2003,122 +2279,115 @@ elf_s390_finish_dynamic_sections (output_bfd, info)
      bfd *output_bfd;
      struct bfd_link_info *info;
 {
+  struct elf_s390_link_hash_table *htab;
   bfd *dynobj;
   asection *sdyn;
-  asection *sgot;
 
-  dynobj = elf_hash_table (info)->dynobj;
-
-  sgot = bfd_get_section_by_name (dynobj, ".got.plt");
-  BFD_ASSERT (sgot != NULL);
+  htab = elf_s390_hash_table (info);
+  dynobj = htab->elf.dynobj;
   sdyn = bfd_get_section_by_name (dynobj, ".dynamic");
 
-  if (elf_hash_table (info)->dynamic_sections_created)
+  if (htab->elf.dynamic_sections_created)
     {
-      asection *splt;
       Elf32_External_Dyn *dyncon, *dynconend;
 
-      BFD_ASSERT (sdyn != NULL);
+      if (sdyn == NULL || htab->sgot == NULL)
+	abort ();
 
       dyncon = (Elf32_External_Dyn *) sdyn->contents;
       dynconend = (Elf32_External_Dyn *) (sdyn->contents + sdyn->_raw_size);
       for (; dyncon < dynconend; dyncon++)
 	{
 	  Elf_Internal_Dyn dyn;
-	  const char *name;
 	  asection *s;
-
+	
 	  bfd_elf32_swap_dyn_in (dynobj, dyncon, &dyn);
-
+	
 	  switch (dyn.d_tag)
 	    {
 	    default:
-	      break;
-
+	      continue;
+	
 	    case DT_PLTGOT:
-	      name = ".got";
-	      goto get_vma;
+	      dyn.d_un.d_ptr = htab->sgot->output_section->vma;
+	      break;
+	
 	    case DT_JMPREL:
-	      name = ".rela.plt";
-	    get_vma:
-	      s = bfd_get_section_by_name(output_bfd, name);
-	      BFD_ASSERT (s != NULL);
-	      dyn.d_un.d_ptr = s->vma;
-	      bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
+	      dyn.d_un.d_ptr = htab->srelplt->output_section->vma;
 	      break;
 
 	    case DT_PLTRELSZ:
-	      s = bfd_get_section_by_name (output_bfd, ".rela.plt");
-	      BFD_ASSERT (s != NULL);
+	      s = htab->srelplt->output_section;
 	      if (s->_cooked_size != 0)
 		dyn.d_un.d_val = s->_cooked_size;
 	      else
 		dyn.d_un.d_val = s->_raw_size;
-	      bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
 	      break;
 	    }
+
+	  bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
 	}
 
       /* Fill in the special first entry in the procedure linkage table.  */
-      splt = bfd_get_section_by_name (dynobj, ".plt");
-      if (splt && splt->_raw_size > 0)
+      if (htab->splt && htab->splt->_raw_size > 0)
 	{
-          memset (splt->contents, 0, PLT_FIRST_ENTRY_SIZE);
+          memset (htab->splt->contents, 0, PLT_FIRST_ENTRY_SIZE);
           if (info->shared)
-           {
+	    {
 	      bfd_put_32 (output_bfd, (bfd_vma) PLT_PIC_FIRST_ENTRY_WORD0,
-		          splt->contents );
+		          htab->splt->contents );
 	      bfd_put_32 (output_bfd, (bfd_vma) PLT_PIC_FIRST_ENTRY_WORD1,
-		          splt->contents + 4 );
+		          htab->splt->contents +4 );
 	      bfd_put_32 (output_bfd, (bfd_vma) PLT_PIC_FIRST_ENTRY_WORD2,
-		          splt->contents + 8 );
+		          htab->splt->contents +8 );
 	      bfd_put_32 (output_bfd, (bfd_vma) PLT_PIC_FIRST_ENTRY_WORD3,
-		          splt->contents + 12 );
+		          htab->splt->contents +12 );
 	      bfd_put_32 (output_bfd, (bfd_vma) PLT_PIC_FIRST_ENTRY_WORD4,
-		          splt->contents + 16 );
+		          htab->splt->contents +16 );
            }
           else
            {
-              bfd_put_32 (output_bfd, (bfd_vma) PLT_FIRST_ENTRY_WORD0,
-                          splt->contents );
+              bfd_put_32 (output_bfd, (bfd_vma)PLT_FIRST_ENTRY_WORD0,
+                          htab->splt->contents );
               bfd_put_32 (output_bfd, (bfd_vma) PLT_FIRST_ENTRY_WORD1,
-                          splt->contents + 4 );
+                          htab->splt->contents +4 );
               bfd_put_32 (output_bfd, (bfd_vma) PLT_FIRST_ENTRY_WORD2,
-                          splt->contents + 8 );
+                          htab->splt->contents +8 );
               bfd_put_32 (output_bfd, (bfd_vma) PLT_FIRST_ENTRY_WORD3,
-                          splt->contents + 12 );
+                          htab->splt->contents +12 );
               bfd_put_32 (output_bfd, (bfd_vma) PLT_FIRST_ENTRY_WORD4,
-                          splt->contents + 16 );
+                          htab->splt->contents +16 );
               bfd_put_32 (output_bfd, (bfd_vma) PLT_FIRST_ENTRY_WORD5,
-                          splt->contents + 20 );
+                          htab->splt->contents +20 );
               bfd_put_32 (output_bfd,
-                          sgot->output_section->vma + sgot->output_offset,
-                          splt->contents + 24);
+                          htab->sgotplt->output_section->vma
+			  + htab->sgotplt->output_offset,
+                          htab->splt->contents + 24);
            }
-	  elf_section_data (splt->output_section)->this_hdr.sh_entsize = 4;
+	  elf_section_data (htab->splt->output_section)
+	    ->this_hdr.sh_entsize = 4;
 	}
 
     }
 
-  /* Set the first entry in the global offset table to the address of
-     the dynamic section.  */
-  if (sgot->_raw_size > 0)
+  if (htab->sgotplt)
     {
-      if (sdyn == NULL)
-	bfd_put_32 (output_bfd, (bfd_vma) 0, sgot->contents);
-      else
-	bfd_put_32 (output_bfd,
-		    sdyn->output_section->vma + sdyn->output_offset,
-		    sgot->contents);
-
-      /* One entry for shared object struct ptr.  */
-      bfd_put_32 (output_bfd, (bfd_vma) 0, sgot->contents + 4);
-      /* One entry for _dl_runtime_resolve.  */
-      bfd_put_32 (output_bfd, (bfd_vma) 0, sgot->contents + 8);
-    }
-
-  elf_section_data (sgot->output_section)->this_hdr.sh_entsize = 4;
+      /* Fill in the first three entries in the global offset table.  */
+      if (htab->sgotplt->_raw_size > 0)
+	{
+	  bfd_put_32 (output_bfd,
+		      (sdyn == NULL ? (bfd_vma) 0
+		       : sdyn->output_section->vma + sdyn->output_offset),
+		      htab->sgotplt->contents);
+	  /* One entry for shared object struct ptr.  */
+	  bfd_put_32 (output_bfd, (bfd_vma) 0, htab->sgotplt->contents + 4);
+	  /* One entry for _dl_runtime_resolve.  */
+	  bfd_put_32 (output_bfd, (bfd_vma) 0, htab->sgotplt->contents + 8);
+	}
 
+      elf_section_data (htab->sgotplt->output_section)
+	->this_hdr.sh_entsize = 4;
+    }
   return true;
 }
 
@@ -2129,23 +2398,6 @@ elf_s390_object_p (abfd)
   return bfd_default_set_arch_mach (abfd, bfd_arch_s390, bfd_mach_s390_esa);
 }
 
-static enum elf_reloc_type_class
-elf_s390_reloc_type_class (rela)
-     const Elf_Internal_Rela *rela;
-{
-  switch ((int) ELF32_R_TYPE (rela->r_info))
-    {
-    case R_390_RELATIVE:
-      return reloc_class_relative;
-    case R_390_JMP_SLOT:
-      return reloc_class_plt;
-    case R_390_COPY:
-      return reloc_class_copy;
-    default:
-      return reloc_class_normal;
-    }
-}
-
 #define TARGET_BIG_SYM	bfd_elf32_s390_vec
 #define TARGET_BIG_NAME	"elf32-s390"
 #define ELF_ARCH	bfd_arch_s390
@@ -2163,18 +2415,19 @@ elf_s390_reloc_type_class (rela)
 
 #define elf_info_to_howto                     elf_s390_info_to_howto
 
-#define bfd_elf32_bfd_final_link	      _bfd_elf32_gc_common_final_link
 #define bfd_elf32_bfd_is_local_label_name     elf_s390_is_local_label_name
 #define bfd_elf32_bfd_link_hash_table_create  elf_s390_link_hash_table_create
 #define bfd_elf32_bfd_reloc_type_lookup	      elf_s390_reloc_type_lookup
 
 #define elf_backend_adjust_dynamic_symbol     elf_s390_adjust_dynamic_symbol
 #define elf_backend_check_relocs              elf_s390_check_relocs
-#define elf_backend_create_dynamic_sections   _bfd_elf_create_dynamic_sections
+#define elf_backend_copy_indirect_symbol      elf_s390_copy_indirect_symbol
+#define elf_backend_create_dynamic_sections   elf_s390_create_dynamic_sections
 #define elf_backend_finish_dynamic_sections   elf_s390_finish_dynamic_sections
 #define elf_backend_finish_dynamic_symbol     elf_s390_finish_dynamic_symbol
 #define elf_backend_gc_mark_hook              elf_s390_gc_mark_hook
 #define elf_backend_gc_sweep_hook             elf_s390_gc_sweep_hook
+#define elf_backend_reloc_type_class	      elf_s390_reloc_type_class
 #define elf_backend_relocate_section          elf_s390_relocate_section
 #define elf_backend_size_dynamic_sections     elf_s390_size_dynamic_sections
 #define elf_backend_reloc_type_class	      elf_s390_reloc_type_class
diff --git a/bfd/elf64-s390.c b/bfd/elf64-s390.c
index ebe30f5..3bba1b3 100644
--- a/bfd/elf64-s390.c
+++ b/bfd/elf64-s390.c
@@ -29,11 +29,18 @@ static reloc_howto_type *elf_s390_reloc_type_lookup
   PARAMS ((bfd *, bfd_reloc_code_real_type));
 static void elf_s390_info_to_howto
   PARAMS ((bfd *, arelent *, Elf_Internal_Rela *));
-static boolean elf_s390_is_local_label_name PARAMS ((bfd *, const char *));
-static struct bfd_hash_entry *elf_s390_link_hash_newfunc
+static boolean elf_s390_is_local_label_name
+  PARAMS ((bfd *, const char *));
+static struct bfd_hash_entry *link_hash_newfunc
   PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *, const char *));
 static struct bfd_link_hash_table *elf_s390_link_hash_table_create
   PARAMS ((bfd *));
+static boolean create_got_section
+  PARAMS((bfd *, struct bfd_link_info *));
+static boolean elf_s390_create_dynamic_sections
+  PARAMS((bfd *, struct bfd_link_info *));
+static void elf_s390_copy_indirect_symbol
+  PARAMS ((struct elf_link_hash_entry *, struct elf_link_hash_entry *));
 static boolean elf_s390_check_relocs
   PARAMS ((bfd *, struct bfd_link_info *, asection *,
 	   const Elf_Internal_Rela *));
@@ -45,6 +52,10 @@ static boolean elf_s390_gc_sweep_hook
 	   const Elf_Internal_Rela *));
 static boolean elf_s390_adjust_dynamic_symbol
   PARAMS ((struct bfd_link_info *, struct elf_link_hash_entry *));
+static boolean allocate_dynrelocs
+  PARAMS ((struct elf_link_hash_entry *, PTR));
+static boolean readonly_dynrelocs
+  PARAMS ((struct elf_link_hash_entry *, PTR));
 static boolean elf_s390_size_dynamic_sections
   PARAMS ((bfd *, struct bfd_link_info *));
 static boolean elf_s390_relocate_section
@@ -53,11 +64,11 @@ static boolean elf_s390_relocate_section
 static boolean elf_s390_finish_dynamic_symbol
   PARAMS ((bfd *, struct bfd_link_info *, struct elf_link_hash_entry *,
 	   Elf_Internal_Sym *));
+static enum elf_reloc_type_class elf_s390_reloc_type_class
+  PARAMS ((const Elf_Internal_Rela *));
 static boolean elf_s390_finish_dynamic_sections
   PARAMS ((bfd *, struct bfd_link_info *));
 static boolean elf_s390_object_p PARAMS ((bfd *));
-static enum elf_reloc_type_class elf_s390_reloc_type_class
-  PARAMS ((const Elf_Internal_Rela *));
 
 #define USE_RELA 1		/* We want RELA relocations, not REL.  */
 
@@ -123,70 +134,71 @@ elf_s390_reloc_type_lookup (abfd, code)
      bfd *abfd ATTRIBUTE_UNUSED;
      bfd_reloc_code_real_type code;
 {
-  switch (code) {
-  case BFD_RELOC_NONE:
-    return &elf_howto_table[(int) R_390_NONE];
-  case BFD_RELOC_8:
-    return &elf_howto_table[(int) R_390_8];
-  case BFD_RELOC_390_12:
-    return &elf_howto_table[(int) R_390_12];
-  case BFD_RELOC_16:
-    return &elf_howto_table[(int) R_390_16];
-  case BFD_RELOC_32:
-    return &elf_howto_table[(int) R_390_32];
-  case BFD_RELOC_CTOR:
-    return &elf_howto_table[(int) R_390_32];
-  case BFD_RELOC_32_PCREL:
-    return &elf_howto_table[(int) R_390_PC32];
-  case BFD_RELOC_390_GOT12:
-    return &elf_howto_table[(int) R_390_GOT12];
-  case BFD_RELOC_32_GOT_PCREL:
-    return &elf_howto_table[(int) R_390_GOT32];
-  case BFD_RELOC_390_PLT32:
-    return &elf_howto_table[(int) R_390_PLT32];
-  case BFD_RELOC_390_COPY:
-    return &elf_howto_table[(int) R_390_COPY];
-  case BFD_RELOC_390_GLOB_DAT:
-    return &elf_howto_table[(int) R_390_GLOB_DAT];
-  case BFD_RELOC_390_JMP_SLOT:
-    return &elf_howto_table[(int) R_390_JMP_SLOT];
-  case BFD_RELOC_390_RELATIVE:
-    return &elf_howto_table[(int) R_390_RELATIVE];
-  case BFD_RELOC_32_GOTOFF:
-    return &elf_howto_table[(int) R_390_GOTOFF];
-  case BFD_RELOC_390_GOTPC:
-    return &elf_howto_table[(int) R_390_GOTPC];
-  case BFD_RELOC_390_GOT16:
-    return &elf_howto_table[(int) R_390_GOT16];
-  case BFD_RELOC_16_PCREL:
-    return &elf_howto_table[(int) R_390_PC16];
-  case BFD_RELOC_390_PC16DBL:
-    return &elf_howto_table[(int) R_390_PC16DBL];
-  case BFD_RELOC_390_PLT16DBL:
-    return &elf_howto_table[(int) R_390_PLT16DBL];
-  case BFD_RELOC_VTABLE_INHERIT:
-    return &elf64_s390_vtinherit_howto;
-  case BFD_RELOC_VTABLE_ENTRY:
-    return &elf64_s390_vtentry_howto;
-  case BFD_RELOC_390_PC32DBL:
-    return &elf_howto_table[(int) R_390_PC32DBL];
-  case BFD_RELOC_390_PLT32DBL:
-    return &elf_howto_table[(int) R_390_PLT32DBL];
-  case BFD_RELOC_390_GOTPCDBL:
-    return &elf_howto_table[(int) R_390_GOTPCDBL];
-  case BFD_RELOC_64:
-    return &elf_howto_table[(int) R_390_64];
-  case BFD_RELOC_64_PCREL:
-    return &elf_howto_table[(int) R_390_PC64];
-  case BFD_RELOC_390_GOT64:
-    return &elf_howto_table[(int) R_390_GOT64];
-  case BFD_RELOC_390_PLT64:
-    return &elf_howto_table[(int) R_390_PLT64];
-  case BFD_RELOC_390_GOTENT:
-    return &elf_howto_table[(int) R_390_GOTENT];
-  default:
-    break;
-  }
+  switch (code)
+    {
+    case BFD_RELOC_NONE:
+      return &elf_howto_table[(int) R_390_NONE];
+    case BFD_RELOC_8:
+      return &elf_howto_table[(int) R_390_8];
+    case BFD_RELOC_390_12:
+      return &elf_howto_table[(int) R_390_12];
+    case BFD_RELOC_16:
+      return &elf_howto_table[(int) R_390_16];
+    case BFD_RELOC_32:
+      return &elf_howto_table[(int) R_390_32];
+    case BFD_RELOC_CTOR:
+      return &elf_howto_table[(int) R_390_32];
+    case BFD_RELOC_32_PCREL:
+      return &elf_howto_table[(int) R_390_PC32];
+    case BFD_RELOC_390_GOT12:
+      return &elf_howto_table[(int) R_390_GOT12];
+    case BFD_RELOC_32_GOT_PCREL:
+      return &elf_howto_table[(int) R_390_GOT32];
+    case BFD_RELOC_390_PLT32:
+      return &elf_howto_table[(int) R_390_PLT32];
+    case BFD_RELOC_390_COPY:
+      return &elf_howto_table[(int) R_390_COPY];
+    case BFD_RELOC_390_GLOB_DAT:
+      return &elf_howto_table[(int) R_390_GLOB_DAT];
+    case BFD_RELOC_390_JMP_SLOT:
+      return &elf_howto_table[(int) R_390_JMP_SLOT];
+    case BFD_RELOC_390_RELATIVE:
+      return &elf_howto_table[(int) R_390_RELATIVE];
+    case BFD_RELOC_32_GOTOFF:
+      return &elf_howto_table[(int) R_390_GOTOFF];
+    case BFD_RELOC_390_GOTPC:
+      return &elf_howto_table[(int) R_390_GOTPC];
+    case BFD_RELOC_390_GOT16:
+      return &elf_howto_table[(int) R_390_GOT16];
+    case BFD_RELOC_16_PCREL:
+      return &elf_howto_table[(int) R_390_PC16];
+    case BFD_RELOC_390_PC16DBL:
+      return &elf_howto_table[(int) R_390_PC16DBL];
+    case BFD_RELOC_390_PLT16DBL:
+      return &elf_howto_table[(int) R_390_PLT16DBL];
+    case BFD_RELOC_VTABLE_INHERIT:
+      return &elf64_s390_vtinherit_howto;
+    case BFD_RELOC_VTABLE_ENTRY:
+      return &elf64_s390_vtentry_howto;
+    case BFD_RELOC_390_PC32DBL:
+      return &elf_howto_table[(int) R_390_PC32DBL];
+    case BFD_RELOC_390_PLT32DBL:
+      return &elf_howto_table[(int) R_390_PLT32DBL];
+    case BFD_RELOC_390_GOTPCDBL:
+      return &elf_howto_table[(int) R_390_GOTPCDBL];
+    case BFD_RELOC_64:
+      return &elf_howto_table[(int) R_390_64];
+    case BFD_RELOC_64_PCREL:
+      return &elf_howto_table[(int) R_390_PC64];
+    case BFD_RELOC_390_GOT64:
+      return &elf_howto_table[(int) R_390_GOT64];
+    case BFD_RELOC_390_PLT64:
+      return &elf_howto_table[(int) R_390_PLT64];
+    case BFD_RELOC_390_GOTENT:
+      return &elf_howto_table[(int) R_390_GOTENT];
+    default:
+      break;
+    }
   return 0;
 }
 
@@ -233,11 +245,6 @@ elf_s390_is_local_label_name (abfd, name)
 
 #define ELF_DYNAMIC_INTERPRETER "/usr/lib/ld.so.1"
 
-/* The nop opcode we use.  */
-
-#define s390_NOP 0x07070707
-
-
 /* The size in bytes of the first entry in the procedure linkage table.  */
 #define PLT_FIRST_ENTRY_SIZE 32
 /* The size in bytes of an entry in the procedure linkage table.  */
@@ -324,53 +331,50 @@ elf_s390_is_local_label_name (abfd, name)
 #define PLT_FIRST_ENTRY_WORD7     (bfd_vma) 0x07000700
 
 /* The s390 linker needs to keep track of the number of relocs that it
-   decides to copy in check_relocs for each symbol.  This is so that
-   it can discard PC relative relocs if it doesn't need them when
-   linking with -Bsymbolic.  We store the information in a field
-   extending the regular ELF linker hash table.  */
-
-/* This structure keeps track of the number of PC relative relocs we
-   have copied for a given symbol.  */
+   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_s390_pcrel_relocs_copied
+struct elf_s390_dyn_relocs
 {
-  /* Next section.  */
-  struct elf_s390_pcrel_relocs_copied *next;
-  /* A section in dynobj.  */
-  asection *section;
-  /* Number of relocs copied in this section.  */
+  struct elf_s390_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;
 };
 
 /* s390 ELF linker hash entry.  */
 
 struct elf_s390_link_hash_entry
 {
-  struct elf_link_hash_entry root;
+  struct elf_link_hash_entry elf;
 
-  /* Number of PC relative relocs copied for this symbol.  */
-  struct elf_s390_pcrel_relocs_copied *pcrel_relocs_copied;
+  /* Track dynamic relocs copied for this symbol.  */
+  struct elf_s390_dyn_relocs *dyn_relocs;
 };
 
 /* s390 ELF linker hash table.  */
 
 struct elf_s390_link_hash_table
 {
-  struct elf_link_hash_table root;
-};
+  struct elf_link_hash_table elf;
 
-/* Declare this now that the above structures are defined.  */
-
-static boolean elf_s390_discard_copies
-  PARAMS ((struct elf_s390_link_hash_entry *, PTR));
-
-/* Traverse an s390 ELF linker hash table.  */
-
-#define elf_s390_link_hash_traverse(table, func, info)		\
-  (elf_link_hash_traverse						\
-   (&(table)->root,							\
-    (boolean (*) PARAMS ((struct elf_link_hash_entry *, PTR))) (func),	\
-    (info)))
+  /* Short-cuts to get to dynamic linker sections.  */
+  asection *sgot;
+  asection *sgotplt;
+  asection *srelgot;
+  asection *splt;
+  asection *srelplt;
+  asection *sdynbss;
+  asection *srelbss;
+};
 
 /* Get the s390 ELF linker hash table from a link_info structure.  */
 
@@ -380,33 +384,32 @@ static boolean elf_s390_discard_copies
 /* Create an entry in an s390 ELF linker hash table.  */
 
 static struct bfd_hash_entry *
-elf_s390_link_hash_newfunc (entry, table, string)
+link_hash_newfunc (entry, table, string)
      struct bfd_hash_entry *entry;
      struct bfd_hash_table *table;
      const char *string;
 {
-  struct elf_s390_link_hash_entry *ret =
-    (struct elf_s390_link_hash_entry *) entry;
-
   /* Allocate the structure if it has not already been allocated by a
      subclass.  */
-  if (ret == (struct elf_s390_link_hash_entry *) NULL)
-    ret = ((struct elf_s390_link_hash_entry *)
-	   bfd_hash_allocate (table,
-			      sizeof (struct elf_s390_link_hash_entry)));
-  if (ret == (struct elf_s390_link_hash_entry *) NULL)
-    return (struct bfd_hash_entry *) ret;
+  if (entry == NULL)
+    {
+      entry = bfd_hash_allocate (table,
+				 sizeof (struct elf_s390_link_hash_entry));
+      if (entry == NULL)
+	return entry;
+    }
 
   /* Call the allocation method of the superclass.  */
-  ret = ((struct elf_s390_link_hash_entry *)
-	 _bfd_elf_link_hash_newfunc ((struct bfd_hash_entry *) ret,
-				     table, string));
-  if (ret != (struct elf_s390_link_hash_entry *) NULL)
+  entry = _bfd_elf_link_hash_newfunc (entry, table, string);
+  if (entry != NULL)
     {
-      ret->pcrel_relocs_copied = NULL;
+      struct elf_s390_link_hash_entry *eh;
+
+      eh = (struct elf_s390_link_hash_entry *) entry;
+      eh->dyn_relocs = NULL;
     }
 
-  return (struct bfd_hash_entry *) ret;
+  return entry;
 }
 
 /* Create an s390 ELF linker hash table.  */
@@ -418,20 +421,135 @@ elf_s390_link_hash_table_create (abfd)
   struct elf_s390_link_hash_table *ret;
   bfd_size_type amt = sizeof (struct elf_s390_link_hash_table);
 
-  ret = ((struct elf_s390_link_hash_table *) bfd_alloc (abfd, amt));
-  if (ret == (struct elf_s390_link_hash_table *) NULL)
+  ret = (struct elf_s390_link_hash_table *) bfd_alloc (abfd, amt);
+  if (ret == NULL)
     return NULL;
 
-  if (! _bfd_elf_link_hash_table_init (&ret->root, abfd,
-				       elf_s390_link_hash_newfunc))
+  if (! _bfd_elf_link_hash_table_init (&ret->elf, abfd, link_hash_newfunc))
     {
       bfd_release (abfd, ret);
       return NULL;
     }
 
-  return &ret->root.root;
+  ret->sgot = NULL;
+  ret->sgotplt = NULL;
+  ret->srelgot = NULL;
+  ret->splt = NULL;
+  ret->srelplt = NULL;
+  ret->sdynbss = NULL;
+  ret->srelbss = NULL;
+
+  return &ret->elf.root;
+}
+
+/* Create .got, .gotplt, and .rela.got sections in DYNOBJ, and set up
+   shortcuts to them in our hash table.  */
+
+static boolean
+create_got_section (dynobj, info)
+     bfd *dynobj;
+     struct bfd_link_info *info;
+{
+  struct elf_s390_link_hash_table *htab;
+
+  if (! _bfd_elf_create_got_section (dynobj, info))
+    return false;
+
+  htab = elf_s390_hash_table (info);
+  htab->sgot = bfd_get_section_by_name (dynobj, ".got");
+  htab->sgotplt = bfd_get_section_by_name (dynobj, ".got.plt");
+  if (!htab->sgot || !htab->sgotplt)
+    abort ();
+
+  htab->srelgot = bfd_make_section (dynobj, ".rela.got");
+  if (htab->srelgot == NULL
+      || ! bfd_set_section_flags (dynobj, htab->srelgot,
+				  (SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS
+				   | SEC_IN_MEMORY | SEC_LINKER_CREATED
+				   | SEC_READONLY))
+      || ! bfd_set_section_alignment (dynobj, htab->srelgot, 2))
+    return false;
+  return true;
+}
+
+/* Create .plt, .rela.plt, .got, .got.plt, .rela.got, .dynbss, and
+   .rela.bss sections in DYNOBJ, and set up shortcuts to them in our
+   hash table.  */
+
+static boolean
+elf_s390_create_dynamic_sections (dynobj, info)
+     bfd *dynobj;
+     struct bfd_link_info *info;
+{
+  struct elf_s390_link_hash_table *htab;
+
+  htab = elf_s390_hash_table (info);
+  if (!htab->sgot && !create_got_section (dynobj, info))
+    return false;
+
+  if (!_bfd_elf_create_dynamic_sections (dynobj, info))
+    return false;
+
+  htab->splt = bfd_get_section_by_name (dynobj, ".plt");
+  htab->srelplt = bfd_get_section_by_name (dynobj, ".rela.plt");
+  htab->sdynbss = bfd_get_section_by_name (dynobj, ".dynbss");
+  if (!info->shared)
+    htab->srelbss = bfd_get_section_by_name (dynobj, ".rela.bss");
+
+  if (!htab->splt || !htab->srelplt || !htab->sdynbss
+      || (!info->shared && !htab->srelbss))
+    abort ();
+
+  return true;
 }
 
+/* Copy the extra info we tack onto an elf_link_hash_entry.  */
+
+static void
+elf_s390_copy_indirect_symbol (dir, ind)
+     struct elf_link_hash_entry *dir, *ind;
+{
+  struct elf_s390_link_hash_entry *edir, *eind;
+
+  edir = (struct elf_s390_link_hash_entry *) dir;
+  eind = (struct elf_s390_link_hash_entry *) ind;
+
+  if (eind->dyn_relocs != NULL)
+    {
+      if (edir->dyn_relocs != NULL)
+	{
+	  struct elf_s390_dyn_relocs **pp;
+	  struct elf_s390_dyn_relocs *p;
+
+	  if (ind->root.type == bfd_link_hash_indirect)
+	    abort ();
+
+	  /* Add reloc counts against the weak sym to the strong sym
+	     list.  Merge any entries against the same section.  */
+	  for (pp = &eind->dyn_relocs; (p = *pp) != NULL; )
+	    {
+	      struct elf_s390_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 (dir, ind);
+}
 
 /* Look through the relocs for a section during the first phase, and
    allocate space in the global offset table or procedure linkage
@@ -444,26 +562,20 @@ elf_s390_check_relocs (abfd, info, sec, relocs)
      asection *sec;
      const Elf_Internal_Rela *relocs;
 {
-  bfd *dynobj;
+  struct elf_s390_link_hash_table *htab;
   Elf_Internal_Shdr *symtab_hdr;
   struct elf_link_hash_entry **sym_hashes;
-  bfd_signed_vma *local_got_refcounts;
   const Elf_Internal_Rela *rel;
   const Elf_Internal_Rela *rel_end;
-  asection *sgot;
-  asection *srelgot;
   asection *sreloc;
 
   if (info->relocateable)
     return true;
 
-  dynobj = elf_hash_table (info)->dynobj;
+  htab = elf_s390_hash_table (info);
   symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
   sym_hashes = elf_sym_hashes (abfd);
-  local_got_refcounts = elf_local_got_offsets (abfd);
 
-  sgot = NULL;
-  srelgot = NULL;
   sreloc = NULL;
 
   rel_end = relocs + sec->reloc_count;
@@ -474,35 +586,19 @@ elf_s390_check_relocs (abfd, info, sec, relocs)
 
       r_symndx = ELF64_R_SYM (rel->r_info);
 
+      if (r_symndx >= NUM_SHDR_ENTRIES (symtab_hdr))
+	{
+	  (*_bfd_error_handler) (_("%s: bad symbol index: %d"),
+				 bfd_archive_filename (abfd),
+				 r_symndx);
+	  return false;
+	}
+
       if (r_symndx < symtab_hdr->sh_info)
 	h = NULL;
       else
 	h = sym_hashes[r_symndx - symtab_hdr->sh_info];
 
-      /* Some relocs require a global offset table.  */
-      if (dynobj == NULL)
-	{
-	  switch (ELF64_R_TYPE (rel->r_info))
-	    {
-	    case R_390_GOT12:
-            case R_390_GOT16:
-	    case R_390_GOT32:
-	    case R_390_GOT64:
-	    case R_390_GOTOFF:
-	    case R_390_GOTPC:
-	    case R_390_GOTPCDBL:
-	    case R_390_GOTENT:
-	      elf_hash_table (info)->dynobj = dynobj = abfd;
-	      if (! _bfd_elf_create_got_section (dynobj, info))
-		return false;
-	      break;
-
-	    default:
-	      break;
-	    }
-	}
-
-
       switch (ELF64_R_TYPE (rel->r_info))
 	{
 	case R_390_GOT12:
@@ -511,79 +607,44 @@ elf_s390_check_relocs (abfd, info, sec, relocs)
 	case R_390_GOT64:
 	case R_390_GOTENT:
 	  /* This symbol requires a global offset table entry.  */
-
-	  if (sgot == NULL)
-	    {
-	      sgot = bfd_get_section_by_name (dynobj, ".got");
-	      BFD_ASSERT (sgot != NULL);
-	    }
-
-
-	  if (srelgot == NULL
-	      && (h != NULL || info->shared))
-	    {
-	      srelgot = bfd_get_section_by_name (dynobj, ".rela.got");
-	      if (srelgot == NULL)
-		{
-		  srelgot = bfd_make_section (dynobj, ".rela.got");
-		  if (srelgot == NULL
-		      || ! bfd_set_section_flags (dynobj, srelgot,
-						  (SEC_ALLOC
-						   | SEC_LOAD
-						   | SEC_HAS_CONTENTS
-						   | SEC_IN_MEMORY
-						   | SEC_LINKER_CREATED
-						   | SEC_READONLY))
-		      || ! bfd_set_section_alignment (dynobj, srelgot, 2))
-		    return false;
-		}
-	    }
-
 	  if (h != NULL)
 	    {
-	      if (h->got.refcount == 0)
-		{
-		  /* Make sure this symbol is output as a dynamic symbol.  */
-		  if (h->dynindx == -1)
-		    {
-		      if (! bfd_elf64_link_record_dynamic_symbol (info, h))
-			return false;
-		    }
-
-		  sgot->_raw_size += 8;
-		  srelgot->_raw_size += sizeof (Elf64_External_Rela);
-		}
 	      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 * sizeof (bfd_vma);
+		
+		  size = symtab_hdr->sh_info;
+		  size *= sizeof (bfd_signed_vma);
 		  local_got_refcounts = ((bfd_signed_vma *)
 					 bfd_zalloc (abfd, size));
 		  if (local_got_refcounts == NULL)
 		    return false;
 		  elf_local_got_refcounts (abfd) = local_got_refcounts;
 		}
-	      if (local_got_refcounts[r_symndx] == 0)
-		{
-		  sgot->_raw_size += 8;
-		  if (info->shared)
-		    {
-		      /* If we are generating a shared object, we need to
-			 output a R_390_RELATIVE reloc so that the dynamic
-			 linker can adjust this GOT entry.  */
-		      srelgot->_raw_size += sizeof (Elf64_External_Rela);
-		    }
-		}
 	      local_got_refcounts[r_symndx] += 1;
 	    }
-	  break;
+	  /* Fall through */
 
+	case R_390_GOTOFF:
+	case R_390_GOTPC:
+	case R_390_GOTPCDBL:
+	  if (htab->sgot == NULL)
+	    {
+	      if (htab->elf.dynobj == NULL)
+		htab->elf.dynobj = abfd;
+	      if (!create_got_section (htab->elf.dynobj, info))
+		return false;
+	    }
+	  break;
+	
         case R_390_PLT16DBL:
 	case R_390_PLT32:
 	case R_390_PLT32DBL:
@@ -594,16 +655,16 @@ elf_s390_check_relocs (abfd, info, sec, relocs)
              never referenced by a dynamic object, in which case we
              don't need to generate a procedure linkage table entry
              after all.  */
-
+	
 	  /* If this is a local symbol, we resolve it directly without
              creating a procedure linkage table entry.  */
 	  if (h == NULL)
 	    continue;
-
+	
 	  h->elf_link_hash_flags |= ELF_LINK_HASH_NEEDS_PLT;
 	  h->plt.refcount += 1;
 	  break;
-
+	
         case R_390_8:
         case R_390_16:
 	case R_390_32:
@@ -613,56 +674,94 @@ elf_s390_check_relocs (abfd, info, sec, relocs)
 	case R_390_PC32:
 	case R_390_PC32DBL:
 	case R_390_PC64:
-	  if (h != NULL)
-	    h->elf_link_hash_flags |= ELF_LINK_NON_GOT_REF;
-
+	  if (h != NULL && !info->shared)
+	    {
+	      /* If this reloc is in a read-only section, we might
+		 need a copy reloc.  We can't check reliably at this
+		 stage whether the section is read-only, as input
+		 sections have not yet been mapped to output sections.
+		 Tentatively set the flag for now, and correct in
+		 adjust_dynamic_symbol.  */
+	      h->elf_link_hash_flags |= ELF_LINK_NON_GOT_REF;
+	
+	      /* We may need a .plt entry if the function this reloc
+		 refers to is in a shared lib.  */
+	      h->plt.refcount += 1;
+	    }
+	
 	  /* If we are creating a shared library, and this is a reloc
-             against a global symbol, or a non PC relative reloc
-             against a local symbol, then we need to copy the reloc
-             into the shared library.  However, if we are linking with
-             -Bsymbolic, we do not need to copy a reloc against a
-             global symbol which is defined in an object we are
-             including in the link (i.e., DEF_REGULAR is set).  At
-             this point we have not seen all the input files, so it is
-             possible that DEF_REGULAR is not set now but will be set
-             later (it is never cleared).  We account for that
-             possibility below by storing information in the
-             pcrel_relocs_copied field of the hash table entry.  */
-	  if (info->shared
-              && (sec->flags & SEC_ALLOC) != 0
-	      && (ELF64_R_TYPE (rel->r_info) == R_390_8
-		  || ELF64_R_TYPE (rel->r_info) == R_390_16
-		  || ELF64_R_TYPE (rel->r_info) == R_390_32
-		  || ELF64_R_TYPE (rel->r_info) == R_390_64
-		  || (h != NULL
-		      && h->dynindx != -1
-		      && (! info->symbolic
-			  || (h->elf_link_hash_flags
-			      & ELF_LINK_HASH_DEF_REGULAR) == 0))))
+	     against a global symbol, or a non PC relative reloc
+	     against a local symbol, then we need to copy the reloc
+	     into the shared library.  However, if we are linking with
+	     -Bsymbolic, we do not need to copy a reloc against a
+	     global symbol which is defined in an object we are
+	     including in the link (i.e., DEF_REGULAR is set).  At
+	     this point we have not seen all the input files, so it is
+	     possible that DEF_REGULAR is not set now but will be set
+	     later (it is never cleared).  In case of a weak definition,
+	     DEF_REGULAR may be cleared later by a strong definition in
+	     a shared library. We account for that possibility below by
+	     storing information in the relocs_copied field of the hash
+	     table entry.  A similar situation occurs when creating
+	     shared libraries and symbol visibility changes render the
+	     symbol local.
+
+	     If on the other hand, we are creating an executable, we
+	     may need to keep relocations for symbols satisfied by a
+	     dynamic library if we manage to avoid copy relocs for the
+	     symbol.  */
+	  if ((info->shared
+	       && (sec->flags & SEC_ALLOC) != 0
+	       && ((ELF64_R_TYPE (rel->r_info) != R_390_PC16
+		    && ELF64_R_TYPE (rel->r_info) != R_390_PC16DBL
+		    && ELF64_R_TYPE (rel->r_info) != R_390_PC32
+		    && ELF64_R_TYPE (rel->r_info) != R_390_PC32DBL
+		    && ELF64_R_TYPE (rel->r_info) != R_390_PC64)
+		   || (h != NULL
+		       && (! info->symbolic
+			   || h->root.type == bfd_link_hash_defweak
+			   || (h->elf_link_hash_flags
+			       & ELF_LINK_HASH_DEF_REGULAR) == 0))))
+	      || (!info->shared
+		  && (sec->flags & SEC_ALLOC) != 0
+		  && h != NULL
+		  && (h->root.type == bfd_link_hash_defweak
+		      || (h->elf_link_hash_flags
+			  & ELF_LINK_HASH_DEF_REGULAR) == 0)))
 	    {
-	      /* When creating a shared object, we must copy these
-                 reloc types into the output file.  We create a reloc
-                 section in dynobj and make room for this reloc.  */
+	      /* We must copy these reloc types into the output file.
+		 Create a reloc section in dynobj and make room for
+		 this reloc.  */
 	      if (sreloc == NULL)
 		{
 		  const char *name;
-
+		  bfd *dynobj;
+		
 		  name = (bfd_elf_string_from_elf_section
 			  (abfd,
 			   elf_elfheader (abfd)->e_shstrndx,
 			   elf_section_data (sec)->rel_hdr.sh_name));
 		  if (name == NULL)
 		    return false;
+		
+		  if (strncmp (name, ".rela", 5) != 0
+		      || strcmp (bfd_get_section_name (abfd, sec),
+				 name + 5) != 0)
+		    {
+		      (*_bfd_error_handler)
+			(_("%s: bad relocation section name `%s\'"),
+			 bfd_archive_filename (abfd), name);
+		    }
+		
+		  if (htab->elf.dynobj == NULL)
+		    htab->elf.dynobj = abfd;
 
-		  BFD_ASSERT (strncmp (name, ".rela", 5) == 0
-			      && strcmp (bfd_get_section_name (abfd, sec),
-					 name + 5) == 0);
-
+		  dynobj = htab->elf.dynobj;
 		  sreloc = bfd_get_section_by_name (dynobj, name);
 		  if (sreloc == NULL)
 		    {
 		      flagword flags;
-
+		
 		      sreloc = bfd_make_section (dynobj, name);
 		      flags = (SEC_HAS_CONTENTS | SEC_READONLY
 			       | SEC_IN_MEMORY | SEC_LINKER_CREATED);
@@ -673,68 +772,63 @@ elf_s390_check_relocs (abfd, info, sec, relocs)
 			  || ! bfd_set_section_alignment (dynobj, sreloc, 2))
 			return false;
 		    }
-		  if (sec->flags & SEC_READONLY)
-		    info->flags |= DF_TEXTREL;
+		  elf_section_data (sec)->sreloc = sreloc;
 		}
-
-	      sreloc->_raw_size += sizeof (Elf64_External_Rela);
-
-	      /* If we are linking with -Bsymbolic, and this is a
-                 global symbol, we count the number of PC relative
-                 relocations we have entered for this symbol, so that
-                 we can discard them again if the symbol is later
-                 defined by a regular object.  Note that this function
-                 is only called if we are using an elf64_s390 linker
-                 hash table, which means that h is really a pointer to
-                 an elf64_s390_link_hash_entry.  */
-	      if (h != NULL
-		  && (ELF64_R_TYPE (rel->r_info) == R_390_PC16 ||
-		      ELF64_R_TYPE (rel->r_info) == R_390_PC16DBL ||
-		      ELF64_R_TYPE (rel->r_info) == R_390_PC32 ||
-		      ELF64_R_TYPE (rel->r_info) == R_390_PC32DBL ||
-		      ELF64_R_TYPE (rel->r_info) == R_390_PC64))
+	
+	      /* If this is a global symbol, we count the number of
+		 relocations we need for this symbol.  */
+	      if (h != NULL)
 		{
 		  struct elf_s390_link_hash_entry *eh;
-		  struct elf_s390_pcrel_relocs_copied *p;
-
+		  struct elf_s390_dyn_relocs *p;
+		
 		  eh = (struct elf_s390_link_hash_entry *) h;
+		  p = eh->dyn_relocs;
 
-		  for (p = eh->pcrel_relocs_copied; p != NULL; p = p->next)
-		    if (p->section == sreloc)
-		      break;
-
-		  if (p == NULL)
+		  if (p == NULL || p->sec != sec)
 		    {
-		      p = ((struct elf_s390_pcrel_relocs_copied *)
-			   bfd_alloc (dynobj, (bfd_size_type) sizeof *p));
+		      bfd_size_type amt = sizeof *p;
+		      p = ((struct elf_s390_dyn_relocs *)
+			   bfd_alloc (htab->elf.dynobj, amt));
 		      if (p == NULL)
 			return false;
-		      p->next = eh->pcrel_relocs_copied;
-		      eh->pcrel_relocs_copied = p;
-		      p->section = sreloc;
+		      p->next = eh->dyn_relocs;
+		      eh->dyn_relocs = p;
+		      p->sec = sec;
 		      p->count = 0;
+		      p->pc_count = 0;
 		    }
-
-		  ++p->count;
+		
+		  p->count += 1;
+		  if (ELF64_R_TYPE (rel->r_info) == R_390_PC16
+		      || ELF64_R_TYPE (rel->r_info) == R_390_PC16DBL
+		      || ELF64_R_TYPE (rel->r_info) == R_390_PC32
+		      || ELF64_R_TYPE (rel->r_info) == R_390_PC32DBL
+		      || ELF64_R_TYPE (rel->r_info) == R_390_PC64)
+		    p->pc_count += 1;
+		}
+	      else
+		{
+		  /* Track dynamic relocs needed for local syms too.  */
+		  elf_section_data (sec)->local_dynrel += 1;
 		}
 	    }
-
 	  break;
-
+	
 	  /* This relocation describes the C++ object vtable hierarchy.
 	     Reconstruct it for later use during GC.  */
         case R_390_GNU_VTINHERIT:
           if (!_bfd_elf64_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_390_GNU_VTENTRY:
-          if (!_bfd_elf64_gc_record_vtentry (abfd, sec, h, rel->r_addend))
+          if (!_bfd_elf64_gc_record_vtentry (abfd, sec, h, rel->r_offset))
             return false;
           break;
-
+	
 	default:
 	  break;
 	}
@@ -795,10 +889,10 @@ elf_s390_gc_mark_hook (abfd, info, rel, h, sym)
 
 static boolean
 elf_s390_gc_sweep_hook (abfd, info, sec, relocs)
-     bfd *abfd ATTRIBUTE_UNUSED;
-     struct bfd_link_info *info ATTRIBUTE_UNUSED;
-     asection *sec ATTRIBUTE_UNUSED;
-     const Elf_Internal_Rela *relocs ATTRIBUTE_UNUSED;
+     bfd *abfd;
+     struct bfd_link_info *info;
+     asection *sec;
+     const Elf_Internal_Rela *relocs;
 {
   Elf_Internal_Shdr *symtab_hdr;
   struct elf_link_hash_entry **sym_hashes;
@@ -807,19 +901,16 @@ elf_s390_gc_sweep_hook (abfd, info, sec, relocs)
   unsigned long r_symndx;
   struct elf_link_hash_entry *h;
   bfd *dynobj;
-  asection *sgot;
-  asection *srelgot;
 
-  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
-  sym_hashes = elf_sym_hashes (abfd);
-  local_got_refcounts = elf_local_got_refcounts (abfd);
+  elf_section_data (sec)->local_dynrel = 0;
 
   dynobj = elf_hash_table (info)->dynobj;
   if (dynobj == NULL)
     return true;
 
-  sgot = bfd_get_section_by_name (dynobj, ".got");
-  srelgot = bfd_get_section_by_name (dynobj, ".rela.got");
+  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++)
@@ -838,27 +929,51 @@ elf_s390_gc_sweep_hook (abfd, info, sec, relocs)
 	  {
 	    h = sym_hashes[r_symndx - symtab_hdr->sh_info];
 	    if (h->got.refcount > 0)
-	      {
-		h->got.refcount -= 1;
-		if (h->got.refcount == 0)
-		  {
-		    sgot->_raw_size -= 8;
-		    srelgot->_raw_size -= sizeof (Elf64_External_Rela);
-		  }
-	      }
+	      h->got.refcount -= 1;
 	  }
 	else if (local_got_refcounts != NULL)
 	  {
 	    if (local_got_refcounts[r_symndx] > 0)
-	      {
-		local_got_refcounts[r_symndx] -= 1;
-		if (local_got_refcounts[r_symndx] == 0)
-		  {
-		    sgot->_raw_size -= 8;
-		    if (info->shared)
-		      srelgot->_raw_size -= sizeof (Elf64_External_Rela);
-		  }
-	      }
+	      local_got_refcounts[r_symndx] -= 1;
+	  }
+	break;
+
+      case R_390_8:
+      case R_390_12:
+      case R_390_16:
+      case R_390_32:
+      case R_390_64:
+      case R_390_PC16:
+      case R_390_PC16DBL:
+      case R_390_PC32:
+      case R_390_PC32DBL:
+      case R_390_PC64:
+	r_symndx = ELF64_R_SYM (rel->r_info);
+	if (r_symndx >= symtab_hdr->sh_info)
+	  {
+	    struct elf_s390_link_hash_entry *eh;
+	    struct elf_s390_dyn_relocs **pp;
+	    struct elf_s390_dyn_relocs *p;
+
+	    h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+
+	    if (!info->shared && h->plt.refcount > 0)
+	      h->plt.refcount -= 1;
+
+	    eh = (struct elf_s390_link_hash_entry *) h;
+
+	    for (pp = &eh->dyn_relocs; (p = *pp) != NULL; pp = &p->next)
+	      if (p->sec == sec)
+		{
+		  if (ELF64_R_TYPE (rel->r_info) == R_390_PC16
+		      || ELF64_R_TYPE (rel->r_info) == R_390_PC16DBL
+		      || ELF64_R_TYPE (rel->r_info) == R_390_PC32)
+		    p->pc_count -= 1;
+		  p->count -= 1;
+		  if (p->count == 0)
+		    *pp = p->next;
+		  break;
+		}
 	  }
 	break;
 
@@ -893,90 +1008,40 @@ elf_s390_adjust_dynamic_symbol (info, h)
      struct bfd_link_info *info;
      struct elf_link_hash_entry *h;
 {
-  bfd *dynobj;
+  struct elf_s390_link_hash_table *htab;
+  struct elf_s390_link_hash_entry * eh;
+  struct elf_s390_dyn_relocs *p;
   asection *s;
   unsigned int power_of_two;
 
-  dynobj = elf_hash_table (info)->dynobj;
-
-  /* Make sure we know what is going on here.  */
-  BFD_ASSERT (dynobj != NULL
-	      && ((h->elf_link_hash_flags & ELF_LINK_HASH_NEEDS_PLT)
-		  || h->weakdef != NULL
-		  || ((h->elf_link_hash_flags
-		       & ELF_LINK_HASH_DEF_DYNAMIC) != 0
-		      && (h->elf_link_hash_flags
-			  & ELF_LINK_HASH_REF_REGULAR) != 0
-		      && (h->elf_link_hash_flags
-			  & ELF_LINK_HASH_DEF_REGULAR) == 0)));
-
   /* If this is a function, put it in the procedure linkage table.  We
      will fill in the contents of the procedure linkage table later
      (although we could actually do it here). */
   if (h->type == STT_FUNC
       || (h->elf_link_hash_flags & ELF_LINK_HASH_NEEDS_PLT) != 0)
     {
-      if ((! info->shared
-	   && (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_DYNAMIC) == 0
-	   && (h->elf_link_hash_flags & ELF_LINK_HASH_REF_DYNAMIC) == 0)
-	  || (info->shared && h->plt.refcount <= 0))
+      if (h->plt.refcount <= 0
+	  || (! info->shared
+	      && (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_DYNAMIC) == 0
+	      && (h->elf_link_hash_flags & ELF_LINK_HASH_REF_DYNAMIC) == 0))
 	{
 	  /* This case can occur if we saw a PLT32 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 PC32
-             reloc instead.  */
+             object, or if all references were garbage collected.  In
+	     such a case, we don't actually need to build a procedure
+	     linkage table, and we can just do a PC32 reloc instead.  */
 	  h->plt.offset = (bfd_vma) -1;
 	  h->elf_link_hash_flags &= ~ELF_LINK_HASH_NEEDS_PLT;
-	  return true;
 	}
 
-      /* Make sure this symbol is output as a dynamic symbol.  */
-      if (h->dynindx == -1)
-	{
-	  if (! bfd_elf64_link_record_dynamic_symbol (info, h))
-	    return false;
-	}
-
-      s = bfd_get_section_by_name (dynobj, ".plt");
-      BFD_ASSERT (s != NULL);
-
-
-      /* The first  entry in .plt is reserved.  */
-      if (s->_raw_size == 0)
-	s->_raw_size = PLT_FIRST_ENTRY_SIZE;
-
-     /* If this symbol is not defined in a regular file, and we are
-       not generating a shared library, then set the symbol to this
-       location in the .plt.  This is required to make function
-       pointers compare as equal between the normal executable and
-       the shared library.  */
-     if (! info->shared
-	&& (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0)
-      {
-	h->root.u.def.section = s;
-	h->root.u.def.value = s->_raw_size;
-      }
-
-      h->plt.offset = s->_raw_size;
-
-      /* Make room for this entry.  */
-      s->_raw_size += PLT_ENTRY_SIZE;
-
-      /* We also need to make an entry in the .got.plt section, which
-	 will be placed in the .got section by the linker script.  */
-      s = bfd_get_section_by_name (dynobj, ".got.plt");
-      BFD_ASSERT (s != NULL);
-      s->_raw_size += GOT_ENTRY_SIZE;
-
-      /* We also need to make an entry in the .rela.plt section.  */
-      s = bfd_get_section_by_name (dynobj, ".rela.plt");
-      BFD_ASSERT (s != NULL);
-      s->_raw_size += sizeof (Elf64_External_Rela);
-
       return true;
     }
   else
+    /* It's possible that we incorrectly decided a .plt reloc was
+       needed for an R_390_PC32 reloc to a non-function sym in
+       check_relocs.  We can't decide accurately between function and
+       non-function syms in check-relocs;  Objects loaded later in
+       the link may change h->type.  So fix it now.  */
     h->plt.offset = (bfd_vma) -1;
 
   /* If this is a weak symbol, and there is a real definition, the
@@ -1006,6 +1071,29 @@ elf_s390_adjust_dynamic_symbol (info, h)
   if ((h->elf_link_hash_flags & ELF_LINK_NON_GOT_REF) == 0)
     return true;
 
+  /* If -z nocopyreloc was given, we won't generate them either.  */
+  if (info->nocopyreloc)
+    {
+      h->elf_link_hash_flags &= ~ELF_LINK_NON_GOT_REF;
+      return true;
+    }
+
+  eh = (struct elf_s390_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) != 0)
+	break;
+    }
+
+  /* If we didn't find any dynamic relocs in read-only sections, then
+     we'll be keeping the dynamic relocs and avoiding the copy reloc.  */
+  if (p == NULL)
+    {
+      h->elf_link_hash_flags &= ~ELF_LINK_NON_GOT_REF;
+      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
@@ -1016,20 +1104,14 @@ elf_s390_adjust_dynamic_symbol (info, h)
      both the dynamic object and the regular object will refer to the
      same memory location for the variable.  */
 
-  s = bfd_get_section_by_name (dynobj, ".dynbss");
-  BFD_ASSERT (s != NULL);
+  htab = elf_s390_hash_table (info);
 
-  /* We must generate a R_390_COPY reloc to tell the dynamic linker
-     to copy the initial value out of the dynamic object and into the
-     runtime process image.  We need to remember the offset into the
-     .rel.bss section we are going to use.  */
+  /* We must generate a R_390_COPY reloc to tell the dynamic linker to
+     copy the initial value out of the dynamic object and into the
+     runtime process image.  */
   if ((h->root.u.def.section->flags & SEC_ALLOC) != 0)
     {
-      asection *srel;
-
-      srel = bfd_get_section_by_name (dynobj, ".rela.bss");
-      BFD_ASSERT (srel != NULL);
-      srel->_raw_size += sizeof (Elf64_External_Rela);
+      htab->srelbss->_raw_size += sizeof (Elf64_External_Rela);
       h->elf_link_hash_flags |= ELF_LINK_HASH_NEEDS_COPY;
     }
 
@@ -1040,11 +1122,11 @@ elf_s390_adjust_dynamic_symbol (info, h)
     power_of_two = 3;
 
   /* Apply the required alignment.  */
-  s->_raw_size = BFD_ALIGN (s->_raw_size,
-			    (bfd_size_type) (1 << power_of_two));
-  if (power_of_two > bfd_get_section_alignment (dynobj, s))
+  s = htab->sdynbss;
+  s->_raw_size = BFD_ALIGN (s->_raw_size, (bfd_size_type) (1 << power_of_two));
+  if (power_of_two > bfd_get_section_alignment (htab->elf.dynobj, s))
     {
-      if (! bfd_set_section_alignment (dynobj, s, power_of_two))
+      if (! bfd_set_section_alignment (htab->elf.dynobj, s, power_of_two))
 	return false;
     }
 
@@ -1058,6 +1140,218 @@ elf_s390_adjust_dynamic_symbol (info, h)
   return true;
 }
 
+/* This is the condition under which elf_s390_finish_dynamic_symbol
+   will be called from elflink.h.  If elflink.h doesn't call our
+   finish_dynamic_symbol routine, we'll need to do something about
+   initializing any .plt and .got entries in elf_s390_relocate_section.  */
+#define WILL_CALL_FINISH_DYNAMIC_SYMBOL(DYN, INFO, H) \
+  ((DYN)								\
+   && ((INFO)->shared							\
+       || ((H)->elf_link_hash_flags & ELF_LINK_FORCED_LOCAL) == 0)	\
+   && ((H)->dynindx != -1						\
+       || ((H)->elf_link_hash_flags & ELF_LINK_FORCED_LOCAL) != 0))
+
+/* Allocate space in .plt, .got and associated reloc sections for
+   dynamic relocs.  */
+
+static boolean
+allocate_dynrelocs (h, inf)
+     struct elf_link_hash_entry *h;
+     PTR inf;
+{
+  struct bfd_link_info *info;
+  struct elf_s390_link_hash_table *htab;
+  struct elf_s390_link_hash_entry *eh;
+  struct elf_s390_dyn_relocs *p;
+
+  if (h->root.type == bfd_link_hash_indirect
+      || h->root.type == bfd_link_hash_warning)
+    return true;
+
+  info = (struct bfd_link_info *) inf;
+  htab = elf_s390_hash_table (info);
+
+  if (htab->elf.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.  */
+      if (h->dynindx == -1
+	  && (h->elf_link_hash_flags & ELF_LINK_FORCED_LOCAL) == 0)
+	{
+	  if (! bfd_elf64_link_record_dynamic_symbol (info, h))
+	    return false;
+	}
+
+      if (WILL_CALL_FINISH_DYNAMIC_SYMBOL (1, info, h))
+	{
+	  asection *s = htab->splt;
+
+	  /* If this is the first .plt entry, make room for the special
+	     first entry.  */
+	  if (s->_raw_size == 0)
+	    s->_raw_size += PLT_FIRST_ENTRY_SIZE;
+
+	  h->plt.offset = s->_raw_size;
+
+	  /* If this symbol is not defined in a regular file, and we are
+	     not generating a shared library, then set the symbol to this
+	     location in the .plt.  This is required to make function
+	     pointers compare as equal between the normal executable and
+	     the shared library.  */
+	  if (! info->shared
+	      && (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0)
+	    {
+	      h->root.u.def.section = s;
+	      h->root.u.def.value = h->plt.offset;
+	    }
+	
+	  /* Make room for this entry.  */
+	  s->_raw_size += PLT_ENTRY_SIZE;
+	
+	  /* We also need to make an entry in the .got.plt section, which
+	     will be placed in the .got section by the linker script.  */
+	  htab->sgotplt->_raw_size += GOT_ENTRY_SIZE;
+
+	  /* We also need to make an entry in the .rela.plt section.  */
+	  htab->srelplt->_raw_size += sizeof (Elf64_External_Rela);
+	}
+      else
+	{
+	  h->plt.offset = (bfd_vma) -1;
+	  h->elf_link_hash_flags &= ~ELF_LINK_HASH_NEEDS_PLT;
+	}
+    }
+  else
+    {
+      h->plt.offset = (bfd_vma) -1;
+      h->elf_link_hash_flags &= ~ELF_LINK_HASH_NEEDS_PLT;
+    }
+
+  if (h->got.refcount > 0)
+    {
+      asection *s;
+      boolean dyn;
+
+      /* 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->elf_link_hash_flags & ELF_LINK_FORCED_LOCAL) == 0)
+	{
+	  if (! bfd_elf64_link_record_dynamic_symbol (info, h))
+	    return false;
+	}
+
+      s = htab->sgot;
+      h->got.offset = s->_raw_size;
+      s->_raw_size += GOT_ENTRY_SIZE;
+      dyn = htab->elf.dynamic_sections_created;
+      if (WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, info, h))
+	htab->srelgot->_raw_size += sizeof (Elf64_External_Rela);
+    }
+  else
+    h->got.offset = (bfd_vma) -1;
+
+  eh = (struct elf_s390_link_hash_entry *) h;
+  if (eh->dyn_relocs == NULL)
+    return true;
+
+  /* In the shared -Bsymbolic case, discard space allocated for
+     dynamic pc-relative relocs against symbols which turn out to be
+     defined in regular objects.  For the normal shared case, discard
+     space for pc-relative relocs that have become local due to symbol
+     visibility changes.  */
+
+  if (info->shared)
+    {
+      if ((h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) != 0
+	  && ((h->elf_link_hash_flags & ELF_LINK_FORCED_LOCAL) != 0
+	      || info->symbolic))
+	{
+	  struct elf_s390_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;
+	    }
+	}
+    }
+  else
+    {
+      /* For the non-shared case, discard space for relocs against
+	 symbols which turn out to need copy relocs or are not
+	 dynamic.  */
+
+      if ((h->elf_link_hash_flags & ELF_LINK_NON_GOT_REF) == 0
+	  && (((h->elf_link_hash_flags & ELF_LINK_HASH_DEF_DYNAMIC) != 0
+	       && (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0)
+	      || (htab->elf.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->elf_link_hash_flags & ELF_LINK_FORCED_LOCAL) == 0)
+	    {
+	      if (! bfd_elf64_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;
+
+    keep:
+    }
+
+  /* Finally, allocate space.  */
+  for (p = eh->dyn_relocs; p != NULL; p = p->next)
+    {
+      asection *sreloc = elf_section_data (p->sec)->sreloc;
+      sreloc->_raw_size += p->count * sizeof (Elf64_External_Rela);
+    }
+
+  return true;
+}
+
+/* Find any dynamic relocs that apply to read-only sections.  */
+
+static boolean
+readonly_dynrelocs (h, inf)
+     struct elf_link_hash_entry *h;
+     PTR inf;
+{
+  struct elf_s390_link_hash_entry *eh;
+  struct elf_s390_dyn_relocs *p;
+
+  eh = (struct elf_s390_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 boolean
@@ -1065,125 +1359,138 @@ elf_s390_size_dynamic_sections (output_bfd, info)
      bfd *output_bfd ATTRIBUTE_UNUSED;
      struct bfd_link_info *info;
 {
+  struct elf_s390_link_hash_table *htab;
   bfd *dynobj;
   asection *s;
   boolean relocs;
-  boolean plt;
+  bfd *ibfd;
 
-  dynobj = elf_hash_table (info)->dynobj;
-  BFD_ASSERT (dynobj != NULL);
+  htab = elf_s390_hash_table (info);
+  dynobj = htab->elf.dynobj;
+  if (dynobj == NULL)
+    abort ();
 
-  if (elf_hash_table (info)->dynamic_sections_created)
+  if (htab->elf.dynamic_sections_created)
     {
       /* Set the contents of the .interp section to the interpreter.  */
       if (! info->shared)
 	{
 	  s = bfd_get_section_by_name (dynobj, ".interp");
-	  BFD_ASSERT (s != NULL);
+	  if (s == NULL)
+	    abort ();
 	  s->_raw_size = sizeof ELF_DYNAMIC_INTERPRETER;
 	  s->contents = (unsigned char *) ELF_DYNAMIC_INTERPRETER;
 	}
     }
-  else
-    {
-      /* We may have created entries in the .rela.got section.
-         However, if we are not creating the dynamic sections, we will
-         not actually use these entries.  Reset the size of .rela.got,
-         which will cause it to get stripped from the output file
-         below.  */
-      s = bfd_get_section_by_name (dynobj, ".rela.got");
-      if (s != NULL)
-	s->_raw_size = 0;
-    }
 
-  /* If this is a -Bsymbolic shared link, then we need to discard all
-     PC relative relocs against symbols defined in a regular object.
-     We allocated space for them in the check_relocs routine, but we
-     will not fill them in in the relocate_section routine.  */
-  if (info->shared)
-    elf_s390_link_hash_traverse (elf_s390_hash_table (info),
-			         elf_s390_discard_copies,
-				 (PTR) info);
-
-  /* The check_relocs and adjust_dynamic_symbol entry points have
-     determined the sizes of the various dynamic sections.  Allocate
-     memory for them.  */
-  plt = false;
-  relocs = false;
-  for (s = dynobj->sections; s != NULL; s = s->next)
+  /* Set up .got offsets for local syms, and space for local dynamic
+     relocs.  */
+  for (ibfd = info->input_bfds; ibfd != NULL; ibfd = ibfd->link_next)
     {
-      const char *name;
-      boolean strip;
+      bfd_signed_vma *local_got;
+      bfd_signed_vma *end_local_got;
+      bfd_size_type locsymcount;
+      Elf_Internal_Shdr *symtab_hdr;
+      asection *srela;
 
-      if ((s->flags & SEC_LINKER_CREATED) == 0)
+      if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour)
 	continue;
 
-      /* It's OK to base decisions on the section name, because none
-	 of the dynobj section names depend upon the input files.  */
-      name = bfd_get_section_name (dynobj, s);
-
-      strip = false;
-
-      if (strcmp (name, ".plt") == 0)
+      for (s = ibfd->sections; s != NULL; s = s->next)
 	{
-	  if (s->_raw_size == 0)
-	    {
-	      /* Strip this section if we don't need it; see the
-                 comment below.  */
-	      strip = true;
-	    }
-	  else
+	  bfd_size_type count = elf_section_data (s)->local_dynrel;
+
+	  if (count != 0)
 	    {
-	      /* Remember whether there is a PLT.  */
-	      plt = true;
+	      srela = elf_section_data (s)->sreloc;
+	      srela->_raw_size += count * sizeof (Elf64_External_Rela);
 	    }
 	}
-      else if (strncmp (name, ".rela", 5) == 0)
+
+      local_got = elf_local_got_refcounts (ibfd);
+      if (!local_got)
+	continue;
+
+      symtab_hdr = &elf_tdata (ibfd)->symtab_hdr;
+      locsymcount = symtab_hdr->sh_info;
+      end_local_got = local_got + locsymcount;
+      s = htab->sgot;
+      srela = htab->srelgot;
+      for (; local_got < end_local_got; ++local_got)
 	{
-	  if (s->_raw_size == 0)
+	  if (*local_got > 0)
 	    {
-	      /* If we don't need this section, strip it from the
-		 output file.  This is to handle .rela.bss and
-		 .rel.plt.  We must create it in
-		 create_dynamic_sections, because it must be created
-		 before the linker maps input sections to output
-		 sections.  The linker does that before
-		 adjust_dynamic_symbol is called, and it is that
-		 function which decides whether anything needs to go
-		 into these sections.  */
-	      strip = true;
+	      *local_got = s->_raw_size;
+	      s->_raw_size += GOT_ENTRY_SIZE;
+	      if (info->shared)
+		srela->_raw_size += sizeof (Elf64_External_Rela);
 	    }
 	  else
-	    {
-	      /* Remember whether there are any reloc sections other
-                 than .rela.plt.  */
-	      if (strcmp (name, ".rela.plt") != 0)
-		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;
-	    }
+	    *local_got = (bfd_vma) -1;
 	}
-      else if (strncmp (name, ".got", 4) != 0)
+    }
+
+  /* Allocate global sym .plt and .got entries, and space for global
+     sym dynamic relocs.  */
+  elf_link_hash_traverse (&htab->elf, allocate_dynrelocs, (PTR) info);
+
+  /* We now have determined the sizes of the various dynamic sections.
+     Allocate memory for them.  */
+  relocs = false;
+  for (s = dynobj->sections; s != NULL; s = s->next)
+    {
+      if ((s->flags & SEC_LINKER_CREATED) == 0)
+	continue;
+
+      if (s == htab->splt
+	  || s == htab->sgot
+	  || s == htab->sgotplt)
+	{
+	  /* Strip this section if we don't need it; see the
+	     comment below.  */
+	}
+      else if (strncmp (bfd_get_section_name (dynobj, s), ".rela", 5) == 0)
+	{
+	  if (s->_raw_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;
+	}
+      else
 	{
 	  /* It's not one of our sections, so don't allocate space.  */
 	  continue;
 	}
 
-      if (strip)
+      if (s->_raw_size == 0)
 	{
+	  /* If we don't need this section, strip it from the
+	     output file.  This is to handle .rela.bss and
+	     .rela.plt.  We must create it in
+	     create_dynamic_sections, because it 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.  */
+
 	  _bfd_strip_section_from_output (info, s);
 	  continue;
 	}
 
-      /* Allocate memory for the section contents.  */
-      s->contents = (bfd_byte *) bfd_alloc (dynobj, s->_raw_size);
-      if (s->contents == NULL && s->_raw_size != 0)
+      /* 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_390_NONE reloc instead
+	 of garbage.  */
+      s->contents = (bfd_byte *) bfd_zalloc (dynobj, s->_raw_size);
+      if (s->contents == NULL)
 	return false;
     }
 
-  if (elf_hash_table (info)->dynamic_sections_created)
+  if (htab->elf.dynamic_sections_created)
     {
       /* Add some entries to the .dynamic section.  We fill in the
 	 values later, in elf_s390_finish_dynamic_sections, but we
@@ -1199,7 +1506,7 @@ elf_s390_size_dynamic_sections (output_bfd, info)
 	    return false;
 	}
 
-      if (plt)
+      if (htab->splt->_raw_size != 0)
 	{
 	  if (!add_dynamic_entry (DT_PLTGOT, 0)
 	      || !add_dynamic_entry (DT_PLTRELSZ, 0)
@@ -1214,13 +1521,16 @@ elf_s390_size_dynamic_sections (output_bfd, info)
               || !add_dynamic_entry (DT_RELASZ, 0)
               || !add_dynamic_entry (DT_RELAENT, sizeof (Elf64_External_Rela)))
 	    return false;
-         }
-
-      if ((info->flags & DF_TEXTREL) != 0)
-	{
-	  if (!add_dynamic_entry (DT_TEXTREL, 0))
-	    return false;
-	  info->flags |= DF_TEXTREL;
+	
+	  /* If any dynamic relocs apply to a read-only section,
+	     then we need a DT_TEXTREL entry.  */
+	  elf_link_hash_traverse (&htab->elf, readonly_dynrelocs, (PTR) info);
+	
+	  if ((info->flags & DF_TEXTREL) != 0)
+	    {
+	      if (!add_dynamic_entry (DT_TEXTREL, 0))
+		return false;
+	    }
 	}
     }
 #undef add_dynamic_entry
@@ -1228,35 +1538,6 @@ elf_s390_size_dynamic_sections (output_bfd, info)
   return true;
 }
 
-/* This function is called via elf64_s390_link_hash_traverse if we are
-   creating a shared object with -Bsymbolic.  It discards the space
-   allocated to copy PC relative relocs against symbols which are
-   defined in regular objects.  We allocated space for them in the
-   check_relocs routine, but we won't fill them in in the
-   relocate_section routine.  */
-
-/*ARGSUSED*/
-static boolean
-elf_s390_discard_copies (h, inf)
-     struct elf_s390_link_hash_entry *h;
-     PTR inf;
-{
-  struct elf_s390_pcrel_relocs_copied *s;
-  struct bfd_link_info *info = (struct bfd_link_info *) inf;
-
-  /* If a symbol has been forced local or we have found a regular
-     definition for the symbolic link case, then we won't be needing
-     any relocs.  */
-  if ((h->root.elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) != 0
-      && ((h->root.elf_link_hash_flags & ELF_LINK_FORCED_LOCAL) != 0
-	  || info->symbolic))
-    {
-      for (s = h->pcrel_relocs_copied; s != NULL; s = s->next)
-	s->section->_raw_size -= s->count * sizeof (Elf64_External_Rela);
-    }
-
-  return true;
-}
 /* Relocate a 390 ELF section.  */
 
 static boolean
@@ -1271,30 +1552,18 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
      Elf_Internal_Sym *local_syms;
      asection **local_sections;
 {
-  bfd *dynobj;
+  struct elf_s390_link_hash_table *htab;
   Elf_Internal_Shdr *symtab_hdr;
   struct elf_link_hash_entry **sym_hashes;
   bfd_vma *local_got_offsets;
-  asection *sgot;
-  asection *splt;
-  asection *sreloc;
   Elf_Internal_Rela *rel;
   Elf_Internal_Rela *relend;
 
-  dynobj = elf_hash_table (info)->dynobj;
+  htab = elf_s390_hash_table (info);
   symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
   sym_hashes = elf_sym_hashes (input_bfd);
   local_got_offsets = elf_local_got_offsets (input_bfd);
 
-  sgot = NULL;
-  splt = NULL;
-  sreloc = NULL;
-  if (dynobj != NULL)
-    {
-      splt = bfd_get_section_by_name (dynobj, ".plt");
-      sgot = bfd_get_section_by_name (dynobj, ".got");
-    }
-
   rel = relocs;
   relend = relocs + input_section->reloc_count;
   for (; rel < relend; rel++)
@@ -1305,12 +1574,14 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
       struct elf_link_hash_entry *h;
       Elf_Internal_Sym *sym;
       asection *sec;
+      bfd_vma off;
       bfd_vma relocation;
+      boolean unresolved_reloc;
       bfd_reloc_status_type r;
 
       r_type = ELF64_R_TYPE (rel->r_info);
-      if (r_type == R_390_GNU_VTINHERIT
-          || r_type == R_390_GNU_VTENTRY)
+      if (r_type == (int) R_390_GNU_VTINHERIT
+          || r_type == (int) R_390_GNU_VTENTRY)
         continue;
       if (r_type < 0 || r_type >= (int) R_390_max)
 	{
@@ -1344,6 +1615,7 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
       h = NULL;
       sym = NULL;
       sec = NULL;
+      unresolved_reloc = false;
       if (r_symndx < symtab_hdr->sh_info)
 	{
 	  sym = local_syms + r_symndx;
@@ -1358,23 +1630,24 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
 	  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;
+
 	  if (h->root.type == bfd_link_hash_defined
 	      || h->root.type == bfd_link_hash_defweak)
 	    {
 	      sec = h->root.u.def.section;
-	      if ((r_type == R_390_GOTPC
-		   || r_type == R_390_GOTPCDBL)
-		  || ((r_type == R_390_PLT16DBL ||
-		       r_type == R_390_PLT32 ||
-		       r_type == R_390_PLT32DBL ||
-		       r_type == R_390_PLT64)
-                      && splt != NULL
+	      if (r_type == R_390_GOTPC
+		  || r_type == R_390_GOTPCDBL
+		  || ((r_type == R_390_PLT16DBL
+		       || r_type == R_390_PLT32
+		       || r_type == R_390_PLT32DBL
+		       || r_type == R_390_PLT64)
+                      && htab->splt != NULL
 		      && h->plt.offset != (bfd_vma) -1)
-		  || ((r_type == R_390_GOT12 ||
-                       r_type == R_390_GOT16 ||
-		       r_type == R_390_GOT32 ||
-		       r_type == R_390_GOT64 ||
-		       r_type == R_390_GOTENT)
+		  || ((r_type == R_390_GOT12
+                       || r_type == R_390_GOT16
+		       || r_type == R_390_GOT32
+		       || r_type == R_390_GOT64
+		       || r_type == R_390_GOTENT)
 		      && elf_hash_table (info)->dynamic_sections_created
 		      && (! info->shared
 			  || (! info->symbolic && h->dynindx != -1)
@@ -1384,17 +1657,17 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
 		      && ((! info->symbolic && h->dynindx != -1)
 			  || (h->elf_link_hash_flags
 			      & ELF_LINK_HASH_DEF_REGULAR) == 0)
-		      && ( r_type == R_390_8 ||
-			   r_type == R_390_16 ||
-                           r_type == R_390_32 ||
-			   r_type == R_390_64 ||
-                           r_type == R_390_PC16 ||
-                           r_type == R_390_PC16DBL ||
-			   r_type == R_390_PC32 ||
-			   r_type == R_390_PC32DBL ||
-			   r_type == R_390_PC64)
+		      && (r_type == R_390_8
+			  || r_type == R_390_16
+			  || r_type == R_390_32
+			  || r_type == R_390_64
+			  || r_type == R_390_PC16
+			  || r_type == R_390_PC16DBL
+			  || r_type == R_390_PC32
+			  || r_type == R_390_PC32DBL
+			  || r_type == R_390_PC64)
                       && ((input_section->flags & SEC_ALLOC) != 0
-                          /* DWARF will emit R_386_32 relocations in its
+                          /* DWARF will emit R_390_32 relocations in its
                              sections against symbols defined externally
                              in shared libraries.  We can't do anything
                              with them here.  */
@@ -1409,10 +1682,11 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
 		}
 	      else if (sec->output_section == NULL)
 		{
-		  (*_bfd_error_handler)
-		    (_("%s: warning: unresolvable relocation against symbol `%s' from %s section"),
-		     bfd_archive_filename (input_bfd), h->root.root.string,
-		     bfd_get_section_name (input_bfd, input_section));
+		  /* Set a flag that will be cleared later if we find a
+		     relocation value for this symbol.  output_section
+		     is typically NULL for symbols satisfied by a shared
+		     library.  */
+		  unresolved_reloc = true;
 		  relocation = 0;
 		}
 	      else
@@ -1431,9 +1705,9 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
 	    {
 	      if (! ((*info->callbacks->undefined_symbol)
 		     (info, h->root.root.string, input_bfd,
-	      input_section, rel->r_offset,
-		     (!info->shared || info->no_undefined
-		      || ELF_ST_VISIBILITY (h->other)))))
+          	      input_section, rel->r_offset,
+		      (!info->shared || info->no_undefined
+		       || ELF_ST_VISIBILITY (h->other)))))
 		return false;
 	      relocation = 0;
 	    }
@@ -1448,18 +1722,20 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
         case R_390_GOTENT:
           /* Relocation is to the entry for this symbol in the global
              offset table.  */
-	  BFD_ASSERT (sgot != NULL);
+	  if (htab->sgot == NULL)
+	    abort ();
 
           if (h != NULL)
             {
-              bfd_vma off;
+	      boolean dyn;
 
               off = h->got.offset;
-              BFD_ASSERT (off != (bfd_vma) -1);
-
-              if (! elf_hash_table (info)->dynamic_sections_created
+	      dyn = htab->elf.dynamic_sections_created;
+              if (! WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, info, h)
                   || (info->shared
-                      && (info->symbolic || h->dynindx == -1)
+                      && (info->symbolic
+			  || h->dynindx == -1
+			  || (h->elf_link_hash_flags & ELF_LINK_FORCED_LOCAL))
                       && (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR)))
                 {
                   /* This is actually a static link, or it is a
@@ -1479,18 +1755,17 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
                   else
                     {
 		      bfd_put_64 (output_bfd, relocation,
-				  sgot->contents + off);
+				  htab->sgot->contents + off);
                       h->got.offset |= 1;
                     }
                 }
-	      relocation = sgot->output_offset + off;
+	      else
+		unresolved_reloc = false;
             }
           else
             {
-              bfd_vma off;
-
-              BFD_ASSERT (local_got_offsets != NULL
-                          && local_got_offsets[r_symndx] != (bfd_vma) -1);
+	      if (local_got_offsets == NULL)
+		abort ();
 
               off = local_got_offsets[r_symndx];
 
@@ -1501,34 +1776,38 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
                 off &= ~1;
               else
                 {
-                  bfd_put_64 (output_bfd, relocation, sgot->contents + off);
+                  bfd_put_64 (output_bfd, relocation,
+			      htab->sgot->contents + off);
 
                   if (info->shared)
                     {
                       asection *srelgot;
                       Elf_Internal_Rela outrel;
+		      Elf64_External_Rela *loc;
 
-                      srelgot = bfd_get_section_by_name (dynobj, ".rela.got");
-                      BFD_ASSERT (srelgot != NULL);
+                      srelgot = htab->srelgot;
+		      if (srelgot == NULL)
+			abort ();
 
-                      outrel.r_offset = (sgot->output_section->vma
-                                         + sgot->output_offset
+                      outrel.r_offset = (htab->sgot->output_section->vma
+                                         + htab->sgot->output_offset
                                          + off);
                       outrel.r_info = ELF64_R_INFO (0, R_390_RELATIVE);
 		      outrel.r_addend = relocation;
-                      bfd_elf64_swap_reloca_out (output_bfd, &outrel,
-                                                (((Elf64_External_Rela *)
-                                                  srelgot->contents)
-                                                 + srelgot->reloc_count));
-                      ++srelgot->reloc_count;
+		      loc = (Elf64_External_Rela *) srelgot->contents;
+		      loc += srelgot->reloc_count++;
+                      bfd_elf64_swap_reloca_out (output_bfd, &outrel, loc);
                     }
 
                   local_got_offsets[r_symndx] |= 1;
                 }
-
-	      relocation = sgot->output_offset + off;
             }
 
+	  if (off >= (bfd_vma) -2)
+	    abort ();
+
+	  relocation = htab->sgot->output_offset + off;
+
 	  /*
 	   * For @GOTENT the relocation is against the offset between
 	   * the instruction and the symbols entry in the GOT and not
@@ -1536,7 +1815,7 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
 	   * add the vma of the GOT to get the correct value.
 	   */
 	  if (r_type == R_390_GOTENT)
-	    relocation += sgot->output_section->vma;
+	    relocation += htab->sgot->output_section->vma;
 
           break;
 
@@ -1544,34 +1823,21 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
           /* Relocation is relative to the start of the global offset
              table.  */
 
-          if (sgot == NULL)
-            {
-              sgot = bfd_get_section_by_name (dynobj, ".got");
-              BFD_ASSERT (sgot != NULL);
-            }
-
           /* Note that sgot->output_offset is not involved in this
              calculation.  We always want the start of .got.  If we
              defined _GLOBAL_OFFSET_TABLE in a different way, as is
              permitted by the ABI, we might have to change this
              calculation.  */
-          relocation -= sgot->output_section->vma;
+          relocation -= htab->sgot->output_section->vma;
 
           break;
 
         case R_390_GOTPC:
 	case R_390_GOTPCDBL:
           /* Use global offset table as symbol value.  */
-
-          if (sgot == NULL)
-            {
-              sgot = bfd_get_section_by_name (dynobj, ".got");
-              BFD_ASSERT (sgot != NULL);
-            }
-
-          relocation = sgot->output_section->vma;
-
-          break;
+          relocation = htab->sgot->output_section->vma;
+	  unresolved_reloc = false;
+         break;
 
         case R_390_PLT16DBL:
         case R_390_PLT32:
@@ -1585,7 +1851,8 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
           if (h == NULL)
             break;
 
-          if (h->plt.offset == (bfd_vma) -1 || splt == NULL)
+          if (h->plt.offset == (bfd_vma) -1
+	      || htab->splt == NULL)
             {
               /* We didn't make a PLT entry for this symbol.  This
                  happens when statically linking PIC code, or when
@@ -1593,10 +1860,10 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
               break;
             }
 
-          relocation = (splt->output_section->vma
-                        + splt->output_offset
+          relocation = (htab->splt->output_section->vma
+                        + htab->splt->output_offset
                         + h->plt.offset);
-
+	  unresolved_reloc = false;
           break;
 
         case R_390_8:
@@ -1608,56 +1875,47 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
         case R_390_PC32:
 	case R_390_PC32DBL:
         case R_390_PC64:
-          if (info->shared
-              && (input_section->flags & SEC_ALLOC) != 0
-              && (r_type == R_390_8
-                  || r_type == R_390_16
-		  || r_type == R_390_32
-		  || r_type == R_390_64
-                  || (h != NULL
-                      && h->dynindx != -1
-                      && (! info->symbolic
-                          || (h->elf_link_hash_flags
-                              & ELF_LINK_HASH_DEF_REGULAR) == 0))))
+          if ((info->shared
+	       && (input_section->flags & SEC_ALLOC) != 0
+	       && ((r_type != R_390_PC16
+		    && r_type != R_390_PC16DBL
+		    && r_type != R_390_PC32
+		    && r_type != R_390_PC32DBL
+		    && r_type != R_390_PC64)
+		   || (h != NULL
+		       && h->dynindx != -1
+		       && (! info->symbolic
+			   || (h->elf_link_hash_flags
+			       & ELF_LINK_HASH_DEF_REGULAR) == 0))))
+	      || (!info->shared
+		  && (input_section->flags & SEC_ALLOC) != 0
+		  && h != NULL
+		  && h->dynindx != -1
+		  && (h->elf_link_hash_flags & ELF_LINK_NON_GOT_REF) == 0
+		  && (((h->elf_link_hash_flags
+			& ELF_LINK_HASH_DEF_DYNAMIC) != 0
+		       && (h->elf_link_hash_flags
+			   & ELF_LINK_HASH_DEF_REGULAR) == 0)
+		      || h->root.type == bfd_link_hash_undefweak
+		      || h->root.type == bfd_link_hash_undefined)))
             {
               Elf_Internal_Rela outrel;
               boolean skip, relocate;
+	      asection *sreloc;
+	      Elf64_External_Rela *loc;
 
               /* When generating a shared object, these relocations
                  are copied into the output file to be resolved at run
                  time.  */
 
-              if (sreloc == NULL)
-                {
-                  const char *name;
-
-                  name = (bfd_elf_string_from_elf_section
-                          (input_bfd,
-                           elf_elfheader (input_bfd)->e_shstrndx,
-                           elf_section_data (input_section)->rel_hdr.sh_name));
-                  if (name == NULL)
-                    return false;
-
-                  BFD_ASSERT (strncmp (name, ".rela", 5) == 0
-                              && strcmp (bfd_get_section_name (input_bfd,
-                                                               input_section),
-                                         name + 5) == 0);
-
-                  sreloc = bfd_get_section_by_name (dynobj, name);
-                  BFD_ASSERT (sreloc != NULL);
-                }
-
               skip = false;
 
               if (elf_section_data (input_section)->stab_info == NULL)
                 outrel.r_offset = rel->r_offset;
               else
                 {
-                  bfd_vma off;
-
                   off = (_bfd_stab_section_offset
-                         (output_bfd, &elf_hash_table (info)->stab_info,
-                          input_section,
+                         (output_bfd, htab->elf.stab_info, input_section,
                           &elf_section_data (input_section)->stab_info,
                           rel->r_offset));
                   if (off == (bfd_vma) -1)
@@ -1673,44 +1931,37 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
                   memset (&outrel, 0, sizeof outrel);
                   relocate = false;
                 }
-              else if (r_type == R_390_PC16 ||
-                       r_type == R_390_PC16DBL ||
-		       r_type == R_390_PC32 ||
-		       r_type == R_390_PC32DBL ||
-		       r_type == R_390_PC64)
+              else if (h != NULL
+		       && h->dynindx != -1
+		       && (r_type == R_390_PC16
+			   || r_type == R_390_PC16DBL
+			   || r_type == R_390_PC32
+			   || r_type == R_390_PC32DBL
+			   || r_type == R_390_PC64
+			   || !info->shared
+			   || !info->symbolic
+			   || (h->elf_link_hash_flags
+			       & ELF_LINK_HASH_DEF_REGULAR) == 0))
                 {
-                  BFD_ASSERT (h != NULL && h->dynindx != -1);
 		  relocate = false;
                   outrel.r_info = ELF64_R_INFO (h->dynindx, r_type);
 		  outrel.r_addend = relocation + rel->r_addend;
                 }
               else
                 {
-                  /* h->dynindx may be -1 if this symbol was marked to
-                     become local.  */
-                  if (h == NULL
-                      || ((info->symbolic || h->dynindx == -1)
-                          && (h->elf_link_hash_flags
-                              & ELF_LINK_HASH_DEF_REGULAR) != 0))
-                    {
-                      relocate = true;
-                      outrel.r_info = ELF64_R_INFO (0, R_390_RELATIVE);
-		      outrel.r_addend = relocation + rel->r_addend;
-                    }
-		  else
-		    {
-		      BFD_ASSERT (h->dynindx != -1);
-		      relocate = false;
-		      outrel.r_info = ELF64_R_INFO (h->dynindx, R_390_64);
-		      outrel.r_addend = relocation + rel->r_addend;
-		    }
-                }
+		  /* This symbol is local, or marked to become local.  */
+		  relocate = true;
+		  outrel.r_info = ELF64_R_INFO (0, R_390_RELATIVE);
+		  outrel.r_addend = relocation + rel->r_addend;
+		}
 
-              bfd_elf64_swap_reloca_out (output_bfd, &outrel,
-                                        (((Elf64_External_Rela *)
-                                          sreloc->contents)
-                                         + sreloc->reloc_count));
-              ++sreloc->reloc_count;
+	      sreloc = elf_section_data (input_section)->sreloc;
+	      if (sreloc == NULL)
+		abort ();
+
+	      loc = (Elf64_External_Rela *) sreloc->contents;
+	      loc += sreloc->reloc_count++;
+              bfd_elf64_swap_reloca_out (output_bfd, &outrel, loc);
 
               /* If this reloc is against an external symbol, we do
                  not want to fiddle with the addend.  Otherwise, we
@@ -1726,39 +1977,54 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
           break;
         }
 
+      if (unresolved_reloc
+	  && !(info->shared
+	       && (input_section->flags & SEC_DEBUGGING) != 0
+	       && (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_DYNAMIC) != 0))
+	(*_bfd_error_handler)
+	  (_("%s(%s+0x%lx): unresolvable relocation against symbol `%s'"),
+	   bfd_archive_filename (input_bfd),
+	   bfd_get_section_name (input_bfd, input_section),
+	   (long) rel->r_offset,
+	   h->root.root.string);
+
       r = _bfd_final_link_relocate (howto, input_bfd, input_section,
 				      contents, rel->r_offset,
 				      relocation, rel->r_addend);
 
       if (r != bfd_reloc_ok)
 	{
-	  switch (r)
+	  const char *name;
+	
+	  if (h != NULL)
+	    name = h->root.root.string;
+	  else
 	    {
-	    default:
-	    case bfd_reloc_outofrange:
-	      abort ();
-	    case bfd_reloc_overflow:
-	      {
-		const char *name;
-
-		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)
-		      return false;
-		    if (*name == '\0')
-		      name = bfd_section_name (input_bfd, sec);
-		  }
-		if (! ((*info->callbacks->reloc_overflow)
-		       (info, name, howto->name, (bfd_vma) 0,
-			input_bfd, input_section, rel->r_offset)))
-		  return false;
-	      }
-	      break;
+	      name = bfd_elf_string_from_elf_section (input_bfd,
+						      symtab_hdr->sh_link,
+						      sym->st_name);
+	      if (name == NULL)
+		return false;
+	      if (*name == '\0')
+		name = bfd_section_name (input_bfd, sec);
+	    }
+	
+	  if (r == bfd_reloc_overflow)
+	    {
+	
+	      if (! ((*info->callbacks->reloc_overflow)
+		     (info, name, howto->name, (bfd_vma) 0,
+		      input_bfd, input_section, rel->r_offset)))
+		return false;
+	    }
+	  else
+	    {
+	      (*_bfd_error_handler)
+		(_("%s(%s+0x%lx): reloc against `%s': error %d"),
+		 bfd_archive_filename (input_bfd),
+		 bfd_get_section_name (input_bfd, input_section),
+		 (long) rel->r_offset, name, (int) r);
+	      return false;
 	    }
 	}
     }
@@ -1776,28 +2042,25 @@ elf_s390_finish_dynamic_symbol (output_bfd, info, h, sym)
      struct elf_link_hash_entry *h;
      Elf_Internal_Sym *sym;
 {
-  bfd *dynobj;
+  struct elf_s390_link_hash_table *htab;
 
-  dynobj = elf_hash_table (info)->dynobj;
+  htab = elf_s390_hash_table (info);
 
   if (h->plt.offset != (bfd_vma) -1)
     {
-      asection *splt;
-      asection *srela;
-      Elf_Internal_Rela rela;
-      bfd_vma got_offset;
       bfd_vma plt_index;
-      asection *sgot;
+      bfd_vma got_offset;
+      Elf_Internal_Rela rela;
+      Elf64_External_Rela *loc;
 
       /* This symbol has an entry in the procedure linkage table.  Set
          it up.  */
 
-      BFD_ASSERT (h->dynindx != -1);
-
-      splt = bfd_get_section_by_name (dynobj, ".plt");
-      sgot = bfd_get_section_by_name (dynobj, ".got.plt");
-      srela = bfd_get_section_by_name (dynobj, ".rela.plt");
-      BFD_ASSERT (splt != NULL && sgot != NULL && srela != NULL);
+      if (h->dynindx == -1
+	  || htab->splt == NULL
+	  || htab->sgotplt == NULL
+	  || htab->srelplt == NULL)
+	abort ();
 
       /* Calc. index no.
          Current offset - size first entry / entry size.  */
@@ -1808,78 +2071,78 @@ elf_s390_finish_dynamic_symbol (output_bfd, info, h, sym)
       got_offset = (plt_index + 3) * GOT_ENTRY_SIZE;
 
       /* Fill in the blueprint of a PLT.  */
-      bfd_put_32 (output_bfd, PLT_ENTRY_WORD0,
-		  splt->contents + h->plt.offset);
-      bfd_put_32 (output_bfd, PLT_ENTRY_WORD1,
-		  splt->contents + h->plt.offset + 4);
-      bfd_put_32 (output_bfd, PLT_ENTRY_WORD2,
-		  splt->contents + h->plt.offset + 8);
-      bfd_put_32 (output_bfd, PLT_ENTRY_WORD3,
-		  splt->contents + h->plt.offset + 12);
-      bfd_put_32 (output_bfd, PLT_ENTRY_WORD4,
-		  splt->contents + h->plt.offset + 16);
-      bfd_put_32 (output_bfd, PLT_ENTRY_WORD5,
-		  splt->contents + h->plt.offset + 20);
-      bfd_put_32 (output_bfd, PLT_ENTRY_WORD6,
-		  splt->contents + h->plt.offset + 24);
-      bfd_put_32 (output_bfd, PLT_ENTRY_WORD7,
-		  splt->contents + h->plt.offset + 28);
+      bfd_put_32 (output_bfd, (bfd_vma) PLT_ENTRY_WORD0,
+		  htab->splt->contents + h->plt.offset);
+      bfd_put_32 (output_bfd, (bfd_vma) PLT_ENTRY_WORD1,
+		  htab->splt->contents + h->plt.offset + 4);
+      bfd_put_32 (output_bfd, (bfd_vma) PLT_ENTRY_WORD2,
+		  htab->splt->contents + h->plt.offset + 8);
+      bfd_put_32 (output_bfd, (bfd_vma) PLT_ENTRY_WORD3,
+		  htab->splt->contents + h->plt.offset + 12);
+      bfd_put_32 (output_bfd, (bfd_vma) PLT_ENTRY_WORD4,
+		  htab->splt->contents + h->plt.offset + 16);
+      bfd_put_32 (output_bfd, (bfd_vma) PLT_ENTRY_WORD5,
+		  htab->splt->contents + h->plt.offset + 20);
+      bfd_put_32 (output_bfd, (bfd_vma) PLT_ENTRY_WORD6,
+		  htab->splt->contents + h->plt.offset + 24);
+      bfd_put_32 (output_bfd, (bfd_vma) PLT_ENTRY_WORD7,
+		  htab->splt->contents + h->plt.offset + 28);
       /* Fixup the relative address to the GOT entry */
       bfd_put_32 (output_bfd,
-		  (sgot->output_section->vma + sgot->output_offset + got_offset
-		   - (splt->output_section->vma + h->plt.offset))/2,
-		  splt->contents + h->plt.offset + 2);
+		  (htab->sgotplt->output_section->vma +
+		   htab->sgotplt->output_offset + got_offset
+		   - (htab->splt->output_section->vma + h->plt.offset))/2,
+		  htab->splt->contents + h->plt.offset + 2);
       /* Fixup the relative branch to PLT 0 */
       bfd_put_32 (output_bfd, - (PLT_FIRST_ENTRY_SIZE +
 				 (PLT_ENTRY_SIZE * plt_index) + 22)/2,
-		  splt->contents + h->plt.offset + 24);
+		  htab->splt->contents + h->plt.offset + 24);
       /* Fixup offset into symbol table */
       bfd_put_32 (output_bfd, plt_index * sizeof (Elf64_External_Rela),
-		  splt->contents + h->plt.offset + 28);
-
-      /* Fill in the entry in the .rela.plt section.  */
-      rela.r_offset = (sgot->output_section->vma
-		       + sgot->output_offset
-		       + got_offset);
-      rela.r_info = ELF64_R_INFO (h->dynindx, R_390_JMP_SLOT);
-      rela.r_addend = 0;
-      bfd_elf64_swap_reloca_out (output_bfd, &rela,
-				 ((Elf64_External_Rela *) srela->contents
-				  + plt_index ));
+		  htab->splt->contents + h->plt.offset + 28);
 
       /* Fill in the entry in the global offset table.
          Points to instruction after GOT offset.  */
       bfd_put_64 (output_bfd,
-		  (splt->output_section->vma
-		   + splt->output_offset
+		  (htab->splt->output_section->vma
+		   + htab->splt->output_offset
 		   + h->plt.offset
 		   + 14),
-		  sgot->contents + got_offset);
+		  htab->sgotplt->contents + got_offset);
 
+      /* Fill in the entry in the .rela.plt section.  */
+      rela.r_offset = (htab->sgotplt->output_section->vma
+		       + htab->sgotplt->output_offset
+		       + got_offset);
+      rela.r_info = ELF64_R_INFO (h->dynindx, R_390_JMP_SLOT);
+      rela.r_addend = 0;
+      loc = (Elf64_External_Rela *) htab->srelplt->contents + plt_index;
+      bfd_elf64_swap_reloca_out (output_bfd, &rela, loc);
 
       if ((h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0)
 	{
 	  /* Mark the symbol as undefined, rather than as defined in
-	     the .plt section.  Leave the value alone.  */
+	     the .plt section.  Leave the value alone.  This is a clue
+	     for the dynamic linker, to make function pointer
+	     comparisons work between an application and shared
+	     library.  */
 	  sym->st_shndx = SHN_UNDEF;
 	}
     }
 
   if (h->got.offset != (bfd_vma) -1)
     {
-      asection *sgot;
-      asection *srela;
       Elf_Internal_Rela rela;
+      Elf64_External_Rela *loc;
 
       /* This symbol has an entry in the global offset table.  Set it
          up.  */
 
-      sgot = bfd_get_section_by_name (dynobj, ".got");
-      srela = bfd_get_section_by_name (dynobj, ".rela.got");
-      BFD_ASSERT (sgot != NULL && srela != NULL);
+      if (htab->sgot == NULL || htab->srelgot == NULL)
+	abort ();
 
-      rela.r_offset = (sgot->output_section->vma
-		       + sgot->output_offset
+      rela.r_offset = (htab->sgot->output_section->vma
+		       + htab->sgot->output_offset
 		       + (h->got.offset &~ (bfd_vma) 1));
 
       /* If this is a static link, or it is a -Bsymbolic link and the
@@ -1887,11 +2150,13 @@ elf_s390_finish_dynamic_symbol (output_bfd, info, h, sym)
 	 of a version file, we just want to emit a RELATIVE reloc.
 	 The entry in the global offset table will already have been
 	 initialized in the relocate_section function.  */
-      if (! elf_hash_table (info)->dynamic_sections_created
-	  || (info->shared
-	      && (info->symbolic || h->dynindx == -1)
-	      && (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR)))
+      if (info->shared
+	  && (info->symbolic
+	      || h->dynindx == -1
+	      || (h->elf_link_hash_flags & ELF_LINK_FORCED_LOCAL))
+	  && (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR))
         {
+	  BFD_ASSERT((h->got.offset & 1) != 0);
           rela.r_info = ELF64_R_INFO (0, R_390_RELATIVE);
           rela.r_addend = (h->root.u.def.value
                            + h->root.u.def.section->output_section->vma
@@ -1900,42 +2165,37 @@ elf_s390_finish_dynamic_symbol (output_bfd, info, h, sym)
       else
 	{
 	  BFD_ASSERT((h->got.offset & 1) == 0);
-	  bfd_put_64 (output_bfd, (bfd_vma) 0, sgot->contents + h->got.offset);
+	  bfd_put_64 (output_bfd, (bfd_vma) 0, htab->sgot->contents + h->got.offset);
 	  rela.r_info = ELF64_R_INFO (h->dynindx, R_390_GLOB_DAT);
           rela.r_addend = 0;
         }
 
-      bfd_elf64_swap_reloca_out (output_bfd, &rela,
-				 ((Elf64_External_Rela *) srela->contents
-				  + srela->reloc_count));
-      ++srela->reloc_count;
+      loc = (Elf64_External_Rela *) htab->srelgot->contents;
+      loc += htab->srelgot->reloc_count++;
+      bfd_elf64_swap_reloca_out (output_bfd, &rela, loc);
     }
 
   if ((h->elf_link_hash_flags & ELF_LINK_HASH_NEEDS_COPY) != 0)
     {
-      asection *s;
       Elf_Internal_Rela rela;
+      Elf64_External_Rela *loc;
 
       /* 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));
-
-
-      s = bfd_get_section_by_name (h->root.u.def.section->owner,
-				   ".rela.bss");
-      BFD_ASSERT (s != NULL);
+      if (h->dynindx == -1
+	  || (h->root.type != bfd_link_hash_defined
+	      && h->root.type != bfd_link_hash_defweak)
+	  || htab->srelbss == NULL)
+	abort ();
 
       rela.r_offset = (h->root.u.def.value
 		       + h->root.u.def.section->output_section->vma
 		       + h->root.u.def.section->output_offset);
       rela.r_info = ELF64_R_INFO (h->dynindx, R_390_COPY);
       rela.r_addend = 0;
-      bfd_elf64_swap_reloca_out (output_bfd, &rela,
-				 ((Elf64_External_Rela *) s->contents
-				  + s->reloc_count));
-      ++s->reloc_count;
+      loc = (Elf64_External_Rela *) htab->srelbss->contents;
+      loc += htab->srelbss->reloc_count++;
+      bfd_elf64_swap_reloca_out (output_bfd, &rela, loc);
     }
 
   /* Mark some specially defined symbols as absolute.  */
@@ -1947,6 +2207,26 @@ elf_s390_finish_dynamic_symbol (output_bfd, info, h, sym)
   return true;
 }
 
+/* Used to decide how to sort relocs in an optimal manner for the
+   dynamic linker, before writing them out.  */
+
+static enum elf_reloc_type_class
+elf_s390_reloc_type_class (rela)
+     const Elf_Internal_Rela *rela;
+{
+  switch ((int) ELF64_R_TYPE (rela->r_info))
+    {
+    case R_390_RELATIVE:
+      return reloc_class_relative;
+    case R_390_JMP_SLOT:
+      return reloc_class_plt;
+    case R_390_COPY:
+      return reloc_class_copy;
+    default:
+      return reloc_class_normal;
+    }
+}
+
 /* Finish up the dynamic sections.  */
 
 static boolean
@@ -1954,60 +2234,51 @@ elf_s390_finish_dynamic_sections (output_bfd, info)
      bfd *output_bfd;
      struct bfd_link_info *info;
 {
+  struct elf_s390_link_hash_table *htab;
   bfd *dynobj;
   asection *sdyn;
-  asection *sgot;
 
-  dynobj = elf_hash_table (info)->dynobj;
-
-  sgot = bfd_get_section_by_name (dynobj, ".got.plt");
-  BFD_ASSERT (sgot != NULL);
+  htab = elf_s390_hash_table (info);
+  dynobj = htab->elf.dynobj;
   sdyn = bfd_get_section_by_name (dynobj, ".dynamic");
 
-  if (elf_hash_table (info)->dynamic_sections_created)
+  if (htab->elf.dynamic_sections_created)
     {
-      asection *splt;
       Elf64_External_Dyn *dyncon, *dynconend;
 
-      BFD_ASSERT (sdyn != NULL);
+      if (sdyn == NULL || htab->sgot == NULL)
+	abort ();
 
       dyncon = (Elf64_External_Dyn *) sdyn->contents;
       dynconend = (Elf64_External_Dyn *) (sdyn->contents + sdyn->_raw_size);
       for (; dyncon < dynconend; dyncon++)
 	{
 	  Elf_Internal_Dyn dyn;
-	  const char *name;
 	  asection *s;
-
+	
 	  bfd_elf64_swap_dyn_in (dynobj, dyncon, &dyn);
-
+	
 	  switch (dyn.d_tag)
 	    {
 	    default:
-	      break;
-
+	      continue;
+	
 	    case DT_PLTGOT:
-	      name = ".got";
-	      goto get_vma;
+	      dyn.d_un.d_ptr = htab->sgot->output_section->vma;
+	      break;
+	
 	    case DT_JMPREL:
-	      name = ".rela.plt";
-	    get_vma:
-	      s = bfd_get_section_by_name(output_bfd, name);
-	      BFD_ASSERT (s != NULL);
-	      dyn.d_un.d_ptr = s->vma;
-	      bfd_elf64_swap_dyn_out (output_bfd, &dyn, dyncon);
+	      dyn.d_un.d_ptr = htab->srelplt->output_section->vma;
 	      break;
-
+	
 	    case DT_PLTRELSZ:
-	      s = bfd_get_section_by_name (output_bfd, ".rela.plt");
-	      BFD_ASSERT (s != NULL);
+	      s = htab->srelplt->output_section;
 	      if (s->_cooked_size != 0)
 		dyn.d_un.d_val = s->_cooked_size;
 	      else
 		dyn.d_un.d_val = s->_raw_size;
-	      bfd_elf64_swap_dyn_out (output_bfd, &dyn, dyncon);
 	      break;
-
+	
 	    case DT_RELASZ:
 	      /* The procedure linkage table relocs (DT_JMPREL) should
 		 not be included in the overall relocs (DT_RELA).
@@ -2016,68 +2287,64 @@ elf_s390_finish_dynamic_sections (output_bfd, info)
 		 linker script arranges for .rela.plt to follow all
 		 other relocation sections, we don't have to worry
 		 about changing the DT_RELA entry.  */
-	      s = bfd_get_section_by_name (output_bfd, ".rela.plt");
-	      if (s != NULL)
-		{
-		  if (s->_cooked_size != 0)
-		    dyn.d_un.d_val -= s->_cooked_size;
-		  else
-		    dyn.d_un.d_val -= s->_raw_size;
-		}
-	      bfd_elf64_swap_dyn_out (output_bfd, &dyn, dyncon);
+	      s = htab->srelplt->output_section;
+	      if (s->_cooked_size != 0)
+		dyn.d_un.d_val -= s->_cooked_size;
+	      else
+		dyn.d_un.d_val -= s->_raw_size;
 	      break;
 	    }
+
+	  bfd_elf64_swap_dyn_out (output_bfd, &dyn, dyncon);
 	}
 
       /* Fill in the special first entry in the procedure linkage table.  */
-      splt = bfd_get_section_by_name (dynobj, ".plt");
-      if (splt && splt->_raw_size > 0)
+      if (htab->splt && htab->splt->_raw_size > 0)
 	{
 	  /* fill in blueprint for plt 0 entry */
-	  bfd_put_32 (output_bfd, PLT_FIRST_ENTRY_WORD0,
-		      splt->contents );
-	  bfd_put_32 (output_bfd, PLT_FIRST_ENTRY_WORD1,
-		      splt->contents +4 );
-	  bfd_put_32 (output_bfd, PLT_FIRST_ENTRY_WORD3,
-		      splt->contents +12 );
-	  bfd_put_32 (output_bfd, PLT_FIRST_ENTRY_WORD4,
-		      splt->contents +16 );
-	  bfd_put_32 (output_bfd, PLT_FIRST_ENTRY_WORD5,
-		      splt->contents +20 );
-	  bfd_put_32 (output_bfd, PLT_FIRST_ENTRY_WORD6,
-		      splt->contents + 24);
-	  bfd_put_32 (output_bfd, PLT_FIRST_ENTRY_WORD7,
-		      splt->contents + 28 );
+	  bfd_put_32 (output_bfd, (bfd_vma) PLT_FIRST_ENTRY_WORD0,
+		      htab->splt->contents );
+	  bfd_put_32 (output_bfd, (bfd_vma) PLT_FIRST_ENTRY_WORD1,
+		      htab->splt->contents +4 );
+	  bfd_put_32 (output_bfd, (bfd_vma) PLT_FIRST_ENTRY_WORD3,
+		      htab->splt->contents +12 );
+	  bfd_put_32 (output_bfd, (bfd_vma) PLT_FIRST_ENTRY_WORD4,
+		      htab->splt->contents +16 );
+	  bfd_put_32 (output_bfd, (bfd_vma) PLT_FIRST_ENTRY_WORD5,
+		      htab->splt->contents +20 );
+	  bfd_put_32 (output_bfd, (bfd_vma) PLT_FIRST_ENTRY_WORD6,
+		      htab->splt->contents + 24);
+	  bfd_put_32 (output_bfd, (bfd_vma) PLT_FIRST_ENTRY_WORD7,
+		      htab->splt->contents + 28 );
 	  /* Fixup relative address to start of GOT */
 	  bfd_put_32 (output_bfd,
-		      (sgot->output_section->vma + sgot->output_offset
-		       - splt->output_section->vma - 6)/2,
-		      splt->contents + 8);
+		      (htab->sgotplt->output_section->vma +
+		       htab->sgotplt->output_offset
+		       - htab->splt->output_section->vma - 6)/2,
+		      htab->splt->contents + 8);
 	}
-
-      elf_section_data (splt->output_section)->this_hdr.sh_entsize =
-	PLT_ENTRY_SIZE;
+      elf_section_data (htab->splt->output_section)
+	->this_hdr.sh_entsize = PLT_ENTRY_SIZE;
     }
 
-  /* Set the first entry in the global offset table to the address of
-     the dynamic section.  */
-  if (sgot->_raw_size > 0)
+  if (htab->sgotplt)
     {
-      if (sdyn == NULL)
-	bfd_put_64 (output_bfd, (bfd_vma) 0, sgot->contents);
-      else
-	bfd_put_64 (output_bfd,
-		    sdyn->output_section->vma + sdyn->output_offset,
-		    sgot->contents);
-
-      /* One entry for shared object struct ptr.  */
-      bfd_put_64 (output_bfd, (bfd_vma) 0, sgot->contents + 8);
-      /* One entry for _dl_runtime_resolve.  */
-      bfd_put_64 (output_bfd, (bfd_vma) 0, sgot->contents + 12);
-    }
-
-  elf_section_data (sgot->output_section)->this_hdr.sh_entsize = 8;
+      /* Fill in the first three entries in the global offset table.  */
+      if (htab->sgotplt->_raw_size > 0)
+	{
+	  bfd_put_64 (output_bfd,
+		      (sdyn == NULL ? (bfd_vma) 0
+		       : sdyn->output_section->vma + sdyn->output_offset),
+		      htab->sgotplt->contents);
+	  /* One entry for shared object struct ptr.  */
+	  bfd_put_64 (output_bfd, (bfd_vma) 0, htab->sgotplt->contents + 8);
+	  /* One entry for _dl_runtime_resolve.  */
+	  bfd_put_64 (output_bfd, (bfd_vma) 0, htab->sgotplt->contents + 12);
+	}
 
+      elf_section_data (htab->sgot->output_section)
+	->this_hdr.sh_entsize = 8;
+    }
   return true;
 }
 
@@ -2088,24 +2355,6 @@ elf_s390_object_p (abfd)
   return bfd_default_set_arch_mach (abfd, bfd_arch_s390, bfd_mach_s390_esame);
 }
 
-
-static enum elf_reloc_type_class
-elf_s390_reloc_type_class (rela)
-     const Elf_Internal_Rela *rela;
-{
-  switch ((int) ELF64_R_TYPE (rela->r_info))
-    {
-    case R_390_RELATIVE:
-      return reloc_class_relative;
-    case R_390_JMP_SLOT:
-      return reloc_class_plt;
-    case R_390_COPY:
-      return reloc_class_copy;
-    default:
-      return reloc_class_normal;
-    }
-}
-
 /*
  * Why was the hash table entry size definition changed from
  * ARCH_SIZE/8 to 4? This breaks the 64 bit dynamic linker and
@@ -2160,18 +2409,19 @@ const struct elf_size_info s390_elf64_size_info =
 
 #define elf_info_to_howto		elf_s390_info_to_howto
 
-#define bfd_elf64_bfd_final_link	      _bfd_elf64_gc_common_final_link
 #define bfd_elf64_bfd_is_local_label_name     elf_s390_is_local_label_name
 #define bfd_elf64_bfd_link_hash_table_create  elf_s390_link_hash_table_create
 #define bfd_elf64_bfd_reloc_type_lookup	      elf_s390_reloc_type_lookup
 
 #define elf_backend_adjust_dynamic_symbol     elf_s390_adjust_dynamic_symbol
 #define elf_backend_check_relocs	      elf_s390_check_relocs
-#define elf_backend_create_dynamic_sections   _bfd_elf_create_dynamic_sections
+#define elf_backend_copy_indirect_symbol      elf_s390_copy_indirect_symbol
+#define elf_backend_create_dynamic_sections   elf_s390_create_dynamic_sections
 #define elf_backend_finish_dynamic_sections   elf_s390_finish_dynamic_sections
 #define elf_backend_finish_dynamic_symbol     elf_s390_finish_dynamic_symbol
 #define elf_backend_gc_mark_hook	      elf_s390_gc_mark_hook
 #define elf_backend_gc_sweep_hook	      elf_s390_gc_sweep_hook
+#define elf_backend_reloc_type_class	      elf_s390_reloc_type_class
 #define elf_backend_relocate_section	      elf_s390_relocate_section
 #define elf_backend_size_dynamic_sections     elf_s390_size_dynamic_sections
 #define elf_backend_reloc_type_class	      elf_s390_reloc_type_class