diff options
| author | Andreas Jaeger <aj@suse.de> | 2000-04-21 16:37:58 +0000 |
|---|---|---|
| committer | Andreas Jaeger <aj@suse.de> | 2000-04-21 16:37:58 +0000 |
| commit | 5ac4c397b78c700aac743ff67e7a987d734e63bd (patch) | |
| tree | ae5e9e6ee77aa60516c391d85b744af23305b03f /sysdeps/mips/dl-machine.h | |
| parent | ec92d937468b45df5efa4b00502e0c140119db0c (diff) | |
2000-04-21 Andreas Jaeger <aj@suse.de>
* sysdeps/mips/elf/start.S: Use __PIC__ instead of PIC.
* sysdeps/mips/mips64/add_n.S: Likewise.
* sysdeps/mips/mips64/bsd-_setjmp.S: Likewise.
* sysdeps/mips/mips64/lshift.S: Likewise.
* sysdeps/mips/mips64/mul_1.S: Likewise.
* sysdeps/mips/mips64/rshift.S: Likewise.
* sysdeps/mips/mips64/setjmp.S: Likewise.
* sysdeps/mips/mips64/sub_n.S: Likewise.
* sysdeps/mips/mips64/submul_1.S: Likewise.
* sysdeps/mips/dl-machine.h (elf_machine_got_rel): Remove strtab
and update comment. The strtab from _dl_relocate_object can be
used.
Diffstat (limited to 'sysdeps/mips/dl-machine.h')
| -rw-r--r-- | sysdeps/mips/dl-machine.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/sysdeps/mips/dl-machine.h b/sysdeps/mips/dl-machine.h index de5df0831b..a67eface5b 100644 --- a/sysdeps/mips/dl-machine.h +++ b/sysdeps/mips/dl-machine.h @@ -218,7 +218,7 @@ int _dl_mips_gnu_objects = 1; \ /* This is called from assembly stubs below which the compiler can't see. */ \ static ElfW(Addr) \ __dl_runtime_resolve (ElfW(Word), ElfW(Word), ElfW(Addr), ElfW(Addr)) \ - __attribute__ ((unused)); \ + __attribute__ ((unused)); \ \ static ElfW(Addr) \ __dl_runtime_resolve (ElfW(Word) sym_index, \ @@ -274,7 +274,7 @@ __dl_runtime_resolve (ElfW(Word) sym_index, \ /* We already found the symbol. The module (and therefore its load \ address) is also known. */ \ value = l->l_addr + sym->st_value; \ - \ + \ /* Apply the relocation with that value. */ \ *(got + local_gotno + sym_index - gotsym) = value; \ \ @@ -297,7 +297,7 @@ _dl_runtime_resolve:\n \ .cpload $25\n \ .set reorder\n \ # Save slot call pc.\n \ - move $2, $31\n \ + move $2, $31\n \ # Save arguments and sp value in stack.\n \ subu $29, 40\n \ .cprestore 32\n \ @@ -468,11 +468,9 @@ elf_machine_got_rel (struct link_map *map, int lazy) ElfW(Addr) *got; ElfW(Sym) *sym; int i, n, symidx; -#ifndef RTLD_BOOTSTRAP - const char *strtab = (const void *) D_PTR (map, l_info[DT_STRTAB]); -#endif /* This function is loaded in dl-reloc as a nested function and can - therefore access the variable scope from _dl_relocate_object. */ + therefore access the variables scope and strtab from + _dl_relocate_object. */ #ifdef RTLD_BOOTSTRAP # define RESOLVE_GOTSYM(sym,sym_index) 0 #else |