Update.

2001-08-24  Jakub Jelinek  <jakub@redhat.com>

	* elf/do-rel.h (elf_machine_rel_relative): Define for rela if
	necessary.  Undefine newly defined macros at the end.
	* sysdeps/hppa/dl-machine.h (elf_machine_rela_relative):
	Rename from elf_machine_rel_relative.
	* sysdeps/cris/dl-machine.h (elf_machine_rela_relative): Likewise.
	* sysdeps/m68k/dl-machine.h (elf_machine_rela_relative): Likewise.
	* sysdeps/powerpc/dl-machine.h (elf_machine_rela_relative): Likewise.
	* sysdeps/ia64/dl-machine.h (elf_machine_rela_relative): Likewise.
	Fix argument types.
	* sysdeps/alpha/dl-machine.h (elf_machine_rela_relative): Likewise.
	Fix argument types.
	* sysdeps/sparc/sparc32/dl-machine.h (elf_machine_rela_relative):
	Likewise.  Fix argument types.
	* sysdeps/sparc/sparc64/dl-machine.h (elf_machine_rela_relative):
	Likewise.  Fix argument types.
	* sysdeps/sh/dl-machine.h (elf_machine_rela_relative): Likewise.
	Fix argument types.
	* sysdeps/mips/dl-machine.h (elf_machine_rel_relative): Use
	ElfW(Rel) in argument.
	* sysdeps/mips/mips64/dl-machine.h (elf_machine_rel_relative): New
	function.

diff --git a/ChangeLog b/ChangeLog
index 2e97618a630f64b62045ee9708b4628426cd8600..d1390e4aa102f26c95b06767820ca9d8885e8fe3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,27 @@
+2001-08-24  Jakub Jelinek  <jakub@redhat.com>
+
+       * elf/do-rel.h (elf_machine_rel_relative): Define for rela if
+       necessary.  Undefine newly defined macros at the end.
+       * sysdeps/hppa/dl-machine.h (elf_machine_rela_relative):
+       Rename from elf_machine_rel_relative.
+       * sysdeps/cris/dl-machine.h (elf_machine_rela_relative): Likewise.
+       * sysdeps/m68k/dl-machine.h (elf_machine_rela_relative): Likewise.
+       * sysdeps/powerpc/dl-machine.h (elf_machine_rela_relative): Likewise.
+       * sysdeps/ia64/dl-machine.h (elf_machine_rela_relative): Likewise.
+       Fix argument types.
+       * sysdeps/alpha/dl-machine.h (elf_machine_rela_relative): Likewise.
+       Fix argument types.
+       * sysdeps/sparc/sparc32/dl-machine.h (elf_machine_rela_relative):
+       Likewise.  Fix argument types.
+       * sysdeps/sparc/sparc64/dl-machine.h (elf_machine_rela_relative):
+       Likewise.  Fix argument types.
+       * sysdeps/sh/dl-machine.h (elf_machine_rela_relative): Likewise.
+       Fix argument types.
+       * sysdeps/mips/dl-machine.h (elf_machine_rel_relative): Use
+       ElfW(Rel) in argument.
+       * sysdeps/mips/mips64/dl-machine.h (elf_machine_rel_relative): New
+       function.
+
 2001-08-24  Alexandre Oliva  <aoliva@redhat.com>
 
        * sysdeps/sh/dl-machine.h (elf_machine_rela): Fix typo.

diff --git a/elf/do-rel.h b/elf/do-rel.h
index f7c2a5b2d4d22f59fe074ba9305d6c2f33f4f533..fa84522d460181a0bca0b5139eecd43f7754dfd4 100644 (file)
--- a/elf/do-rel.h
+++ b/elf/do-rel.h
@@ -21,12 +21,13 @@
    `elf_dynamic_do_rel' and `elf_dynamic_do_rela'.  */
 
 #ifdef DO_RELA
-# define elf_dynamic_do_rel    elf_dynamic_do_rela
-# define RELCOUNT_IDX          VERSYMIDX (DT_RELACOUNT)
-# define Rel                   Rela
-# define elf_machine_rel       elf_machine_rela
+# define elf_dynamic_do_rel            elf_dynamic_do_rela
+# define RELCOUNT_IDX                  VERSYMIDX (DT_RELACOUNT)
+# define Rel                           Rela
+# define elf_machine_rel               elf_machine_rela
+# define elf_machine_rel_relative      elf_machine_rela_relative
 #else
-# define RELCOUNT_IDX          VERSYMIDX (DT_RELCOUNT)
+# define RELCOUNT_IDX                  VERSYMIDX (DT_RELCOUNT)
 #endif
 
 #ifndef VERSYMIDX
@@ -98,3 +99,5 @@ elf_dynamic_do_rel (struct link_map *map,
 #undef elf_dynamic_do_rel
 #undef Rel
 #undef elf_machine_rel
+#undef elf_machine_rel_relative
+#undef RELCOUNT_IDX

diff --git a/sysdeps/alpha/dl-machine.h b/sysdeps/alpha/dl-machine.h
index e16f046cb79be1d2247140c280664abb4149a0f7..37e8136be8810b582ee194bb0aa5277509ed7a40 100644 (file)
--- a/sysdeps/alpha/dl-machine.h
+++ b/sysdeps/alpha/dl-machine.h
@@ -548,8 +548,8 @@ elf_machine_rela (struct link_map *map,
 }
 
 static inline void
-elf_machine_rel_relative (Elf64_Addr l_addr, const Elf64_Rel *reloc,
-                         Elf64_Addr *const reloc_addr)
+elf_machine_rela_relative (Elf64_Addr l_addr, const Elf64_Rela *reloc,
+                          Elf64_Addr *const reloc_addr)
 {
   /* XXX Make some timings.  Maybe it's preverable to test for
      unaligned access and only do it the complex way if necessary.  */

diff --git a/sysdeps/cris/dl-machine.h b/sysdeps/cris/dl-machine.h
index 0813f70ec62b46473e3b24369f35b9ca94c01644..ce8dfc6d4e523deab91a9ed218f62b2e4a28e029 100644 (file)
--- a/sysdeps/cris/dl-machine.h
+++ b/sysdeps/cris/dl-machine.h
@@ -366,8 +366,8 @@ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc,
 }
 
 static inline void
-elf_machine_rel_relative (Elf32_Addr l_addr, const Elf32_Rela *reloc,
-                         Elf32_Addr *const reloc_addr)
+elf_machine_rela_relative (Elf32_Addr l_addr, const Elf32_Rela *reloc,
+                          Elf32_Addr *const reloc_addr)
 {
   *reloc_addr = l_addr + reloc->r_addend;
 }

diff --git a/sysdeps/hppa/dl-machine.h b/sysdeps/hppa/dl-machine.h
index bc37986082b6955270853d49b85fd5cb6680d8c9..15e1c85b392499a4a6693b948f21a607259c45c0 100644 (file)
--- a/sysdeps/hppa/dl-machine.h
+++ b/sysdeps/hppa/dl-machine.h
@@ -629,8 +629,8 @@ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc,
 }
 
 static inline void
-elf_machine_rel_relative (Elf32_Addr l_addr, const Elf32_Rela *reloc,
-                         Elf32_Addr *const reloc_addr)
+elf_machine_rela_relative (Elf32_Addr l_addr, const Elf32_Rela *reloc,
+                          Elf32_Addr *const reloc_addr)
 {
   /* XXX Nothing to do.  There is no relative relocation, right?  */
 }

diff --git a/sysdeps/ia64/dl-machine.h b/sysdeps/ia64/dl-machine.h
index 8123515a085cf255aaf7cc59dc555edaa0b466a5..99c022d148d57f2cbfd893f3e5d797a793cf2e03 100644 (file)
--- a/sysdeps/ia64/dl-machine.h
+++ b/sysdeps/ia64/dl-machine.h
@@ -580,8 +580,8 @@ elf_machine_rela (struct link_map *map,
 }
 
 static inline void
-elf_machine_rel_relative (Elf64_Addr l_addr, const Elf64_Rel *reloc,
-                         Elf64_Addr *const reloc_addr)
+elf_machine_rela_relative (Elf64_Addr l_addr, const Elf64_Rela *reloc,
+                          Elf64_Addr *const reloc_addr)
 {
   /* ??? Ignore MSB and Instruction format for now.  */
   assert (ELF64_R_TYPE (reloc->r_info) == R_IA64_REL64LSB);

diff --git a/sysdeps/m68k/dl-machine.h b/sysdeps/m68k/dl-machine.h
index e3a5a2458668a9d35597920eb58903a6772731d2..b0e29274ccffb597bf68636778e6794ad7c081f5 100644 (file)
--- a/sysdeps/m68k/dl-machine.h
+++ b/sysdeps/m68k/dl-machine.h
@@ -299,8 +299,8 @@ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc,
 }
 
 static inline void
-elf_machine_rel_relative (Elf32_Addr l_addr, const Elf32_Rela *reloc,
-                         Elf32_Addr *const reloc_addr)
+elf_machine_rela_relative (Elf32_Addr l_addr, const Elf32_Rela *reloc,
+                          Elf32_Addr *const reloc_addr)
 {
   *reloc_addr = l_addr + reloc->r_addend;
 }

diff --git a/sysdeps/mips/dl-machine.h b/sysdeps/mips/dl-machine.h
index 340cd1750a923b4ec8449549528b76b6fe0ce4a4..878e27d317dc93d34a0aadf309064e4819dbc27a 100644 (file)
--- a/sysdeps/mips/dl-machine.h
+++ b/sysdeps/mips/dl-machine.h
@@ -536,8 +536,8 @@ elf_machine_rel (struct link_map *map, const ElfW(Rel) *reloc,
 }
 
 static inline void
-elf_machine_rel_relative (Elf32_Addr l_addr, const Elf32_Rela *reloc,
-                         Elf32_Addr *const reloc_addr)
+elf_machine_rel_relative (ElfW(Addr) l_addr, const ElfW(Rel) *reloc,
+                         ElfW(Addr) *const reloc_addr)
 {
   /* XXX Nothing to do.  There is no relative relocation, right?  */
 }

diff --git a/sysdeps/mips/mips64/dl-machine.h b/sysdeps/mips/mips64/dl-machine.h
index 3ecb3c2afcf60ba930f8197691a00a85cebc500a..eda94c2203cf19db40c8e65c7bdd943ba7227a45 100644 (file)
--- a/sysdeps/mips/mips64/dl-machine.h
+++ b/sysdeps/mips/mips64/dl-machine.h
@@ -1,5 +1,5 @@
-/* Machine-dependent ELF dynamic relocation inline functions.  MIPS version.
-   Copyright (C) 1996, 1997, 1999, 2000 Free Software Foundation, Inc.
+/* Machine-dependent ELF dynamic relocation inline functions.  MIPS64 version.
+   Copyright (C) 1996, 1997, 1999, 2000, 2001 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Kazumoto Kojima <kkojima@info.kanagawa-u.ac.jp>.
 
@@ -530,10 +530,11 @@ elf_machine_rel (struct link_map *map, const ElfW(Rel) *reloc,
                 const ElfW(Sym) *sym, const struct r_found_version *version,
                 ElfW(Addr) *const reloc_addr)
 {
+  const unsigned long int r_type = ELFW(R_TYPE) (reloc->r_info);
   ElfW(Addr) loadbase;
   ElfW(Addr) undo __attribute__ ((unused));
 
-  switch (ELFW(R_TYPE) (reloc->r_info))
+  switch (r_type)
     {
     case R_MIPS_REL32:
       {
@@ -565,14 +566,23 @@ elf_machine_rel (struct link_map *map, const ElfW(Rel) *reloc,
          *reloc_addr += (sym ? (loadbase + sym->st_value) : 0) - undo;
        }
       break;
+#ifndef RTLD_BOOTSTRAP
     case R_MIPS_NONE:          /* Alright, Wilbur.  */
       break;
+#endif
     default:
-      _dl_reloc_bad_type (map, ELFW(R_TYPE) (reloc->r_info), 0);
+      _dl_reloc_bad_type (map, r_type, 0);
       break;
     }
 }
 
+static inline void
+elf_machine_rel_relative (ElfW(Addr) l_addr, const ElfW(Rel) *reloc,
+                         ElfW(Addr) *const reloc_addr)
+{
+  /* XXX Nothing to do.  There is no relative relocation, right?  */
+}
+
 static inline void
 elf_machine_lazy_rel (struct link_map *map, ElfW(Addr) l_addr,
                      const ElfW(Rel) *reloc)

diff --git a/sysdeps/powerpc/dl-machine.h b/sysdeps/powerpc/dl-machine.h
index f528dcb9d4f47fc1f8d725a2e74fd5eed260fe8f..438629a0a84414a23bedba798a5ed0f51ffc6ce4 100644 (file)
--- a/sysdeps/powerpc/dl-machine.h
+++ b/sysdeps/powerpc/dl-machine.h
@@ -394,8 +394,8 @@ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc,
 }
 
 static inline void
-elf_machine_rel_relative (Elf32_Addr l_addr, const Elf32_Rela *reloc,
-                         Elf32_Addr *const reloc_addr)
+elf_machine_rela_relative (Elf32_Addr l_addr, const Elf32_Rela *reloc,
+                          Elf32_Addr *const reloc_addr)
 {
   *reloc_addr = l_addr + reloc->r_addend;
 }

diff --git a/sysdeps/sh/dl-machine.h b/sysdeps/sh/dl-machine.h
index 62f40d516a36e43a17b100b343a1c621cdd9740a..6f3b31c43709aeac45063e88f4201c2fd484ac64 100644 (file)
--- a/sysdeps/sh/dl-machine.h
+++ b/sysdeps/sh/dl-machine.h
@@ -558,8 +558,8 @@ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc,
 }
 
 static inline void
-elf_machine_rel_relative (Elf32_Addr l_addr, const Elf32_Rel *reloc,
-                         Elf32_Addr *const reloc_addr)
+elf_machine_rela_relative (Elf32_Addr l_addr, const Elf32_Rela *reloc,
+                          Elf32_Addr *const reloc_addr)
 {
   if (reloc->r_addend)
     value = l_addr + reloc->r_addend;

diff --git a/sysdeps/sparc/sparc32/dl-machine.h b/sysdeps/sparc/sparc32/dl-machine.h
index edeb20b93172350987bd4b29b25e73fca6203f76..2ed14fc5f9afaf07a6bb5b8a536edbdd50ddfcc4 100644 (file)
--- a/sysdeps/sparc/sparc32/dl-machine.h
+++ b/sysdeps/sparc/sparc32/dl-machine.h
@@ -459,8 +459,8 @@ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc,
 }
 
 static inline void
-elf_machine_rel_relative (Elf32_Addr l_addr, const Elf32_Rel *reloc,
-                         Elf32_Addr *const reloc_addr)
+elf_machine_rela_relative (Elf32_Addr l_addr, const Elf32_Rela *reloc,
+                          Elf32_Addr *const reloc_addr)
 {
   *reloc_addr += l_addr + reloc->r_addend;
 }

diff --git a/sysdeps/sparc/sparc64/dl-machine.h b/sysdeps/sparc/sparc64/dl-machine.h
index 1e5e25b827795a8fc51fdf9508b94fbc9eb5eb58..a72cb89e01461d3b08c620b7e819c721a71cc970 100644 (file)
--- a/sysdeps/sparc/sparc64/dl-machine.h
+++ b/sysdeps/sparc/sparc64/dl-machine.h
@@ -368,8 +368,8 @@ elf_machine_rela (struct link_map *map, const Elf64_Rela *reloc,
 }
 
 static inline void
-elf_machine_rel_relative (Elf64_Addr l_addr, const Elf64_Rel *reloc,
-                         Elf64_Addr *const reloc_addr)
+elf_machine_rela_relative (Elf64_Addr l_addr, const Elf64_Rela *reloc,
+                          Elf64_Addr *const reloc_addr)
 {
   *reloc_addr = l_addr + reloc->r_addend;
 }