 @@ -1,275 +1,275 @@
-/*	$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);
 void
 _rtld_setup_pltgot(const Obj_Entry *obj)
+{
 	obj->pltgot[1] = (Elf_Addr) obj;
 	obj->pltgot[2] = (Elf_Addr) &_rtld_bind_start;
+}
 void
 _rtld_relocate_nonplt_self(Elf_Dyn *dynp, Elf_Addr relocbase)
+{
 	const Elf_Rel *rel = 0, *rellim;
 	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)
 static inline Elf_Addr
 load_ptr(void *where)
+{
 	Elf_Addr res;
 	memcpy(&res, where, sizeof(res));
 	return (res);
+}
 static inline void
 store_ptr(void *where, Elf_Addr val)
+{
 	memcpy(where, &val, sizeof(val));
+}
 int
 _rtld_relocate_nonplt_objects(const Obj_Entry *obj)
+{
 	const Elf_Rel *rel;
 	for (rel = obj->rel; rel < obj->rellim; rel++) {
 		Elf_Addr        *where;
 		const Elf_Sym   *def;
 		const Obj_Entry *defobj;
 		Elf_Addr         tmp;
 		unsigned long	 symnum;
 		where = (Elf_Addr *)(obj->relocbase + rel->r_offset);
 		symnum = ELF_R_SYM(rel->r_info);
 		switch (ELF_R_TYPE(rel->r_info)) {
 		case R_TYPE(NONE):
 			break;
 #if 1 /* XXX should not occur */
 		case R_TYPE(PC24): {	/* word32 S - P + A */
 			Elf32_Sword addend;
 			/*
 			 * Extract addend and sign-extend if needed.
 			 */
 			addend = *where;
 			if (addend & 0x00800000)
 				addend |= 0xff000000;
 			def = _rtld_find_symdef(symnum, obj, &defobj, false);
 			if (def == NULL)
 				return -1;
 			tmp = (Elf_Addr)obj->relocbase + def->st_value
 			    - (Elf_Addr)where + (addend << 2);
 			if ((tmp & 0xfe000000) != 0xfe000000 &&
 			    (tmp & 0xfe000000) != 0) {
 				_rtld_error(
 				"%s: R_ARM_PC24 relocation @ %p to %s failed "
 				"(displacement %ld (%#lx) out of range)",
 				    obj->path, where,
 				    obj->strtab + obj->symtab[symnum].st_name,
 				    (long) tmp, (long) tmp);
 				return -1;
+			}
 			tmp >>= 2;
 			*where = (*where & 0xff000000) | (tmp & 0x00ffffff);
 			rdbg(("PC24 %s in %s --> %p @ %p in %s",
 			    obj->strtab + obj->symtab[symnum].st_name,
 			    obj->path, (void *)*where, where, defobj->path));
 			break;
+		}
 #endif
 		case R_TYPE(ABS32):	/* word32 B + S + A */
 		case R_TYPE(GLOB_DAT):	/* word32 B + S */
 			def = _rtld_find_symdef(symnum, obj, &defobj, false);
 			if (def == NULL)
 				return -1;
 			if (__predict_true(RELOC_ALIGNED_P(where))) {
 				tmp = *where + (Elf_Addr)defobj->relocbase +
 				    def->st_value;
 				/* Set the Thumb bit, if needed.  */
 				if (ELF_ST_TYPE(def->st_info) == STT_ARM_TFUNC)
 				    tmp |= 1;
 				*where = tmp;
 			} else {
 				tmp = load_ptr(where) +
 				    (Elf_Addr)defobj->relocbase +
 				    def->st_value;
 				/* Set the Thumb bit, if needed.  */
 				if (ELF_ST_TYPE(def->st_info) == STT_ARM_TFUNC)
 				    tmp |= 1;
 				store_ptr(where, tmp);
+			}
 			rdbg(("ABS32/GLOB_DAT %s in %s --> %p @ %p in %s",
 			    obj->strtab + obj->symtab[symnum].st_name,
 			    obj->path, (void *)tmp, where, defobj->path));
 			break;
 		case R_TYPE(RELATIVE):	/* word32 B + A */
 			if (__predict_true(RELOC_ALIGNED_P(where))) {
 				tmp = *where + (Elf_Addr)obj->relocbase;
 				*where = tmp;
 			} else {
 				tmp = load_ptr(where) +
 				    (Elf_Addr)obj->relocbase;
 				store_ptr(where, tmp);
+			}
 			rdbg(("RELATIVE in %s --> %p", obj->path,
 			    (void *)tmp));
 			break;
 		case R_TYPE(COPY):
 			/*
 			 * These are deferred until all other relocations have
 			 * been done.  All we do here is make sure that the
 			 * COPY relocation is not in a shared library.  They
 			 * are allowed only in executable files.
 			 */
 			if (obj->isdynamic) {
 				_rtld_error(
 			"%s: Unexpected R_COPY relocation in shared library",
 				    obj->path);
 				return -1;
+			}
 			rdbg(("COPY (avoid in main)"));
 			break;
 		default:
 			rdbg(("sym = %lu, type = %lu, offset = %p, "
 			    "contents = %p, symbol = %s",
 			    symnum, (u_long)ELF_R_TYPE(rel->r_info),
 			    (void *)rel->r_offset, (void *)load_ptr(where),
 			    obj->strtab + obj->symtab[symnum].st_name));
 			_rtld_error("%s: Unsupported relocation type %ld "
 			    "in non-PLT relocations\n",
 			    obj->path, (u_long) ELF_R_TYPE(rel->r_info));
 			return -1;
+		}
+	}
 	return 0;
+}
 int
 _rtld_relocate_plt_lazy(const Obj_Entry *obj)
+{
 	const Elf_Rel *rel;
 	if (!obj->relocbase)
 		return 0;
 	for (rel = obj->pltrel; rel < obj->pltrellim; rel++) {
 		Elf_Addr *where = (Elf_Addr *)(obj->relocbase + rel->r_offset);
 		assert(ELF_R_TYPE(rel->r_info) == R_TYPE(JUMP_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;
+}
 static int
 _rtld_relocate_plt_object(const Obj_Entry *obj, const Elf_Rel *rel,
 	Elf_Addr *tp)
+{
 	Elf_Addr *where = (Elf_Addr *)(obj->relocbase + rel->r_offset);
 	Elf_Addr new_value;
 	const Elf_Sym  *def;
 	const Obj_Entry *defobj;
 	assert(ELF_R_TYPE(rel->r_info) == R_TYPE(JUMP_SLOT));
 	def = _rtld_find_symdef(ELF_R_SYM(rel->r_info), obj, &defobj, true);
 	if (def == NULL)
 		return -1;
 	new_value = (Elf_Addr)(defobj->relocbase + def->st_value);
 	/* Set the Thumb bit, if needed.  */
 	if (ELF_ST_TYPE(def->st_info) == STT_ARM_TFUNC)
 		new_value |= 1;
 	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;
 	int err = 0;
 	for (rel = obj->pltrel; rel < obj->pltrellim; rel++) {
 		err = _rtld_relocate_plt_object(obj, rel, NULL);
 		if (err)
 			break;
+	}
 	return err;
+}

 @@ -1,221 +1,221 @@
-/*	$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 *);
 void
 _rtld_setup_pltgot(const Obj_Entry *obj)
+{
 	obj->pltgot[1] = (Elf_Addr) obj;
 	obj->pltgot[2] = (Elf_Addr) &_rtld_bind_start;
+}
 void
 _rtld_relocate_nonplt_self(Elf_Dyn *dynp, Elf_Addr relocbase)
+{
 	const Elf_Rela *rela = 0, *relalim;
 	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;
 		const Elf_Sym   *def;
 		const Obj_Entry *defobj;
 		Elf_Addr         tmp;
 		unsigned long	 symnum;
 		where = (Elf_Addr *)(obj->relocbase + rela->r_offset);
 		symnum = ELF_R_SYM(rela->r_info);
 		switch (ELF_R_TYPE(rela->r_info)) {
 		case R_TYPE(NONE):
 			break;
 #if 1 /* XXX should not occur */
 		case R_TYPE(PC32):
 			def = _rtld_find_symdef(symnum, obj, &defobj, false);
 			if (def == NULL)
 				return -1;
 			tmp = (Elf_Addr)(defobj->relocbase + def->st_value +
 			    rela->r_addend) - (Elf_Addr)where;
 			if (*where != tmp)
 				*where = tmp;
 			rdbg(("PC32 %s in %s --> %p in %s",
 			    obj->strtab + obj->symtab[symnum].st_name,
 			    obj->path, (void *)*where, defobj->path));
 			break;
 		case R_TYPE(GOT32):
 #endif
 		case R_TYPE(32):
 		case R_TYPE(GLOB_DAT):
 			def = _rtld_find_symdef(symnum, obj, &defobj, false);
 			if (def == NULL)
 				return -1;
 			tmp = (Elf_Addr)(defobj->relocbase + def->st_value +
 			    rela->r_addend);
 			if (*where != tmp)
 				*where = tmp;
 			rdbg(("32/GLOB_DAT %s in %s --> %p in %s",
 			    obj->strtab + obj->symtab[symnum].st_name,
 			    obj->path, (void *)*where, defobj->path));
 			break;
 		case R_TYPE(RELATIVE):
 			*where += (Elf_Addr)obj->relocbase;
 			rdbg(("RELATIVE in %s --> %p", obj->path,
 			    (void *)*where));
 			break;
 		case R_TYPE(COPY):
 			/*
 			 * These are deferred until all other relocations have
 			 * been done.  All we do here is make sure that the
 			 * COPY relocation is not in a shared library.  They
 			 * are allowed only in executable files.
 			 */
 			if (obj->isdynamic) {
 				_rtld_error(
 			"%s: Unexpected R_COPY relocation in shared library",
 				    obj->path);
 				return -1;
+			}
 			rdbg(("COPY (avoid in main)"));
 			break;
 		default:
 			rdbg(("sym = %lu, type = %lu, offset = %p, "
 			    "addend = %p, contents = %p, symbol = %s",
 			    symnum, (u_long)ELF_R_TYPE(rela->r_info),
 			    (void *)rela->r_offset, (void *)rela->r_addend,
 			    (void *)*where,
 			    obj->strtab + obj->symtab[symnum].st_name));
 			_rtld_error("%s: Unsupported relocation type %ld "
 			    "in non-PLT relocations\n",
 			    obj->path, (u_long) ELF_R_TYPE(rela->r_info));
 			return -1;
+		}
+	}
 	return 0;
+}
 int
 _rtld_relocate_plt_lazy(const Obj_Entry *obj)
+{
 	const Elf_Rela *rela;
 	if (!obj->relocbase)
 		return 0;
 	for (rela = obj->pltrela; rela < obj->pltrelalim; rela++) {
 		Elf_Addr *where = (Elf_Addr *)(obj->relocbase + rela->r_offset);
 		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;
+}
 static inline int
 _rtld_relocate_plt_object(const Obj_Entry *obj, const Elf_Rela *rela, Elf_Addr *tp)
+{
 	Elf_Addr *where = (Elf_Addr *)(obj->relocbase + rela->r_offset);
 	Elf_Addr new_value;
 	const Elf_Sym  *def;
 	const Obj_Entry *defobj;
 	assert(ELF_R_TYPE(rela->r_info) == R_TYPE(JMP_SLOT));
 	def = _rtld_find_symdef(ELF_R_SYM(rela->r_info), obj, &defobj, true);
 	if (def == NULL)
 		return -1;
 	assert(rela->r_addend == 0);
 	new_value = (Elf_Addr)(defobj->relocbase + def->st_value +
 	    rela->r_addend);
 	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 - 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
 _rtld_relocate_plt_objects(const Obj_Entry *obj)
+{
 	const Elf_Rela *rela;
 	for (rela = obj->pltrela; rela < obj->pltrelalim; rela++)
 		if (_rtld_relocate_plt_object(obj, rela, NULL) < 0)
 			return -1;
 	return 0;
+}

 @@ -1,247 +1,247 @@
-/*	$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 *);
 void
 _rtld_setup_pltgot(const Obj_Entry *obj)
+{
 	obj->pltgot[1] = (Elf_Addr) obj;
 	obj->pltgot[2] = (Elf_Addr) &_rtld_bind_start;
+}
 void
 _rtld_relocate_nonplt_self(Elf_Dyn *dynp, Elf_Addr relocbase)
+{
 	const Elf_Rela *rela = 0, *relalim;
 	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;
 		const Elf_Sym   *def;
 		const Obj_Entry *defobj;
 		Elf_Addr         tmp;
 		unsigned long	 symnum;
 		where = (Elf_Addr *)(obj->relocbase + rela->r_offset);
 		symnum = ELF_R_SYM(rela->r_info);
 		switch (ELF_R_TYPE(rela->r_info)) {
 		case R_TYPE(NONE):
 			break;
 #if 1 /* XXX should not occur */
 		case R_TYPE(GOT32):
 			def = _rtld_find_symdef(symnum, obj, &defobj, false);
 			if (def == NULL)
 				return -1;
 			tmp = (Elf_Addr)(defobj->relocbase + def->st_value +
 			    rela->r_addend);
 			if (*where != tmp)
 				*where = tmp;
 			rdbg(("GOT32 %s in %s --> %p in %s",
 			    obj->strtab + obj->symtab[symnum].st_name,
 			    obj->path, (void *)*where, defobj->path));
 			break;
 		case R_TYPE(REL32):
 			def = _rtld_find_symdef(symnum, obj, &defobj, false);
 			if (def == NULL)
 				return -1;
 			tmp = (Elf_Addr)(defobj->relocbase + def->st_value +
 			    rela->r_addend) - (Elf_Addr)where;
 			if (*where != tmp)
 				*where = tmp;
 			rdbg(("PC32 %s in %s --> %p in %s",
 			    obj->strtab + obj->symtab[symnum].st_name,
 			    obj->path, (void *)*where, defobj->path));
 			break;
 #endif
 		case R_TYPE(DIR32):
 			def = _rtld_find_symdef(symnum, obj, &defobj, false);
 			if (def == NULL)
 				return -1;
 			tmp = (Elf_Addr)(defobj->relocbase + def->st_value +
 			    rela->r_addend);
 			if (*where != tmp)
 				*where = tmp;
 			rdbg(("32 %s in %s --> %p in %s",
 			    obj->strtab + obj->symtab[symnum].st_name,
 			    obj->path, (void *)*where, defobj->path));
 			break;
 		case R_TYPE(GLOB_DAT):
 			def = _rtld_find_symdef(symnum, obj, &defobj, false);
 			if (def == NULL)
 				return -1;
 			tmp = (Elf_Addr)(defobj->relocbase + def->st_value) +
 			    rela->r_addend;
 			if (*where != tmp)
 				*where = tmp;
 			rdbg(("GLOB_DAT %s in %s --> %p in %s",
 			    obj->strtab + obj->symtab[symnum].st_name,
 			    obj->path, (void *)*where, defobj->path));
 			break;
 		case R_TYPE(RELATIVE):
 			if (rela->r_addend)
 				*where = (Elf_Addr)obj->relocbase + rela->r_addend;
 			else
 				*where += (Elf_Addr)obj->relocbase;
 			rdbg(("RELATIVE in %s --> %p", obj->path,
 			    (void *)*where));
 			break;
 		case R_TYPE(COPY):
 			/*
 			 * These are deferred until all other relocations have
 			 * been done.  All we do here is make sure that the
 			 * COPY relocation is not in a shared library.  They
 			 * are allowed only in executable files.
 			 */
 			if (obj->isdynamic) {
 				_rtld_error(
 			"%s: Unexpected R_COPY relocation in shared library",
 				    obj->path);
 				return -1;
+			}
 			rdbg(("COPY (avoid in main)"));
 			break;
 		default:
 			rdbg(("sym = %lu, type = %lu, offset = %p, "
 			    "addend = %p, contents = %p, symbol = %s",
 			    symnum, (u_long)ELF_R_TYPE(rela->r_info),
 			    (void *)rela->r_offset, (void *)rela->r_addend,
 			    (void *)*where,
 			    obj->strtab + obj->symtab[symnum].st_name));
 			_rtld_error("%s: Unsupported relocation type %ld "
 			    "in non-PLT relocations\n",
 			    obj->path, (u_long) ELF_R_TYPE(rela->r_info));
 			return -1;
+		}
+	}
 	return 0;
+}
 int
 _rtld_relocate_plt_lazy(const Obj_Entry *obj)
+{
 	const Elf_Rela *rela;
 	if (!obj->relocbase)
 		return 0;
 	for (rela = obj->pltrela; rela < obj->pltrelalim; rela++) {
 		Elf_Addr *where = (Elf_Addr *)(obj->relocbase + rela->r_offset);
 		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
 _rtld_relocate_plt_objects(const Obj_Entry *obj)
+{
 	const Elf_Rela *rela = obj->pltrela;
 	for (; rela < obj->pltrelalim; rela++)
 		if (_rtld_relocate_plt_object(obj, rela, NULL) < 0)
 			return -1;
 	return 0;
+}
 static inline int
 _rtld_relocate_plt_object(const Obj_Entry *obj, const Elf_Rela *rela, Elf_Addr *tp)
+{
 	Elf_Addr *where = (Elf_Addr *)(obj->relocbase + rela->r_offset);
 	Elf_Addr new_value;
 	const Elf_Sym  *def;
 	const Obj_Entry *defobj;
 	assert(ELF_R_TYPE(rela->r_info) == R_TYPE(JMP_SLOT));
 	def = _rtld_find_symdef(ELF_R_SYM(rela->r_info), obj, &defobj, true);
 	if (def == NULL)
 		return -1;
 	new_value = (Elf_Addr)(defobj->relocbase + def->st_value);
 	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;
+}

 @@ -1,394 +1,394 @@
-/*	$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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * 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"
 /*
  * The following table holds for each relocation type:
  *	- the width in bits of the memory location the relocation
  *	  applies to (not currently used)
  *	- the number of bits the relocation value must be shifted to the
  *	  right (i.e. discard least significant bits) to fit into
  *	  the appropriate field in the instruction word.
  *	- flags indicating whether
  *		* the relocation involves a symbol
  *		* the relocation is relative to the current position
  *		* the relocation is for a GOT entry
  *		* the relocation is relative to the load address
+ *
  */
 #define _RF_S		0x80000000		/* Resolve symbol */
 #define _RF_A		0x40000000		/* Use addend */
 #define _RF_P		0x20000000		/* Location relative */
 #define _RF_G		0x10000000		/* GOT offset */
 #define _RF_B		0x08000000		/* Load address relative */
 #define _RF_U		0x04000000		/* Unaligned */
 #define _RF_SZ(s)	(((s) & 0xff) << 8)	/* memory target size */
 #define _RF_RS(s)	( (s) & 0xff)		/* right shift */
 static const int reloc_target_flags[] = {
 ,							/* NONE */
 	_RF_S|_RF_A|		_RF_SZ(8)  | _RF_RS(0),		/* RELOC_8 */
 	_RF_S|_RF_A|		_RF_SZ(16) | _RF_RS(0),		/* RELOC_16 */
 	_RF_S|_RF_A|		_RF_SZ(32) | _RF_RS(0),		/* RELOC_32 */
 	_RF_S|_RF_A|_RF_P|	_RF_SZ(8)  | _RF_RS(0),		/* DISP_8 */
 	_RF_S|_RF_A|_RF_P|	_RF_SZ(16) | _RF_RS(0),		/* DISP_16 */
 	_RF_S|_RF_A|_RF_P|	_RF_SZ(32) | _RF_RS(0),		/* DISP_32 */
 	_RF_S|_RF_A|_RF_P|	_RF_SZ(32) | _RF_RS(2),		/* WDISP_30 */
 	_RF_S|_RF_A|_RF_P|	_RF_SZ(32) | _RF_RS(2),		/* WDISP_22 */
 	_RF_S|_RF_A|		_RF_SZ(32) | _RF_RS(10),	/* HI22 */
 	_RF_S|_RF_A|		_RF_SZ(32) | _RF_RS(0),		/* 22 */
 	_RF_S|_RF_A|		_RF_SZ(32) | _RF_RS(0),		/* 13 */
 	_RF_S|_RF_A|		_RF_SZ(32) | _RF_RS(0),		/* LO10 */
 	_RF_G|			_RF_SZ(32) | _RF_RS(0),		/* GOT10 */
 	_RF_G|			_RF_SZ(32) | _RF_RS(0),		/* GOT13 */
 	_RF_G|			_RF_SZ(32) | _RF_RS(10),	/* GOT22 */
 	_RF_S|_RF_A|_RF_P|	_RF_SZ(32) | _RF_RS(0),		/* PC10 */
 	_RF_S|_RF_A|_RF_P|	_RF_SZ(32) | _RF_RS(10),	/* PC22 */
 	      _RF_A|_RF_P|	_RF_SZ(32) | _RF_RS(2),		/* WPLT30 */
 				_RF_SZ(32) | _RF_RS(0),		/* COPY */
 	_RF_S|_RF_A|		_RF_SZ(32) | _RF_RS(0),		/* GLOB_DAT */
 				_RF_SZ(32) | _RF_RS(0),		/* JMP_SLOT */
 	      _RF_A|	_RF_B|	_RF_SZ(32) | _RF_RS(0),		/* RELATIVE */
 	_RF_S|_RF_A|	_RF_U|	_RF_SZ(32) | _RF_RS(0),		/* UA_32 */
 };
 #ifdef RTLD_DEBUG_RELOC
 static const char *reloc_names[] = {
 	"NONE", "RELOC_8", "RELOC_16", "RELOC_32", "DISP_8",
 	"DISP_16", "DISP_32", "WDISP_30", "WDISP_22", "HI22",
 	"22", "13", "LO10", "GOT10", "GOT13",
 	"GOT22", "PC10", "PC22", "WPLT30", "COPY",
 	"GLOB_DAT", "JMP_SLOT", "RELATIVE", "UA_32"
 };
 #endif
 #define RELOC_RESOLVE_SYMBOL(t)		((reloc_target_flags[t] & _RF_S) != 0)
 #define RELOC_PC_RELATIVE(t)		((reloc_target_flags[t] & _RF_P) != 0)
 #define RELOC_BASE_RELATIVE(t)		((reloc_target_flags[t] & _RF_B) != 0)
 #define RELOC_UNALIGNED(t)		((reloc_target_flags[t] & _RF_U) != 0)
 #define RELOC_USE_ADDEND(t)		((reloc_target_flags[t] & _RF_A) != 0)
 #define RELOC_TARGET_SIZE(t)		((reloc_target_flags[t] >> 8) & 0xff)
 #define RELOC_VALUE_RIGHTSHIFT(t)	(reloc_target_flags[t] & 0xff)
 static const int reloc_target_bitmask[] = {
 #define _BM(x)	(~(-(1ULL << (x))))
 ,				/* NONE */
 	_BM(8), _BM(16), _BM(32),	/* RELOC_8, _16, _32 */
 	_BM(8), _BM(16), _BM(32),	/* DISP8, DISP16, DISP32 */
 	_BM(30), _BM(22),		/* WDISP30, WDISP22 */
 	_BM(22), _BM(22),		/* HI22, _22 */
 	_BM(13), _BM(10),		/* RELOC_13, _LO10 */
 	_BM(10), _BM(13), _BM(22),	/* GOT10, GOT13, GOT22 */
 	_BM(10), _BM(22),		/* _PC10, _PC22 */
 	_BM(30), 0,			/* _WPLT30, _COPY */
 	-1, -1, -1,			/* _GLOB_DAT, JMP_SLOT, _RELATIVE */
 	_BM(32)				/* _UA32 */
 #undef _BM
 };
 #define RELOC_VALUE_BITMASK(t)	(reloc_target_bitmask[t])
 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 *);
 void
 _rtld_setup_pltgot(const Obj_Entry *obj)
+{
 	/*
 	 * PLTGOT is the PLT on the sparc.
 	 * The first entry holds the call the dynamic linker.
 	 * We construct a `call' sequence that transfers
 	 * to `_rtld_bind_start()'.
 	 * The second entry holds the object identification.
 	 * Note: each PLT entry is three words long.
 	 */
 #define SAVE	0x9de3bfa0	/* i.e. `save %sp,-96,%sp' */
 #define CALL	0x40000000
 #define NOP	0x01000000
 	obj->pltgot[0] = SAVE;
 	obj->pltgot[1] = CALL |
 	    ((Elf_Addr) &_rtld_bind_start - (Elf_Addr) &obj->pltgot[1]) >> 2;
 	obj->pltgot[2] = NOP;
 	obj->pltgot[3] = (Elf_Addr) obj;
+}
 void
 _rtld_relocate_nonplt_self(Elf_Dyn *dynp, Elf_Addr relocbase)
+{
 	const Elf_Rela *rela = 0, *relalim;
 	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;
 		Elf_Word type, value, mask;
 		const Elf_Sym *def = NULL;
 		const Obj_Entry *defobj = NULL;
 		unsigned long	 symnum;
 		where = (Elf_Addr *) (obj->relocbase + rela->r_offset);
 		symnum = ELF_R_SYM(rela->r_info);
 		type = ELF_R_TYPE(rela->r_info);
 		if (type == R_TYPE(NONE))
 			continue;
 		/* We do JMP_SLOTs in _rtld_bind() below */
 		if (type == R_TYPE(JMP_SLOT))
 			continue;
 		/* COPY relocs are also handled elsewhere */
 		if (type == R_TYPE(COPY))
 			continue;
 		/*
 		 * We use the fact that relocation types are an `enum'
 		 * Note: R_SPARC_6 is currently numerically largest.
 		 */
 		if (type > R_TYPE(6))
 			return (-1);
 		value = rela->r_addend;
 		/*
 		 * Handle relative relocs here, as an optimization.
 		 */
 		if (type == R_TYPE(RELATIVE)) {
 			*where += (Elf_Addr)(obj->relocbase + value);
 			rdbg(("RELATIVE in %s --> %p", obj->path,
 			    (void *)*where));
 			continue;
+		}
 		if (RELOC_RESOLVE_SYMBOL(type)) {
 			/* Find the symbol */
 			def = _rtld_find_symdef(symnum, obj, &defobj, false);
 			if (def == NULL)
 				return (-1);
 			/* Add in the symbol's absolute address */
 			value += (Elf_Word)(defobj->relocbase + def->st_value);
+		}
 		if (RELOC_PC_RELATIVE(type)) {
 			value -= (Elf_Word)where;
+		}
 		if (RELOC_BASE_RELATIVE(type)) {
 			/*
 			 * Note that even though sparcs use `Elf_rela'
 			 * exclusively we still need the implicit memory addend
 			 * in relocations referring to GOT entries.
 			 * Undoubtedly, someone f*cked this up in the distant
 			 * past, and now we're stuck with it in the name of
 			 * compatibility for all eternity..
+			 *
 			 * In any case, the implicit and explicit should be
 			 * mutually exclusive. We provide a check for that
 			 * here.
 			 */
 #define DIAGNOSTIC
 #ifdef DIAGNOSTIC
 			if (value != 0 && *where != 0) {
 				xprintf("BASE_REL(%s): where=%p, *where 0x%x, "
 					"addend=0x%x, base %p\n",
 					obj->path, where, *where,
 					rela->r_addend, obj->relocbase);
+			}
 #endif
 			value += (Elf_Word)(obj->relocbase + *where);
+		}
 		mask = RELOC_VALUE_BITMASK(type);
 		value >>= RELOC_VALUE_RIGHTSHIFT(type);
 		value &= mask;
 		if (RELOC_UNALIGNED(type)) {
 			/* Handle unaligned relocations. */
 			Elf_Addr tmp = 0;
 			char *ptr = (char *)where;
 			int i, size = RELOC_TARGET_SIZE(type)/8;
 			/* Read it in one byte at a time. */
 			for (i=0; i<size; i++)
 				tmp = (tmp << 8) | ptr[i];
 			tmp &= ~mask;
 			tmp |= value;
 			/* Write it back out. */
 			for (i=0; i<size; i++)
 				ptr[i] = ((tmp >> (8*i)) & 0xff);
 #ifdef RTLD_DEBUG_RELOC
 			value = (Elf_Word)tmp;
 #endif
 		} else {
 			*where &= ~mask;
 			*where |= value;
 #ifdef RTLD_DEBUG_RELOC
 			value = (Elf_Word)*where;
 #endif
+		}
 #ifdef RTLD_DEBUG_RELOC
 		if (RELOC_RESOLVE_SYMBOL(type)) {
 			rdbg(("%s %s in %s --> %p in %s", reloc_names[type],
 			    obj->strtab + obj->symtab[symnum].st_name,
 			    obj->path, (void *)value, defobj->path));
 		} else {
 			rdbg(("%s in %s --> %p", reloc_names[type],
 			    obj->path, (void *)value));
+		}
 #endif
+	}
 	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
 _rtld_relocate_plt_objects(const Obj_Entry *obj)
+{
 	const Elf_Rela *rela = obj->pltrela;
 	for (; rela < obj->pltrelalim; rela++)
 		if (_rtld_relocate_plt_object(obj, rela, NULL) < 0)
 			return -1;
 	return 0;
+}
 static inline int
 _rtld_relocate_plt_object(const Obj_Entry *obj, const Elf_Rela *rela, Elf_Addr *tp)
+{
 	const Elf_Sym *def;
 	const Obj_Entry *defobj;
 	Elf_Word *where = (Elf_Addr *)(obj->relocbase + rela->r_offset);
 	Elf_Addr value;
 	/* Fully resolve procedure addresses now */
 	assert(ELF_R_TYPE(rela->r_info) == R_TYPE(JMP_SLOT));
 	def = _rtld_find_symdef(ELF_R_SYM(rela->r_info), obj, &defobj, true);
 	if (def == NULL)
 		return -1;
 	value = (Elf_Addr)(defobj->relocbase + def->st_value);
 	rdbg(("bind now/fixup in %s --> new=%p",
 	    defobj->strtab + def->st_name, (void *)value));
 	/*
 	 * At the PLT entry pointed at by `where', we now construct
 	 * a direct transfer to the now fully resolved function
 	 * address.  The resulting code in the jump slot is:
+	 *
 	 *	sethi	%hi(roffset), %g1
 	 *	sethi	%hi(addr), %g1
 	 *	jmp	%g1+%lo(addr)
+	 *
 	 * We write the third instruction first, since that leaves the
 	 * previous `b,a' at the second word in place. Hence the whole
 	 * PLT slot can be atomically change to the new sequence by
 	 * writing the `sethi' instruction at word 2.
 	 */
 #define SETHI	0x03000000
 #define JMP	0x81c06000
 #define NOP	0x01000000
 	where[2] = JMP   | (value & 0x000003ff);
 	where[1] = SETHI | ((value >> 10) & 0x003fffff);
 	__asm volatile("iflush %0+8" : : "r" (where));
 	__asm volatile("iflush %0+4" : : "r" (where));
 	if (tp)
 		*tp = value;
 	return 0;
+}

 @@ -1,733 +1,733 @@
-/*	$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
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * 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"
 /*
  * The following table holds for each relocation type:
  *	- the width in bits of the memory location the relocation
  *	  applies to (not currently used)
  *	- the number of bits the relocation value must be shifted to the
  *	  right (i.e. discard least significant bits) to fit into
  *	  the appropriate field in the instruction word.
  *	- flags indicating whether
  *		* the relocation involves a symbol
  *		* the relocation is relative to the current position
  *		* the relocation is for a GOT entry
  *		* the relocation is relative to the load address
+ *
  */
 #define _RF_S		0x80000000		/* Resolve symbol */
 #define _RF_A		0x40000000		/* Use addend */
 #define _RF_P		0x20000000		/* Location relative */
 #define _RF_G		0x10000000		/* GOT offset */
 #define _RF_B		0x08000000		/* Load address relative */
 #define _RF_U		0x04000000		/* Unaligned */
 #define _RF_SZ(s)	(((s) & 0xff) << 8)	/* memory target size */
 #define _RF_RS(s)	( (s) & 0xff)		/* right shift */
 static const int reloc_target_flags[] = {
 ,							/* NONE */
 	_RF_S|_RF_A|		_RF_SZ(8)  | _RF_RS(0),		/* RELOC_8 */
 	_RF_S|_RF_A|		_RF_SZ(16) | _RF_RS(0),		/* RELOC_16 */
 	_RF_S|_RF_A|		_RF_SZ(32) | _RF_RS(0),		/* RELOC_32 */
 	_RF_S|_RF_A|_RF_P|	_RF_SZ(8)  | _RF_RS(0),		/* DISP_8 */
 	_RF_S|_RF_A|_RF_P|	_RF_SZ(16) | _RF_RS(0),		/* DISP_16 */
 	_RF_S|_RF_A|_RF_P|	_RF_SZ(32) | _RF_RS(0),		/* DISP_32 */
 	_RF_S|_RF_A|_RF_P|	_RF_SZ(32) | _RF_RS(2),		/* WDISP_30 */
 	_RF_S|_RF_A|_RF_P|	_RF_SZ(32) | _RF_RS(2),		/* WDISP_22 */
 	_RF_S|_RF_A|		_RF_SZ(32) | _RF_RS(10),	/* HI22 */
 	_RF_S|_RF_A|		_RF_SZ(32) | _RF_RS(0),		/* 22 */
 	_RF_S|_RF_A|		_RF_SZ(32) | _RF_RS(0),		/* 13 */
 	_RF_S|_RF_A|		_RF_SZ(32) | _RF_RS(0),		/* LO10 */
 	_RF_G|			_RF_SZ(32) | _RF_RS(0),		/* GOT10 */
 	_RF_G|			_RF_SZ(32) | _RF_RS(0),		/* GOT13 */
 	_RF_G|			_RF_SZ(32) | _RF_RS(10),	/* GOT22 */
 	_RF_S|_RF_A|_RF_P|	_RF_SZ(32) | _RF_RS(0),		/* PC10 */
 	_RF_S|_RF_A|_RF_P|	_RF_SZ(32) | _RF_RS(10),	/* PC22 */
 	      _RF_A|_RF_P|	_RF_SZ(32) | _RF_RS(2),		/* WPLT30 */
 				_RF_SZ(32) | _RF_RS(0),		/* COPY */
 	_RF_S|_RF_A|		_RF_SZ(64) | _RF_RS(0),		/* GLOB_DAT */
 				_RF_SZ(32) | _RF_RS(0),		/* JMP_SLOT */
 	      _RF_A|	_RF_B|	_RF_SZ(64) | _RF_RS(0),		/* RELATIVE */
 	_RF_S|_RF_A|	_RF_U|	_RF_SZ(32) | _RF_RS(0),		/* UA_32 */
 	      _RF_A|		_RF_SZ(32) | _RF_RS(0),		/* PLT32 */
 	      _RF_A|		_RF_SZ(32) | _RF_RS(10),	/* HIPLT22 */
 	      _RF_A|		_RF_SZ(32) | _RF_RS(0),		/* LOPLT10 */
 	      _RF_A|_RF_P|	_RF_SZ(32) | _RF_RS(0),		/* PCPLT32 */
 	      _RF_A|_RF_P|	_RF_SZ(32) | _RF_RS(10),	/* PCPLT22 */
 	      _RF_A|_RF_P|	_RF_SZ(32) | _RF_RS(0),		/* PCPLT10 */
 	_RF_S|_RF_A|		_RF_SZ(32) | _RF_RS(0),		/* 10 */
 	_RF_S|_RF_A|		_RF_SZ(32) | _RF_RS(0),		/* 11 */
 	_RF_S|_RF_A|		_RF_SZ(64) | _RF_RS(0),		/* 64 */
 	_RF_S|_RF_A|/*extra*/	_RF_SZ(32) | _RF_RS(0),		/* OLO10 */
 	_RF_S|_RF_A|		_RF_SZ(32) | _RF_RS(42),	/* HH22 */
 	_RF_S|_RF_A|		_RF_SZ(32) | _RF_RS(32),	/* HM10 */
 	_RF_S|_RF_A|		_RF_SZ(32) | _RF_RS(10),	/* LM22 */
 	_RF_S|_RF_A|_RF_P|	_RF_SZ(32) | _RF_RS(42),	/* PC_HH22 */
 	_RF_S|_RF_A|_RF_P|	_RF_SZ(32) | _RF_RS(32),	/* PC_HM10 */
 	_RF_S|_RF_A|_RF_P|	_RF_SZ(32) | _RF_RS(10),	/* PC_LM22 */
 	_RF_S|_RF_A|_RF_P|	_RF_SZ(32) | _RF_RS(2),		/* WDISP16 */
 	_RF_S|_RF_A|_RF_P|	_RF_SZ(32) | _RF_RS(2),		/* WDISP19 */
 	_RF_S|_RF_A|		_RF_SZ(32) | _RF_RS(0),		/* GLOB_JMP */
 	_RF_S|_RF_A|		_RF_SZ(32) | _RF_RS(0),		/* 7 */
 	_RF_S|_RF_A|		_RF_SZ(32) | _RF_RS(0),		/* 5 */
 	_RF_S|_RF_A|		_RF_SZ(32) | _RF_RS(0),		/* 6 */
 	_RF_S|_RF_A|_RF_P|	_RF_SZ(64) | _RF_RS(0),		/* DISP64 */
 	      _RF_A|		_RF_SZ(64) | _RF_RS(0),		/* PLT64 */
 	_RF_S|_RF_A|		_RF_SZ(32) | _RF_RS(10),	/* HIX22 */
 	_RF_S|_RF_A|		_RF_SZ(32) | _RF_RS(0),		/* LOX10 */
 	_RF_S|_RF_A|		_RF_SZ(32) | _RF_RS(22),	/* H44 */
 	_RF_S|_RF_A|		_RF_SZ(32) | _RF_RS(12),	/* M44 */
 	_RF_S|_RF_A|		_RF_SZ(32) | _RF_RS(0),		/* L44 */
 	_RF_S|_RF_A|		_RF_SZ(64) | _RF_RS(0),		/* REGISTER */
 	_RF_S|_RF_A|	_RF_U|	_RF_SZ(64) | _RF_RS(0),		/* UA64 */
 	_RF_S|_RF_A|	_RF_U|	_RF_SZ(16) | _RF_RS(0),		/* UA16 */
 };
 #ifdef RTLD_DEBUG_RELOC
 static const char *reloc_names[] = {
 	"NONE", "RELOC_8", "RELOC_16", "RELOC_32", "DISP_8",
 	"DISP_16", "DISP_32", "WDISP_30", "WDISP_22", "HI22",
 	"22", "13", "LO10", "GOT10", "GOT13",
 	"GOT22", "PC10", "PC22", "WPLT30", "COPY",
 	"GLOB_DAT", "JMP_SLOT", "RELATIVE", "UA_32", "PLT32",
 	"HIPLT22", "LOPLT10", "LOPLT10", "PCPLT22", "PCPLT32",
 	"10", "11", "64", "OLO10", "HH22",
 	"HM10", "LM22", "PC_HH22", "PC_HM10", "PC_LM22",
 	"WDISP16", "WDISP19", "GLOB_JMP", "7", "5", "6",
 	"DISP64", "PLT64", "HIX22", "LOX10", "H44", "M44",
 	"L44", "REGISTER", "UA64", "UA16"
 };
 #endif
 #define RELOC_RESOLVE_SYMBOL(t)		((reloc_target_flags[t] & _RF_S) != 0)
 #define RELOC_PC_RELATIVE(t)		((reloc_target_flags[t] & _RF_P) != 0)
 #define RELOC_BASE_RELATIVE(t)		((reloc_target_flags[t] & _RF_B) != 0)
 #define RELOC_UNALIGNED(t)		((reloc_target_flags[t] & _RF_U) != 0)
 #define RELOC_USE_ADDEND(t)		((reloc_target_flags[t] & _RF_A) != 0)
 #define RELOC_TARGET_SIZE(t)		((reloc_target_flags[t] >> 8) & 0xff)
 #define RELOC_VALUE_RIGHTSHIFT(t)	(reloc_target_flags[t] & 0xff)
 static const long reloc_target_bitmask[] = {
 #define _BM(x)	(~(-(1ULL << (x))))
 ,				/* NONE */
 	_BM(8), _BM(16), _BM(32),	/* RELOC_8, _16, _32 */
 	_BM(8), _BM(16), _BM(32),	/* DISP8, DISP16, DISP32 */
 	_BM(30), _BM(22),		/* WDISP30, WDISP22 */
 	_BM(22), _BM(22),		/* HI22, _22 */
 	_BM(13), _BM(10),		/* RELOC_13, _LO10 */
 	_BM(10), _BM(13), _BM(22),	/* GOT10, GOT13, GOT22 */
 	_BM(10), _BM(22),		/* _PC10, _PC22 */
 	_BM(30), 0,			/* _WPLT30, _COPY */
 	_BM(32), _BM(32), _BM(32),	/* _GLOB_DAT, JMP_SLOT, _RELATIVE */
 	_BM(32), _BM(32),		/* _UA32, PLT32 */
 	_BM(22), _BM(10),		/* _HIPLT22, LOPLT10 */
 	_BM(32), _BM(22), _BM(10),	/* _PCPLT32, _PCPLT22, _PCPLT10 */
 	_BM(10), _BM(11), -1,		/* _10, _11, _64 */
 	_BM(10), _BM(22),		/* _OLO10, _HH22 */
 	_BM(10), _BM(22),		/* _HM10, _LM22 */
 	_BM(22), _BM(10), _BM(22),	/* _PC_HH22, _PC_HM10, _PC_LM22 */
 	_BM(16), _BM(19),		/* _WDISP16, _WDISP19 */
 	-1,				/* GLOB_JMP */
 	_BM(7), _BM(5), _BM(6)		/* _7, _5, _6 */
 	-1, -1,				/* DISP64, PLT64 */
 	_BM(22), _BM(13),		/* HIX22, LOX10 */
 	_BM(22), _BM(10), _BM(13),	/* H44, M44, L44 */
 	-1, -1, _BM(16),		/* REGISTER, UA64, UA16 */
 #undef _BM
 };
 #define RELOC_VALUE_BITMASK(t)	(reloc_target_bitmask[t])
 /*
  * Instruction templates:
  */
 #define	BAA	0x10400000	/*	ba,a	%xcc, 0 */
 #define	SETHI	0x03000000	/*	sethi	%hi(0), %g1 */
 #define	JMP	0x81c06000	/*	jmpl	%g1+%lo(0), %g0 */
 #define	NOP	0x01000000	/*	sethi	%hi(0), %g0 */
 #define	OR	0x82806000	/*	or	%g1, 0, %g1 */
 #define	XOR	0x82c06000	/*	xor	%g1, 0, %g1 */
 #define	MOV71	0x8283a000	/*	or	%o7, 0, %g1 */
 #define	MOV17	0x9c806000	/*	or	%g1, 0, %o7 */
 #define	CALL	0x40000000	/*	call	0 */
 #define	SLLX	0x8b407000	/*	sllx	%g1, 0, %g1 */
 #define	SETHIG5	0x0b000000	/*	sethi	%hi(0), %g5 */
 #define	ORG5	0x82804005	/*	or	%g1, %g5, %g1 */
 /* %hi(v)/%lo(v) with variable shift */
 #define	HIVAL(v, s)	(((v) >> (s)) & 0x003fffff)
 #define LOVAL(v, s)	(((v) >> (s)) & 0x000003ff)
 void _rtld_bind_start_0(long, long);
 void _rtld_bind_start_1(long, long);
 void _rtld_relocate_nonplt_self(Elf_Dyn *, Elf_Addr);
 caddr_t _rtld_bind(const Obj_Entry *, Elf_Word);
 /*
  * Install rtld function call into this PLT slot.
  */
 #define	SAVE		0x9de3bf50	/* i.e. `save %sp,-176,%sp' */
 #define	SETHI_l0	0x21000000
 #define	SETHI_l1	0x23000000
 #define	OR_l0_l0	0xa0142000
 #define	SLLX_l0_32_l0	0xa12c3020
 #define	OR_l0_l1_l0	0xa0140011
 #define	JMPL_l0_o0	0x91c42000
 #define	MOV_g1_o1	0x92100001
 void _rtld_install_plt(Elf_Word *, Elf_Addr);
 static inline int _rtld_relocate_plt_object(const Obj_Entry *,
     const Elf_Rela *, Elf_Addr *);
 void
 _rtld_install_plt(Elf_Word *pltgot, Elf_Addr proc)
+{
 	pltgot[0] = SAVE;
 	pltgot[1] = SETHI_l0  | HIVAL(proc, 42);
 	pltgot[2] = SETHI_l1  | HIVAL(proc, 10);
 	pltgot[3] = OR_l0_l0  | LOVAL(proc, 32);
 	pltgot[4] = SLLX_l0_32_l0;
 	pltgot[5] = OR_l0_l1_l0;
 	pltgot[6] = JMPL_l0_o0 | LOVAL(proc, 0);
 	pltgot[7] = MOV_g1_o1;
+}
 void
 _rtld_setup_pltgot(const Obj_Entry *obj)
+{
 	/*
 	 * On sparc64 we got troubles.
+	 *
 	 * Instructions are 4 bytes long.
 	 * Elf[64]_Addr is 8 bytes long, so are our pltglot[]
 	 * array entries.
 	 * Each PLT entry jumps to PLT0 to enter the dynamic
 	 * linker.
 	 * Loading an arbitrary 64-bit pointer takes 6
 	 * instructions and 2 registers.
+	 *
 	 * Somehow we need to issue a save to get a new stack
 	 * frame, load the address of the dynamic linker, and
 	 * jump there, in 8 instructions or less.
+	 *
 	 * Oh, we need to fill out both PLT0 and PLT1.
 	 */
+	{
 		Elf_Word *entry = (Elf_Word *)obj->pltgot;
 		/* Install in entries 0 and 1 */
 		_rtld_install_plt(&entry[0], (Elf_Addr) &_rtld_bind_start_0);
 		_rtld_install_plt(&entry[8], (Elf_Addr) &_rtld_bind_start_1);
 		/*
 		 * Install the object reference in first slot
 		 * of entry 2.
 		 */
 		obj->pltgot[8] = (Elf_Addr) obj;
+	}
+}
 void
 _rtld_relocate_nonplt_self(Elf_Dyn *dynp, Elf_Addr relocbase)
+{
 	const Elf_Rela *rela = 0, *relalim;
 	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;
 	for (rela = obj->rela; rela < obj->relalim; rela++) {
 		Elf_Addr *where;
 		Elf_Word type;
 		Elf_Addr value = 0, mask;
 		unsigned long	 symnum;
 		where = (Elf_Addr *) (obj->relocbase + rela->r_offset);
 		symnum = ELF_R_SYM(rela->r_info);
 		type = ELF_R_TYPE(rela->r_info);
 		if (type == R_TYPE(NONE))
 			continue;
 		/* We do JMP_SLOTs in _rtld_bind() below */
 		if (type == R_TYPE(JMP_SLOT))
 			continue;
 		/* COPY relocs are also handled elsewhere */
 		if (type == R_TYPE(COPY))
 			continue;
 		/*
 		 * We use the fact that relocation types are an `enum'
 		 * Note: R_SPARC_UA16 is currently numerically largest.
 		 */
 		if (type > R_TYPE(UA16))
 			return (-1);
 		value = rela->r_addend;
 		/*
 		 * Handle relative relocs here, as an optimization.
 		 */
 		if (type == R_TYPE(RELATIVE)) {
 			*where = (Elf_Addr)(obj->relocbase + value);
 			rdbg(("RELATIVE in %s --> %p", obj->path,
 			    (void *)*where));
 			continue;
+		}
 		if (RELOC_RESOLVE_SYMBOL(type)) {
 			/* Find the symbol */
 			def = _rtld_find_symdef(symnum, obj, &defobj,
 			    false);
 			if (def == NULL)
 				return -1;
 			/* Add in the symbol's absolute address */
 			value += (Elf_Addr)(defobj->relocbase + def->st_value);
+		}
 		if (RELOC_PC_RELATIVE(type)) {
 			value -= (Elf_Addr)where;
+		}
 		if (RELOC_BASE_RELATIVE(type)) {
 			/*
 			 * Note that even though sparcs use `Elf_rela'
 			 * exclusively we still need the implicit memory addend
 			 * in relocations referring to GOT entries.
 			 * Undoubtedly, someone f*cked this up in the distant
 			 * past, and now we're stuck with it in the name of
 			 * compatibility for all eternity..
+			 *
 			 * In any case, the implicit and explicit should be
 			 * mutually exclusive. We provide a check for that
 			 * here.
 			 */
 #ifdef DIAGNOSTIC
 			if (value != 0 && *where != 0) {
 				xprintf("BASE_REL(%s): where=%p, *where 0x%lx, "
 					"addend=0x%lx, base %p\n",
 					obj->path, where, *where,
 					rela->r_addend, obj->relocbase);
+			}
 #endif
 			/* XXXX -- apparently we ignore the preexisting value */
 			value += (Elf_Addr)(obj->relocbase);
+		}
 		mask = RELOC_VALUE_BITMASK(type);
 		value >>= RELOC_VALUE_RIGHTSHIFT(type);
 		value &= mask;
 		if (RELOC_UNALIGNED(type)) {
 			/* Handle unaligned relocations. */
 			Elf_Addr tmp = 0;
 			char *ptr = (char *)where;
 			int i, size = RELOC_TARGET_SIZE(type)/8;
 			/* Read it in one byte at a time. */
 			for (i=0; i<size; i++)
 				tmp = (tmp << 8) | ptr[i];
 			tmp &= ~mask;
 			tmp |= value;
 			/* Write it back out. */
 			for (i=0; i<size; i++)
 				ptr[i] = ((tmp >> (8*i)) & 0xff);
 #ifdef RTLD_DEBUG_RELOC
 			value = (Elf_Addr)tmp;
 #endif
 		} else if (RELOC_TARGET_SIZE(type) > 32) {
 			*where &= ~mask;
 			*where |= value;
 #ifdef RTLD_DEBUG_RELOC
 			value = (Elf_Addr)*where;
 #endif
 		} else {
 			Elf32_Addr *where32 = (Elf32_Addr *)where;
 			*where32 &= ~mask;
 			*where32 |= value;
 #ifdef RTLD_DEBUG_RELOC
 			value = (Elf_Addr)*where32;
 #endif
+		}
 #ifdef RTLD_DEBUG_RELOC
 		if (RELOC_RESOLVE_SYMBOL(type)) {
 			rdbg(("%s %s in %s --> %p in %s", reloc_names[type],
 			    obj->strtab + obj->symtab[symnum].st_name,
 			    obj->path, (void *)value, defobj->path));
 		} else {
 			rdbg(("%s in %s --> %p", reloc_names[type],
 			    obj->path, (void *)value));
+		}
 #endif
+	}
 	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 = obj->pltrela + reloff;
 	Elf_Addr result;
 	int err;
 	result = 0;	/* XXX gcc */
 	if (ELF_R_TYPE(obj->pltrela->r_info) == R_TYPE(JMP_SLOT)) {
 		/*
 		 * XXXX
+		 *
 		 * The first four PLT entries are reserved.  There is some
 		 * disagreement whether they should have associated relocation
 		 * entries.  Both the SPARC 32-bit and 64-bit ELF
 		 * specifications say that they should have relocation entries,
 		 * but the 32-bit SPARC binutils do not generate them, and now
 		 * the 64-bit SPARC binutils have stopped generating them too.
+		 *
 		 * So, to provide binary compatibility, we will check the first
 		 * entry, if it is reserved it should not be of the type
 		 * JMP_SLOT.  If it is JMP_SLOT, then the 4 reserved entries
 		 * were not generated and our index is 4 entries too far.
 		 */
 		rela -= 4;
+	}
 	err = _rtld_relocate_plt_object(obj, rela, &result);
 	if (err || result == 0)
 		_rtld_die();
 	return (caddr_t)result;
+}
 int
 _rtld_relocate_plt_objects(const Obj_Entry *obj)
+{
 	const Elf_Rela *rela;
 	rela = obj->pltrela;
 	/*
 	 * Check for first four reserved entries - and skip them.
 	 * See above for details.
 	 */
 	if (ELF_R_TYPE(obj->pltrela->r_info) != R_TYPE(JMP_SLOT))
 		rela += 4;
 	for (; rela < obj->pltrelalim; rela++)
 		if (_rtld_relocate_plt_object(obj, rela, NULL) < 0)
 			return -1;
 	return 0;
+}
 /*
  * New inline function that is called by _rtld_relocate_plt_object and
  * _rtld_bind
  */
 static inline int
 _rtld_relocate_plt_object(const Obj_Entry *obj, const Elf_Rela *rela, Elf_Addr *tp)
+{
 	Elf_Word *where = (Elf_Word *)(obj->relocbase + rela->r_offset);
 	const Elf_Sym *def;
 	const Obj_Entry *defobj;
 	Elf_Addr value, offset;
 	/* Fully resolve procedure addresses now */
 	assert(ELF_R_TYPE(rela->r_info) == R_TYPE(JMP_SLOT));
 	def = _rtld_find_symdef(ELF_R_SYM(rela->r_info), obj, &defobj, true);
 	if (def == NULL)
 		return -1;
 	value = (Elf_Addr)(defobj->relocbase + def->st_value);
 	rdbg(("bind now/fixup in %s --> new=%p",
 	    defobj->strtab + def->st_name, (void *)value));
 	/*
 	 * At the PLT entry pointed at by `where', we now construct
 	 * a direct transfer to the now fully resolved function
 	 * address.
+	 *
 	 * A PLT entry is supposed to start by looking like this:
+	 *
 	 *	sethi	%hi(. - .PLT0), %g1
 	 *	ba,a	%xcc, .PLT1
 	 *	nop
 	 *	nop
 	 *	nop
 	 *	nop
 	 *	nop
 	 *	nop
+	 *
 	 * When we replace these entries we start from the second
 	 * entry and do it in reverse order so the last thing we
 	 * do is replace the branch.  That allows us to change this
 	 * atomically.
+	 *
 	 * We now need to find out how far we need to jump.  We
 	 * have a choice of several different relocation techniques
 	 * which are increasingly expensive.
 	 */
 	offset = ((Elf_Addr)where) - value;
 	if (rela->r_addend) {
 		Elf_Addr *ptr = (Elf_Addr *)where;
 		/*
 		 * This entry is >=32768.  The relocations points to a
 		 * PC-relative pointer to the bind_0 stub at the top of the
 		 * PLT section.  Update it to point to the target function.
 		 */
 		ptr[0] += value - (Elf_Addr)obj->pltgot;
 	} else if (offset <= (1L<<20) && offset >= -(1L<<20)) {
 		/*
 		 * We're within 1MB -- we can use a direct branch insn.
+		 *
 		 * We can generate this pattern:
+		 *
 		 *	sethi	%hi(. - .PLT0), %g1
 		 *	ba,a	%xcc, addr
 		 *	nop
 		 *	nop
 		 *	nop
 		 *	nop
 		 *	nop
 		 *	nop
+		 *
 		 */
 		where[1] = BAA | ((offset >> 2) &0x3fffff);
 		__asm volatile("iflush %0+4" : : "r" (where));
 	} else if (value >= 0 && value < (1L<<32)) {
 		/*
 		 * We're within 32-bits of address zero.
+		 *
 		 * The resulting code in the jump slot is:
+		 *
 		 *	sethi	%hi(. - .PLT0), %g1
 		 *	sethi	%hi(addr), %g1
 		 *	jmp	%g1+%lo(addr)
 		 *	nop
 		 *	nop
 		 *	nop
 		 *	nop
 		 *	nop
+		 *
 		 */
 		where[2] = JMP   | LOVAL(value, 0);
 		where[1] = SETHI | HIVAL(value, 10);
 		__asm volatile("iflush %0+8" : : "r" (where));
 		__asm volatile("iflush %0+4" : : "r" (where));
 	} else if (value <= 0 && value > -(1L<<32)) {
 		/*
 		 * We're within 32-bits of address -1.
+		 *
 		 * The resulting code in the jump slot is:
+		 *
 		 *	sethi	%hi(. - .PLT0), %g1
 		 *	sethi	%hix(addr), %g1
 		 *	xor	%g1, %lox(addr), %g1
 		 *	jmp	%g1
 		 *	nop
 		 *	nop
 		 *	nop
 		 *	nop
+		 *
 		 */
 		where[3] = JMP;
 		where[2] = XOR | ((~value) & 0x00001fff);
 		where[1] = SETHI | HIVAL(~value, 10);
 		__asm volatile("iflush %0+12" : : "r" (where));
 		__asm volatile("iflush %0+8" : : "r" (where));
 		__asm volatile("iflush %0+4" : : "r" (where));
 	} else if (offset <= (1L<<32) && offset >= -((1L<<32) - 4)) {
 		/*
 		 * We're within 32-bits -- we can use a direct call insn
+		 *
 		 * The resulting code in the jump slot is:
+		 *
 		 *	sethi	%hi(. - .PLT0), %g1
 		 *	mov	%o7, %g1
 		 *	call	(.+offset)
 		 *	 mov	%g1, %o7
 		 *	nop
 		 *	nop
 		 *	nop
 		 *	nop
+		 *
 		 */
 		where[3] = MOV17;
 		where[2] = CALL	  | ((offset >> 4) & 0x3fffffff);
 		where[1] = MOV71;
 		__asm volatile("iflush %0+12" : : "r" (where));
 		__asm volatile("iflush %0+8" : : "r" (where));
 		__asm volatile("iflush %0+4" : : "r" (where));
 	} else if (offset >= 0 && offset < (1L<<44)) {
 		/*
 		 * We're within 44 bits.  We can generate this pattern:
+		 *
 		 * The resulting code in the jump slot is:
+		 *
 		 *	sethi	%hi(. - .PLT0), %g1
 		 *	sethi	%h44(addr), %g1
 		 *	or	%g1, %m44(addr), %g1
 		 *	sllx	%g1, 12, %g1
 		 *	jmp	%g1+%l44(addr)
 		 *	nop
 		 *	nop
 		 *	nop
+		 *
 		 */
 		where[4] = JMP   | LOVAL(offset, 0);
 		where[3] = SLLX  | 12;
 		where[2] = OR    | (((offset) >> 12) & 0x00001fff);
 		where[1] = SETHI | HIVAL(offset, 22);
 		__asm volatile("iflush %0+16" : : "r" (where));
 		__asm volatile("iflush %0+12" : : "r" (where));
 		__asm volatile("iflush %0+8" : : "r" (where));
 		__asm volatile("iflush %0+4" : : "r" (where));
 	} else if (offset < 0 && offset > -(1L<<44)) {
 		/*
 		 * We're within 44 bits.  We can generate this pattern:
+		 *
 		 * The resulting code in the jump slot is:
+		 *
 		 *	sethi	%hi(. - .PLT0), %g1
 		 *	sethi	%h44(-addr), %g1
 		 *	xor	%g1, %m44(-addr), %g1
 		 *	sllx	%g1, 12, %g1
 		 *	jmp	%g1+%l44(addr)
 		 *	nop
 		 *	nop
 		 *	nop
+		 *
 		 */
 		where[4] = JMP   | LOVAL(offset, 0);
 		where[3] = SLLX  | 12;
 		where[2] = XOR   | (((~offset) >> 12) & 0x00001fff);
 		where[1] = SETHI | HIVAL(~offset, 22);
 		__asm volatile("iflush %0+16" : : "r" (where));
 		__asm volatile("iflush %0+12" : : "r" (where));
 		__asm volatile("iflush %0+8" : : "r" (where));
 		__asm volatile("iflush %0+4" : : "r" (where));
 	} else {
 		/*
 		 * We need to load all 64-bits
+		 *
 		 * The resulting code in the jump slot is:
+		 *
 		 *	sethi	%hi(. - .PLT0), %g1
 		 *	sethi	%hh(addr), %g1
 		 *	sethi	%lm(addr), %g5
 		 *	or	%g1, %hm(addr), %g1
 		 *	sllx	%g1, 32, %g1
 		 *	or	%g1, %g5, %g1
 		 *	jmp	%g1+%lo(addr)
 		 *	nop
+		 *
 		 */
 		where[6] = JMP     | LOVAL(value, 0);
 		where[5] = ORG5;
 		where[4] = SLLX    | 32;
 		where[3] = OR      | LOVAL(value, 32);
 		where[2] = SETHIG5 | HIVAL(value, 10);
 		where[1] = SETHI   | HIVAL(value, 42);
 		__asm volatile("iflush %0+24" : : "r" (where));
 		__asm volatile("iflush %0+20" : : "r" (where));
 		__asm volatile("iflush %0+16" : : "r" (where));
 		__asm volatile("iflush %0+12" : : "r" (where));
 		__asm volatile("iflush %0+8" : : "r" (where));
 		__asm volatile("iflush %0+4" : : "r" (where));
+	}
 	if (tp)
 		*tp = value;
 	return 0;
+}

 @@ -1,205 +1,205 @@
-/*	$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 *);
 void
 _rtld_setup_pltgot(const Obj_Entry *obj)
+{
 	obj->pltgot[1] = (Elf_Addr) obj;
 	obj->pltgot[2] = (Elf_Addr) &_rtld_bind_start;
+}
 void
 _rtld_relocate_nonplt_self(Elf_Dyn *dynp, Elf_Addr relocbase)
+{
 	const Elf_Rela *rela = 0, *relalim;
 	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;
 		const Elf_Sym   *def;
 		const Obj_Entry *defobj;
 		Elf_Addr         tmp;
 		unsigned long	 symnum;
 		where = (Elf_Addr *)(obj->relocbase + rela->r_offset);
 		symnum = ELF_R_SYM(rela->r_info);
 		switch (ELF_R_TYPE(rela->r_info)) {
 		case R_TYPE(NONE):
 			break;
 		case R_TYPE(32):	/* word32 S + A */
 		case R_TYPE(GLOB_DAT):	/* word32 S + A */
 			def = _rtld_find_symdef(symnum, obj, &defobj, false);
 			if (def == NULL)
 				return -1;
 			tmp = (Elf_Addr)(defobj->relocbase + def->st_value +
 			    rela->r_addend);
 			if (*where != tmp)
 				*where = tmp;
 			rdbg(("32/GLOB_DAT %s in %s --> %p in %s",
 			    obj->strtab + obj->symtab[symnum].st_name,
 			    obj->path, (void *)*where, defobj->path));
 			break;
 		case R_TYPE(RELATIVE):	/* word32 B + A */
 			tmp = (Elf_Addr)(obj->relocbase + rela->r_addend);
 			if (*where != tmp)
 				*where = tmp;
 			rdbg(("RELATIVE in %s --> %p", obj->path,
 			    (void *)*where));
 			break;
 		case R_TYPE(COPY):
 			/*
 			 * These are deferred until all other relocations have
 			 * been done.  All we do here is make sure that the
 			 * COPY relocation is not in a shared library.  They
 			 * are allowed only in executable files.
 			 */
 			if (obj->isdynamic) {
 				_rtld_error(
 			"%s: Unexpected R_COPY relocation in shared library",
 				    obj->path);
 				return -1;
+			}
 			rdbg(("COPY (avoid in main)"));
 			break;
 		default:
 			rdbg(("sym = %lu, type = %lu, offset = %p, "
 			    "addend = %p, contents = %p, symbol = %s",
 			    symnum, (u_long)ELF_R_TYPE(rela->r_info),
 			    (void *)rela->r_offset, (void *)rela->r_addend,
 			    (void *)*where,
 			    obj->strtab + obj->symtab[symnum].st_name));
 			_rtld_error("%s: Unsupported relocation type %ld "
 			    "in non-PLT relocations\n",
 			    obj->path, (u_long) ELF_R_TYPE(rela->r_info));
 			return -1;
+		}
+	}
 	return 0;
+}
 int
 _rtld_relocate_plt_lazy(const Obj_Entry *obj)
+{
 	const Elf_Rela *rela;
 	if (!obj->relocbase)
 		return 0;
 	for (rela = obj->pltrela; rela < obj->pltrelalim; rela++) {
 		Elf_Addr *where = (Elf_Addr *)(obj->relocbase + rela->r_offset);
 		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;
+}
 static inline int
 _rtld_relocate_plt_object(const Obj_Entry *obj, const Elf_Rela *rela, Elf_Addr *tp)
+{
 	Elf_Addr *where = (Elf_Addr *)(obj->relocbase + rela->r_offset);
 	Elf_Addr new_value;
 	const Elf_Sym  *def;
 	const Obj_Entry *defobj;
 	assert(ELF_R_TYPE(rela->r_info) == R_TYPE(JMP_SLOT));
 	def = _rtld_find_symdef(ELF_R_SYM(rela->r_info), obj, &defobj, true);
 	if (def == NULL)
 		return -1;
 	new_value = (Elf_Addr)(defobj->relocbase + def->st_value +
 	    rela->r_addend);
 	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 - 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
 _rtld_relocate_plt_objects(const Obj_Entry *obj)
+{
 	const Elf_Rela *rela;
 	for (rela = obj->pltrela; rela < obj->pltrelalim; rela++)
 		if (_rtld_relocate_plt_object(obj, rela, NULL) < 0)
 			return -1;
 	return 0;
+}