aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Jaeger <aj@suse.de>2000-11-02 09:32:30 +0000
committerAndreas Jaeger <aj@suse.de>2000-11-02 09:32:30 +0000
commita8e4ee5ab1f473dac5966a83bafb7f4b10575849 (patch)
treeb56c375d28a1a5af9bf6bb1d369cbe7bf4265655
parent8166c749b6d5d23c5cae739a2f191b0d2e73fd27 (diff)
downloadglibc-a8e4ee5ab1f473dac5966a83bafb7f4b10575849.zip
glibc-a8e4ee5ab1f473dac5966a83bafb7f4b10575849.tar.gz
glibc-a8e4ee5ab1f473dac5966a83bafb7f4b10575849.tar.bz2
(elf_machine_rel): Add the symbol's value plus the run-time displacement to the relocation for non-GOT symbols. Set the relocation to the GOT entry for GOT symbols.
-rw-r--r--sysdeps/mips/dl-machine.h39
1 files changed, 35 insertions, 4 deletions
diff --git a/sysdeps/mips/dl-machine.h b/sysdeps/mips/dl-machine.h
index 7c27de0..cd8ee3c 100644
--- a/sysdeps/mips/dl-machine.h
+++ b/sysdeps/mips/dl-machine.h
@@ -158,7 +158,7 @@ do { \
i = (got[1] & ELF_MIPS_GNU_GOT1_MASK)? 2 : 1; \
n = map->l_info[DT_MIPS (LOCAL_GOTNO)]->d_un.d_val; \
\
- /* Add the run-time display to all local got entries. */ \
+ /* Add the run-time displacement to all local got entries. */ \
while (i < n) \
got[i++] += map->l_addr; \
\
@@ -508,10 +508,40 @@ elf_machine_rel (struct link_map *map, const ElfW(Rel) *reloc,
switch (ELFW(R_TYPE) (reloc->r_info))
{
case R_MIPS_REL32:
+ {
+ int symidx = ELFW(R_SYM) (reloc->r_info);
+
+ if (symidx)
+ {
+ const ElfW(Word) gotsym
+ = (const ElfW(Word)) map->l_info[DT_MIPS (GOTSYM)]->d_un.d_val;
+
+ if (symidx < gotsym)
+ {
+#ifndef RTLD_BOOTSTRAP
+ if (map != &_dl_rtld_map)
+#endif
+ *reloc_addr += sym->st_value + map->l_addr;
+ }
+ else
+ {
+#ifndef RTLD_BOOTSTRAP
+ const ElfW(Addr) *got
+ = (const ElfW(Addr) *) D_PTR (map, l_info[DT_PLTGOT]);
+ const ElfW(Word) local_gotno
+ = (const ElfW(Word))
+ map->l_info[DT_MIPS (LOCAL_GOTNO)]->d_un.d_val;
+
+ *reloc_addr += got[symidx + local_gotno - gotsym];
+#endif
+ }
+ }
+ else
#ifndef RTLD_BOOTSTRAP
- if (map != &_dl_rtld_map)
+ if (map != &_dl_rtld_map)
#endif
- *reloc_addr += map->l_addr;
+ *reloc_addr += map->l_addr;
+ }
break;
case R_MIPS_NONE: /* Alright, Wilbur. */
break;
@@ -584,7 +614,8 @@ elf_machine_got_rel (struct link_map *map, int lazy)
generated by gnu ld. Skip these reserved entries from relocation. */
i = (got[1] & ELF_MIPS_GNU_GOT1_MASK)? 2 : 1;
- /* Add the run-time display to all local got entries if needed. */
+ /* Add the run-time displacement to all local got entries if
+ needed. */
if (__builtin_expect (map->l_addr != 0, 0))
{
while (i < n)