 @@ -1,18 +1,18 @@
-/*	$NetBSD: mdreloc.c,v 1.28 2008/07/24 04:39:25 matt Exp $	*/
+/*	$NetBSD: mdreloc.c,v 1.29 2009/03/16 02:46:47 lukem Exp $	*/
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: mdreloc.c,v 1.28 2008/07/24 04:39:25 matt Exp $");
+__RCSID("$NetBSD: mdreloc.c,v 1.29 2009/03/16 02:46:47 lukem Exp $");
 #endif /* not lint */
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <string.h>
 #include "debug.h"
 #include "rtld.h"
 void _rtld_bind_start(void);
 void _rtld_relocate_nonplt_self(Elf_Dyn *, Elf_Addr);
 caddr_t _rtld_bind(const Obj_Entry *, Elf_Word);
 @@ -31,27 +31,27 @@ _rtld_relocate_nonplt_self(Elf_Dyn *dynp
 	Elf_Addr relsz = 0;
 	Elf_Addr *where;
 	for (; dynp->d_tag != DT_NULL; dynp++) {
 		switch (dynp->d_tag) {
 		case DT_REL:
 			rel = (const Elf_Rel *)(relocbase + dynp->d_un.d_ptr);
 			break;
 		case DT_RELSZ:
 			relsz = dynp->d_un.d_val;
 			break;
+		}
+	}
-	rellim = (const Elf_Rel *)((caddr_t)rel + relsz);
+	rellim = (const Elf_Rel *)((const uint8_t *)rel + relsz);
 	for (; rel < rellim; rel++) {
 		where = (Elf_Addr *)(relocbase + rel->r_offset);
 		*where += (Elf_Addr)relocbase;
+	}
+}
 /*
  * It is possible for the compiler to emit relocations for unaligned data.
  * We handle this situation with these inlines.
  */
 #define	RELOC_ALIGNED_P(x) \
 	(((uintptr_t)(x) & (sizeof(void *) - 1)) == 0)
 @@ -239,27 +239,27 @@ _rtld_relocate_plt_object(const Obj_Entr
 	rdbg(("bind now/fixup in %s --> old=%p new=%p",
 	    defobj->strtab + def->st_name, (void *)*where, (void *)new_value));
 	if (*where != new_value)
 		*where = new_value;
 	if (tp)
 		*tp = new_value;
 	return 0;
+}
 caddr_t
 _rtld_bind(const Obj_Entry *obj, Elf_Word reloff)
+{
-	const Elf_Rel *rel = (const Elf_Rel *)((caddr_t)obj->pltrel + reloff);
+	const Elf_Rel *rel = (const Elf_Rel *)((const uint8_t *)obj->pltrel + reloff);
 	Elf_Addr new_value;
 	int err;
 	err = _rtld_relocate_plt_object(obj, rel, &new_value);
 	if (err || new_value == 0)
 		_rtld_die();
 	return (caddr_t)new_value;
+}
 int
 _rtld_relocate_plt_objects(const Obj_Entry *obj)
+{
 	const Elf_Rel *rel;

 @@ -1,23 +1,23 @@
-/*	$NetBSD: mdreloc.c,v 1.22 2008/07/24 06:51:58 skrll Exp $	*/
+/*	$NetBSD: mdreloc.c,v 1.23 2009/03/16 02:46:47 lukem Exp $	*/
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: mdreloc.c,v 1.22 2008/07/24 06:51:58 skrll Exp $");
+__RCSID("$NetBSD: mdreloc.c,v 1.23 2009/03/16 02:46:47 lukem Exp $");
 #endif /* not lint */
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: mdreloc.c,v 1.22 2008/07/24 06:51:58 skrll Exp $");
+__RCSID("$NetBSD: mdreloc.c,v 1.23 2009/03/16 02:46:47 lukem Exp $");
 #endif /* not lint */
 #include <sys/types.h>
 #include <sys/stat.h>
 #include "debug.h"
 #include "rtld.h"
 void _rtld_bind_start(void);
 void _rtld_relocate_nonplt_self(Elf_Dyn *, Elf_Addr);
 caddr_t _rtld_bind(const Obj_Entry *, Elf_Word);
 static inline int _rtld_relocate_plt_object(const Obj_Entry *,
     const Elf_Rela *, Elf_Addr *);
 @@ -37,27 +37,27 @@ _rtld_relocate_nonplt_self(Elf_Dyn *dynp
 	Elf_Addr relasz = 0;
 	Elf_Addr *where;
 	for (; dynp->d_tag != DT_NULL; dynp++) {
 		switch (dynp->d_tag) {
 		case DT_RELA:
 			rela = (const Elf_Rela *)(relocbase + dynp->d_un.d_ptr);
 			break;
 		case DT_RELASZ:
 			relasz = dynp->d_un.d_val;
 			break;
+		}
+	}
-	relalim = (const Elf_Rela *)((caddr_t)rela + relasz);
+	relalim = (const Elf_Rela *)((const uint8_t *)rela + relasz);
 	for (; rela < relalim; rela++) {
 		where = (Elf_Addr *)(relocbase + rela->r_offset);
 		*where += (Elf_Addr)relocbase;
+	}
+}
 int
 _rtld_relocate_nonplt_objects(const Obj_Entry *obj)
+{
 	const Elf_Rela *rela;
 	for (rela = obj->rela; rela < obj->relalim; rela++) {
 		Elf_Addr        *where;
 @@ -185,27 +185,27 @@ _rtld_relocate_plt_object(const Obj_Entr
 	    defobj->strtab + def->st_name, (void *)*where, (void *)new_value));
 	if (*where != new_value)
 		*where = new_value;
 	if (tp)
 		*tp = new_value - rela->r_addend;
 	return 0;
+}
 caddr_t
 _rtld_bind(const Obj_Entry *obj, Elf_Word reloff)
+{
-	const Elf_Rela *rela = (const Elf_Rela *)((caddr_t)obj->pltrela + reloff);
+	const Elf_Rela *rela = (const Elf_Rela *)((const uint8_t *)obj->pltrela + reloff);
 	Elf_Addr result;
 	int err;
 	result = 0;	/* XXX gcc */
 	err = _rtld_relocate_plt_object(obj, rela, &result);
 	if (err || result == 0)
 		_rtld_die();
 	return (caddr_t)result;
+}
 int

 @@ -1,23 +1,23 @@
-/*	$NetBSD: mdreloc.c,v 1.24 2008/07/24 06:51:58 skrll Exp $	*/
+/*	$NetBSD: mdreloc.c,v 1.25 2009/03/16 02:46:47 lukem Exp $	*/
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: mdreloc.c,v 1.24 2008/07/24 06:51:58 skrll Exp $");
+__RCSID("$NetBSD: mdreloc.c,v 1.25 2009/03/16 02:46:47 lukem Exp $");
 #endif /* not lint */
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: mdreloc.c,v 1.24 2008/07/24 06:51:58 skrll Exp $");
+__RCSID("$NetBSD: mdreloc.c,v 1.25 2009/03/16 02:46:47 lukem Exp $");
 #endif /* not lint */
 #include <sys/types.h>
 #include <sys/stat.h>
 #include "debug.h"
 #include "rtld.h"
 void _rtld_bind_start(void);
 void _rtld_relocate_nonplt_self(Elf_Dyn *, Elf_Addr);
 caddr_t _rtld_bind(const Obj_Entry *, Elf_Word);
 static inline int _rtld_relocate_plt_object(const Obj_Entry *,
     const Elf_Rela *, Elf_Addr *);
 @@ -36,27 +36,27 @@ _rtld_relocate_nonplt_self(Elf_Dyn *dynp
 	Elf_Addr relasz = 0;
 	Elf_Addr *where;
 	for (; dynp->d_tag != DT_NULL; dynp++) {
 		switch (dynp->d_tag) {
 		case DT_RELA:
 			rela = (const Elf_Rela *)(relocbase + dynp->d_un.d_ptr);
 			break;
 		case DT_RELASZ:
 			relasz = dynp->d_un.d_val;
 			break;
+		}
+	}
-	relalim = (const Elf_Rela *)((caddr_t)rela + relasz);
+	relalim = (const Elf_Rela *)((const uint8_t *)rela + relasz);
 	for (; rela < relalim; rela++) {
 		where = (Elf_Addr *)(relocbase + rela->r_offset);
 		*where = (Elf_Addr)(relocbase + rela->r_addend);
+	}
+}
 int
 _rtld_relocate_nonplt_objects(const Obj_Entry *obj)
+{
 	const Elf_Rela *rela;
 	for (rela = obj->rela; rela < obj->relalim; rela++) {
 		Elf_Addr        *where;
 @@ -185,27 +185,27 @@ _rtld_relocate_plt_lazy(const Obj_Entry
 		assert(ELF_R_TYPE(rela->r_info) == R_TYPE(JMP_SLOT));
 		/* Just relocate the GOT slots pointing into the PLT */
 		*where += (Elf_Addr)obj->relocbase;
 		rdbg(("fixup !main in %s --> %p", obj->path, (void *)*where));
+	}
 	return 0;
+}
 caddr_t
 _rtld_bind(const Obj_Entry *obj, Elf_Word reloff)
+{
-	const Elf_Rela *rela = (const Elf_Rela *)((caddr_t)obj->pltrela + reloff);
+	const Elf_Rela *rela = (const Elf_Rela *)((const uint8_t *)obj->pltrela + reloff);
 	Elf_Addr new_value;
 	int err;
 	new_value = 0;	/* XXX gcc */
 	err = _rtld_relocate_plt_object(obj, rela, &new_value);
 	if (err || new_value == 0)
 		_rtld_die();
 	return (caddr_t)new_value;
+}
 int

 @@ -1,14 +1,14 @@
-/*	$NetBSD: mdreloc.c,v 1.41 2008/07/24 04:39:25 matt Exp $	*/
+/*	$NetBSD: mdreloc.c,v 1.42 2009/03/16 02:46:47 lukem Exp $	*/
 /*-
  * Copyright (c) 1999, 2002 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Paul Kranenburg and by Charles M. Hannum.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -21,27 +21,27 @@
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: mdreloc.c,v 1.41 2008/07/24 04:39:25 matt Exp $");
+__RCSID("$NetBSD: mdreloc.c,v 1.42 2009/03/16 02:46:47 lukem Exp $");
 #endif /* not lint */
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <sys/stat.h>
 #include "rtldenv.h"
 #include "debug.h"
 #include "rtld.h"
 @@ -163,27 +163,27 @@ _rtld_relocate_nonplt_self(Elf_Dyn *dynp
 	Elf_Addr relasz = 0;
 	Elf_Addr *where;
 	for (; dynp->d_tag != DT_NULL; dynp++) {
 		switch (dynp->d_tag) {
 		case DT_RELA:
 			rela = (const Elf_Rela *)(relocbase + dynp->d_un.d_ptr);
 			break;
 		case DT_RELASZ:
 			relasz = dynp->d_un.d_val;
 			break;
+		}
+	}
-	relalim = (const Elf_Rela *)((caddr_t)rela + relasz);
+	relalim = (const Elf_Rela *)((const uint8_t *)rela + relasz);
 	for (; rela < relalim; rela++) {
 		where = (Elf_Addr *)(relocbase + rela->r_offset);
 		*where += (Elf_Addr)(relocbase + rela->r_addend);
+	}
+}
 int
 _rtld_relocate_nonplt_objects(const Obj_Entry *obj)
+{
 	const Elf_Rela *rela;
 	for (rela = obj->rela; rela < obj->relalim; rela++) {
 		Elf_Addr *where;
 @@ -310,27 +310,27 @@ _rtld_relocate_nonplt_objects(const Obj_
+	}
 	return (0);
+}
 int
 _rtld_relocate_plt_lazy(const Obj_Entry *obj)
+{
 	return (0);
+}
 caddr_t
 _rtld_bind(const Obj_Entry *obj, Elf_Word reloff)
+{
-	const Elf_Rela *rela = (const Elf_Rela *)((caddr_t)obj->pltrela + reloff);
+	const Elf_Rela *rela = (const Elf_Rela *)((const uint8_t *)obj->pltrela + reloff);
 	Elf_Addr value;
 	int err;
 	value = 0;	/* XXX gcc */
 	err = _rtld_relocate_plt_object(obj, rela, &value);
 	if (err || value == 0)
 		_rtld_die();
 	return (caddr_t)value;
+}
 int

 @@ -1,14 +1,14 @@
-/*	$NetBSD: mdreloc.c,v 1.43 2008/07/24 04:39:25 matt Exp $	*/
+/*	$NetBSD: mdreloc.c,v 1.44 2009/03/16 02:46:48 lukem Exp $	*/
 /*-
  * Copyright (c) 2000 Eduardo Horvath.
  * Copyright (c) 1999, 2002 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Paul Kranenburg and by Charles M. Hannum.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -22,27 +22,27 @@
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: mdreloc.c,v 1.43 2008/07/24 04:39:25 matt Exp $");
+__RCSID("$NetBSD: mdreloc.c,v 1.44 2009/03/16 02:46:48 lukem Exp $");
 #endif /* not lint */
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <sys/stat.h>
 #include "rtldenv.h"
 #include "debug.h"
 #include "rtld.h"
 @@ -279,27 +279,27 @@ _rtld_relocate_nonplt_self(Elf_Dyn *dynp
 	Elf_Addr relasz = 0;
 	Elf_Addr *where;
 	for (; dynp->d_tag != DT_NULL; dynp++) {
 		switch (dynp->d_tag) {
 		case DT_RELA:
 			rela = (const Elf_Rela *)(relocbase + dynp->d_un.d_ptr);
 			break;
 		case DT_RELASZ:
 			relasz = dynp->d_un.d_val;
 			break;
+		}
+	}
-	relalim = (const Elf_Rela *)((caddr_t)rela + relasz);
+	relalim = (const Elf_Rela *)((const uint8_t *)rela + relasz);
 	for (; rela < relalim; rela++) {
 		where = (Elf_Addr *)(relocbase + rela->r_offset);
 		*where = (Elf_Addr)(relocbase + rela->r_addend);
+	}
+}
 int
 _rtld_relocate_nonplt_objects(const Obj_Entry *obj)
+{
 	const Elf_Rela *rela;
 	const Elf_Sym *def = NULL;
 	const Obj_Entry *defobj = NULL;

 @@ -1,23 +1,23 @@
-/*	$NetBSD: mdreloc.c,v 1.23 2008/07/24 06:51:59 skrll Exp $	*/
+/*	$NetBSD: mdreloc.c,v 1.24 2009/03/16 02:46:48 lukem Exp $	*/
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: mdreloc.c,v 1.23 2008/07/24 06:51:59 skrll Exp $");
+__RCSID("$NetBSD: mdreloc.c,v 1.24 2009/03/16 02:46:48 lukem Exp $");
 #endif /* not lint */
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: mdreloc.c,v 1.23 2008/07/24 06:51:59 skrll Exp $");
+__RCSID("$NetBSD: mdreloc.c,v 1.24 2009/03/16 02:46:48 lukem Exp $");
 #endif /* not lint */
 #include <sys/types.h>
 #include <sys/stat.h>
 #include "debug.h"
 #include "rtld.h"
 void _rtld_bind_start(void);
 void _rtld_relocate_nonplt_self(Elf_Dyn *, Elf_Addr);
 caddr_t _rtld_bind(const Obj_Entry *, Elf_Word);
 static inline int _rtld_relocate_plt_object(const Obj_Entry *,
     const Elf_Rela *, Elf_Addr *);
 @@ -36,27 +36,27 @@ _rtld_relocate_nonplt_self(Elf_Dyn *dynp
 	Elf_Addr relasz = 0;
 	Elf_Addr *where;
 	for (; dynp->d_tag != DT_NULL; dynp++) {
 		switch (dynp->d_tag) {
 		case DT_RELA:
 			rela = (const Elf_Rela *)(relocbase + dynp->d_un.d_ptr);
 			break;
 		case DT_RELASZ:
 			relasz = dynp->d_un.d_val;
 			break;
+		}
+	}
-	relalim = (const Elf_Rela *)((caddr_t)rela + relasz);
+	relalim = (const Elf_Rela *)((const uint8_t *)rela + relasz);
 	for (; rela < relalim; rela++) {
 		where = (Elf_Addr *)(relocbase + rela->r_offset);
 		*where = (Elf_Addr)(relocbase + rela->r_addend);
+	}
+}
 int
 _rtld_relocate_nonplt_objects(const Obj_Entry *obj)
+{
 	const Elf_Rela *rela;
 	for (rela = obj->rela; rela < obj->relalim; rela++) {
 		Elf_Addr        *where;
 @@ -169,27 +169,27 @@ _rtld_relocate_plt_object(const Obj_Entr
 	    defobj->strtab + def->st_name, (void *)*where, (void *)new_value));
 	if (*where != new_value)
 		*where = new_value;
 	if (tp)
 		*tp = new_value - rela->r_addend;
 	return 0;
+}
 caddr_t
 _rtld_bind(const Obj_Entry *obj, Elf_Word reloff)
+{
-	const Elf_Rela *rela = (const Elf_Rela *)((caddr_t)obj->pltrela + reloff);
+	const Elf_Rela *rela = (const Elf_Rela *)((const uint8_t *)obj->pltrela + reloff);
 	Elf_Addr result;
 	int err;
 	result = 0;	/* XXX gcc */
 	err = _rtld_relocate_plt_object(obj, rela, &result);
 	if (err || result == 0)
 		_rtld_die();
 	return (caddr_t)result;
+}
 int