diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2007-02-28 18:42:11 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2007-02-28 18:42:11 +0000 |
| commit | 1c0c8e170d9b75ef05d39cff8a693c01ed2c50b2 (patch) | |
| tree | 2e386f0e4ec32d08761059f901a53c9e639b5342 | |
| parent | 2d9d0041bd59496631f727a49a885828f372d07d (diff) | |
| download | eglibc2-1c0c8e170d9b75ef05d39cff8a693c01ed2c50b2.tar.gz | |
2007-02-28 Richard Sandiford <rsandifo@nildram.co.uk>
* sysdeps/mips/dl-machine.h (elf_machine_reloc): Change type of
r_info argument to ElfW(Addr).
(elf_machine_rel, elf_machine_rela): Update calls accordingly.
git-svn-id: svn://svn.eglibc.org/branches/eglibc-2_5@1596 7b3dc134-2b1b-0410-93df-9e9f96275f8d
| -rw-r--r-- | ports/ChangeLog.eglibc | 6 | ||||
| -rw-r--r-- | ports/sysdeps/mips/dl-machine.h | 9 |
2 files changed, 11 insertions, 4 deletions
diff --git a/ports/ChangeLog.eglibc b/ports/ChangeLog.eglibc index 67b6cd8a0..25977841b 100644 --- a/ports/ChangeLog.eglibc +++ b/ports/ChangeLog.eglibc @@ -1,3 +1,9 @@ +2007-02-28 Richard Sandiford <rsandifo@nildram.co.uk> + + * sysdeps/mips/dl-machine.h (elf_machine_reloc): Change type of + r_info argument to ElfW(Addr). + (elf_machine_rel, elf_machine_rela): Update calls accordingly. + 2007-02-22 Richard Sandiford <richard@codesourcery.com> Backport from mainline: diff --git a/ports/sysdeps/mips/dl-machine.h b/ports/sysdeps/mips/dl-machine.h index 066e8ee75..ff5e24a9b 100644 --- a/ports/sysdeps/mips/dl-machine.h +++ b/ports/sysdeps/mips/dl-machine.h @@ -304,7 +304,7 @@ do { \ auto inline void __attribute__ ((always_inline)) -elf_machine_reloc (struct link_map *map, ElfW(Word) r_info, +elf_machine_reloc (struct link_map *map, ElfW(Addr) r_info, const ElfW(Sym) *sym, const struct r_found_version *version, void *reloc_addr, ElfW(Addr) r_addend, int inplace_p) { @@ -490,7 +490,8 @@ elf_machine_rel (struct link_map *map, const ElfW(Rel) *reloc, const ElfW(Sym) *sym, const struct r_found_version *version, void *const reloc_addr) { - elf_machine_reloc (map, reloc->r_info, sym, version, reloc_addr, 0, 1); + elf_machine_reloc (map, (ElfW(Addr)) reloc->r_info, + sym, version, reloc_addr, 0, 1); } auto inline void @@ -515,8 +516,8 @@ elf_machine_rela (struct link_map *map, const ElfW(Rela) *reloc, const ElfW(Sym) *sym, const struct r_found_version *version, void *const reloc_addr) { - elf_machine_reloc (map, reloc->r_info, sym, version, reloc_addr, - reloc->r_addend, 0); + elf_machine_reloc (map, (ElfW(Addr)) reloc->r_info, sym, version, + reloc_addr, reloc->r_addend, 0); } auto inline void |