aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Jaeger <aj@suse.de>2000-04-18 18:32:26 +0000
committerAndreas Jaeger <aj@suse.de>2000-04-18 18:32:26 +0000
commitd1891b39774c49eea57c489318a11fe9a55c3e6c (patch)
tree8017eccaccfe5246306ff536820c8b6b0e1fc02e
parented7abbd0ad30d63134807b1498cd96719b779481 (diff)
downloadglibc-d1891b39774c49eea57c489318a11fe9a55c3e6c.zip
glibc-d1891b39774c49eea57c489318a11fe9a55c3e6c.tar.gz
glibc-d1891b39774c49eea57c489318a11fe9a55c3e6c.tar.bz2
2000-04-18 Andreas Jaeger <aj@suse.de>
* sysdeps/mips/dl-machine.h (elf_machine_rel): Fix relocation. 2000-04-18 Andreas Jaeger <aj@suse.de> * sysdeps/mips/dl-machine.h (elf_machine_rel): Fix relocation.
-rw-r--r--ChangeLog4
-rw-r--r--sysdeps/mips/dl-machine.h39
2 files changed, 15 insertions, 28 deletions
diff --git a/ChangeLog b/ChangeLog
index 4f5d50b..053b2f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2000-04-18 Andreas Jaeger <aj@suse.de>
+
+ * sysdeps/mips/dl-machine.h (elf_machine_rel): Fix relocation.
+
2000-04-18 Ulrich Drepper <drepper@redhat.com>
* sysdeps/unix/sysv/aix/geteuid.c: Don't try to include <sys/id.h>.
diff --git a/sysdeps/mips/dl-machine.h b/sysdeps/mips/dl-machine.h
index a15b78d..de5df08 100644
--- a/sysdeps/mips/dl-machine.h
+++ b/sysdeps/mips/dl-machine.h
@@ -428,40 +428,23 @@ 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)
{
- ElfW(Addr) loadbase;
- ElfW(Addr) undo __attribute__ ((unused));
+#ifndef RTLD_BOOTSTRAP
+ /* This is defined in rtld.c, but nowhere in the static libc.a;
+ make the reference weak so static programs can still link. This
+ declaration cannot be done when compiling rtld.c (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. */
+ weak_extern (_dl_rtld_map);
+#endif
switch (ELFW(R_TYPE) (reloc->r_info))
{
case R_MIPS_REL32:
- {
- ElfW(Addr) undo = 0;
-
- if (ELFW(ST_BIND) (sym->st_info) == STB_LOCAL
- && (ELFW(ST_TYPE) (sym->st_info) == STT_SECTION
- || ELFW(ST_TYPE) (sym->st_info) == STT_NOTYPE))
- {
- *reloc_addr += map->l_addr;
- break;
- }
#ifndef RTLD_BOOTSTRAP
- /* This is defined in rtld.c, but nowhere in the static libc.a;
- make the reference weak so static programs can still link. This
- declaration cannot be done when compiling rtld.c (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. */
- weak_extern (_dl_rtld_map);
- if (map == &_dl_rtld_map)
- /* Undo the relocation done here during bootstrapping. Now we will
- relocate it anew, possibly using a binding found in the user
- program or a loaded library rather than the dynamic linker's
- built-in definitions used while loading those libraries. */
- undo = map->l_addr + sym->st_value;
+ if (map != &_dl_rtld_map)
#endif
- loadbase = RESOLVE (&sym, version, R_MIPS_REL32);
- *reloc_addr += (sym ? (loadbase + sym->st_value) : 0) - undo;
- }
+ *reloc_addr += map->l_addr;
break;
case R_MIPS_NONE: /* Alright, Wilbur. */
break;