diff --git a/sysdeps/s390/s390-32/dl-machine.h b/sysdeps/s390/s390-32/dl-machine.h
index 15ff999289..d7dc53fd01 100644
--- a/sysdeps/s390/s390-32/dl-machine.h
+++ b/sysdeps/s390/s390-32/dl-machine.h
@@ -50,39 +50,22 @@ elf_machine_matches_host (const Elf32_Ehdr *ehdr)
 }
 
 
-/* Return the link-time address of _DYNAMIC.  Conveniently, this is the
-   first element of the GOT.  This must be inlined in a function which
-   uses global data.  */
-
-static inline Elf32_Addr
-elf_machine_dynamic (void)
-{
-  register Elf32_Addr *got;
-
-  __asm__( "        bras   %0,2f\n"
-	   "1:      .long  _GLOBAL_OFFSET_TABLE_-1b\n"
-	   "2:      al     %0,0(%0)"
-	   : "=&a" (got) : : "0" );
-
-  return *got;
-}
-
-
 /* Return the run-time load address of the shared object.  */
 static inline Elf32_Addr
 elf_machine_load_address (void)
 {
-  Elf32_Addr addr;
+  /* Starting from binutils-2.23, the linker will define the magic symbol
+     __ehdr_start to point to our own ELF header.  */
+  extern const ElfW(Ehdr) __ehdr_start attribute_hidden;
+  return (ElfW(Addr)) &__ehdr_start;
+}
 
-  __asm__( "   bras  1,2f\n"
-	   "1: .long _GLOBAL_OFFSET_TABLE_ - 1b\n"
-	   "   .long (_dl_start - 1b - 0x80000000) & 0x00000000ffffffff\n"
-	   "2: l     %0,4(1)\n"
-	   "   ar    %0,1\n"
-	   "   al    1,0(1)\n"
-	   "   sl    %0,_dl_start@GOT(1)"
-	   : "=&d" (addr) : : "1" );
-  return addr;
+/* Return the link-time address of _DYNAMIC.  */
+static inline Elf32_Addr
+elf_machine_dynamic (void)
+{
+  extern ElfW(Dyn) _DYNAMIC[] attribute_hidden;
+  return (ElfW(Addr)) _DYNAMIC - elf_machine_load_address ();
 }
 
 /* Set up the loaded object described by L so its unrelocated PLT
diff --git a/sysdeps/s390/s390-64/dl-machine.h b/sysdeps/s390/s390-64/dl-machine.h
index 5ed0b844e0..976b2e07a1 100644
--- a/sysdeps/s390/s390-64/dl-machine.h
+++ b/sysdeps/s390/s390-64/dl-machine.h
@@ -44,33 +44,22 @@ elf_machine_matches_host (const Elf64_Ehdr *ehdr)
 	 && ehdr->e_ident[EI_CLASS] == ELFCLASS64;
 }
 
-/* Return the link-time address of _DYNAMIC.  Conveniently, this is the
-   first element of the GOT.  This must be inlined in a function which
-   uses global data.  */
-
-static inline Elf64_Addr
-elf_machine_dynamic (void)
-{
-  register Elf64_Addr *got;
-
-  __asm__ ( "	larl   %0,_GLOBAL_OFFSET_TABLE_\n"
-	    : "=&a" (got) : : "0" );
-
-  return *got;
-}
-
 /* Return the run-time load address of the shared object.  */
 static inline Elf64_Addr
 elf_machine_load_address (void)
 {
-  Elf64_Addr addr;
+  /* Starting from binutils-2.23, the linker will define the magic symbol
+     __ehdr_start to point to our own ELF header.  */
+  extern const ElfW(Ehdr) __ehdr_start attribute_hidden;
+  return (ElfW(Addr)) &__ehdr_start;
+}
 
-  __asm__( "   larl	 %0,_dl_start\n"
-	   "   larl	 1,_GLOBAL_OFFSET_TABLE_\n"
-	   "   lghi	 2,_dl_start@GOT\n"
-	   "   slg	 %0,0(2,1)"
-	   : "=&d" (addr) : : "1", "2" );
-  return addr;
+/* Return the link-time address of _DYNAMIC.  */
+static inline Elf64_Addr
+elf_machine_dynamic (void)
+{
+  extern ElfW(Dyn) _DYNAMIC[] attribute_hidden;
+  return (ElfW(Addr)) _DYNAMIC - elf_machine_load_address ();
 }
 
 /* Set up the loaded object described by L so its unrelocated PLT