diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2001-08-24 14:58:03 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2001-08-24 14:58:03 +0000 |
| commit | 1f2a1df36b8e103660786a3058ef5a7dce9797fc (patch) | |
| tree | e7aecaf35f19db407864624e2420a15cb051aee5 /sysdeps/mips/mips64/dl-machine.h | |
| parent | a4c4e6db680dd588700a8f1c5a6d75073d4d900b (diff) | |
| download | glibc-1f2a1df36b8e103660786a3058ef5a7dce9797fc.tar glibc-1f2a1df36b8e103660786a3058ef5a7dce9797fc.tar.gz glibc-1f2a1df36b8e103660786a3058ef5a7dce9797fc.tar.bz2 glibc-1f2a1df36b8e103660786a3058ef5a7dce9797fc.zip | |
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.
Diffstat (limited to 'sysdeps/mips/mips64/dl-machine.h')
| -rw-r--r-- | sysdeps/mips/mips64/dl-machine.h | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/sysdeps/mips/mips64/dl-machine.h b/sysdeps/mips/mips64/dl-machine.h index 3ecb3c2afc..eda94c2203 100644 --- 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,15 +566,24 @@ 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) { |