1 files changed, 5 insertions, 22 deletions

diff --git a/newlib/libc/sys/linux/machine/i386/dl-machine.h b/newlib/libc/sys/linux/machine/i386/dl-machine.h
index 80757e89a..032713e5b 100644
--- a/newlib/libc/sys/linux/machine/i386/dl-machine.h
+++ b/newlib/libc/sys/linux/machine/i386/dl-machine.h
@@ -292,20 +292,6 @@ elf_machine_plt_value (struct link_map *map, const Elf32_Rel *reloc,
   return value;
 }
 
-static inline void __attribute__ ((unused))
-elf_machine_rel (struct link_map *map, const Elf32_Rel *reloc,
-		 const Elf32_Sym *sym, const struct r_found_version *version,
-		 Elf32_Addr *const reloc_addr,
-		 struct r_scope_elem *scope[]);
-
-static inline void __attribute__ ((unused))
-elf_machine_rel_relative (Elf32_Addr l_addr, const Elf32_Rel *reloc,
-			  Elf32_Addr *const reloc_addr);
-
-static inline void
-elf_machine_lazy_rel (struct link_map *map,
-		      Elf32_Addr l_addr, const Elf32_Rel *reloc);
-
 #endif /* !dl_machine_h */
 
 #ifdef RESOLVE
@@ -313,11 +299,10 @@ elf_machine_lazy_rel (struct link_map *map,
 /* Perform the relocation specified by RELOC and SYM (which is fully resolved).
    MAP is the object containing the reloc.  */
 
-static inline void __attribute__ ((unused))
+static inline void
 elf_machine_rel (struct link_map *map, const Elf32_Rel *reloc,
 		 const Elf32_Sym *sym, const struct r_found_version *version,
-		 Elf32_Addr *const reloc_addr,
-		 struct r_scope_elem *scope[])
+		 Elf32_Addr *const reloc_addr)
 {
   const unsigned int r_type = ELF32_R_TYPE (reloc->r_info);
 
@@ -331,7 +316,7 @@ elf_machine_rel (struct link_map *map, const Elf32_Rel *reloc,
 	 (i.e. #ifdef RTLD_BOOTSTRAP) because rtld.c contains the
 	 common defn for _dl_rtld_map, which is incompatible with a
 	 weak decl in the same file.  */
-      #pragma weak _dl_rtld_map
+      weak_extern (_dl_rtld_map);
       if (map != &_dl_rtld_map) /* Already done in rtld itself.  */
 # endif
 	*reloc_addr += map->l_addr;
@@ -346,9 +331,7 @@ elf_machine_rel (struct link_map *map, const Elf32_Rel *reloc,
 #ifndef RTLD_BOOTSTRAP
       const Elf32_Sym *const refsym = sym;
 #endif
-      /* String table object symbols.  */
-      const char *strtab = (const void *) D_PTR (map, l_info[DT_STRTAB]);
-      Elf32_Addr value = RESOLVE (&sym, version, r_type, scope);
+      Elf32_Addr value = RESOLVE (&sym, version, r_type);
       if (sym)
 	value += sym->st_value;
 
@@ -396,7 +379,7 @@ elf_machine_rel (struct link_map *map, const Elf32_Rel *reloc,
     }
 }
 
-static inline void __attribute__ ((unused))
+static inline void
 elf_machine_rel_relative (Elf32_Addr l_addr, const Elf32_Rel *reloc,
 			  Elf32_Addr *const reloc_addr)
 {