CVS commit: src/libexec/ld.elf_so/arch/mips

[Christos Zoulas]

Module Name:    src
Committed By:   christos
Date:           Wed May 20 22:31:46 UTC 2009

Modified Files:
        src/libexec/ld.elf_so/arch/mips: mips_reloc.c

Log Message:
fix signed/unsigned comparisons and const cast away (untested)


To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/libexec/ld.elf_so/arch/mips/mips_reloc.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/libexec/ld.elf_so/arch/mips/mips_reloc.c
diff -u src/libexec/ld.elf_so/arch/mips/mips_reloc.c:1.53 src/libexec/ld.elf_so/arch/mips/mips_reloc.c:1.54
--- src/libexec/ld.elf_so/arch/mips/mips_reloc.c:1.53	Thu Jul 24 00:39:25 2008
+++ src/libexec/ld.elf_so/arch/mips/mips_reloc.c	Wed May 20 18:31:46 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: mips_reloc.c,v 1.53 2008/07/24 04:39:25 matt Exp $	*/
+/*	$NetBSD: mips_reloc.c,v 1.54 2009/05/20 22:31:46 christos Exp $	*/
 
 /*
  * Copyright 1997 Michael L. Hitch <mhi...@montana.edu>
@@ -30,7 +30,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: mips_reloc.c,v 1.53 2008/07/24 04:39:25 matt Exp $");
+__RCSID("$NetBSD: mips_reloc.c,v 1.54 2009/05/20 22:31:46 christos Exp $");
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -94,8 +94,7 @@
 	void *where;
 	const Elf_Sym *symtab = NULL, *sym;
 	Elf_Addr *got = NULL;
-	Elf_Word local_gotno = 0, symtabno = 0, gotsym = 0;
-	int i;
+	Elf_Word local_gotno = 0, symtabno = 0, gotsym = 0, i;
 
 	for (; dynp->d_tag != DT_NULL; dynp++) {
 		switch (dynp->d_tag) {
@@ -136,7 +135,7 @@
 		++got;
 	}
 
-	rellim = (const Elf_Rel *)((caddr_t)rel + relsz);
+	rellim = (const Elf_Rel *)((const char *)rel + relsz);
 	for (; rel < rellim; rel++) {
 		where = (void *)(relocbase + rel->r_offset);
 
@@ -164,7 +163,7 @@
 	Elf_Addr *got = obj->pltgot;
 	const Elf_Sym *sym, *def;
 	const Obj_Entry *defobj;
-	int i;
+	Elf_Word i;
 #ifdef SUPPORT_OLD_BROKEN_LD
 	int broken;
 #endif
@@ -370,7 +369,7 @@
 _rtld_relocate_plt_objects(const Obj_Entry *obj)
 {
 	const Elf_Sym *sym = obj->symtab + obj->gotsym;
-	int i;
+	Elf_Word i;
 
 	for (i = obj->gotsym; i < obj->symtabno; i++, sym++) {
 		if (ELF_ST_TYPE(sym->st_info) == STT_FUNC)