[commits] r1596 - in /branches/eglibc-2_5/ports: ChangeLog.eglibc sysdeps/mips/dl-machine.h

[joseph@xxxxxxxxxx]

Author: joseph
Date: Wed Feb 28 10:42:11 2007
New Revision: 1596

Log:
2007-02-28  Richard Sandiford  <rsandifo@xxxxxxxxxxxxx>

	* 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.

Modified:
    branches/eglibc-2_5/ports/ChangeLog.eglibc
    branches/eglibc-2_5/ports/sysdeps/mips/dl-machine.h

Modified: branches/eglibc-2_5/ports/ChangeLog.eglibc
==============================================================================
--- branches/eglibc-2_5/ports/ChangeLog.eglibc (original)
+++ branches/eglibc-2_5/ports/ChangeLog.eglibc Wed Feb 28 10:42:11 2007
@@ -1,3 +1,9 @@
+2007-02-28  Richard Sandiford  <rsandifo@xxxxxxxxxxxxx>
+
+	* 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@xxxxxxxxxxxxxxxx>
 
 	Backport from mainline:

Modified: branches/eglibc-2_5/ports/sysdeps/mips/dl-machine.h
==============================================================================
--- branches/eglibc-2_5/ports/sysdeps/mips/dl-machine.h (original)
+++ branches/eglibc-2_5/ports/sysdeps/mips/dl-machine.h Wed Feb 28 10:42:11 2007
@@ -304,7 +304,7 @@
 
 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 @@
 		 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 @@
 		  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