 @@ -1,14 +1,14 @@
-/*	$NetBSD: alpha_reloc.c,v 1.35 2010/01/14 11:57:06 skrll Exp $	*/
+/*	$NetBSD: alpha_reloc.c,v 1.36 2010/01/14 11:58:31 skrll Exp $	*/
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Jason R. Thorpe for Wasabi Systems, Inc.
+ *
  * 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
 @@ -52,27 +52,27 @@
  * 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 AUTHOR 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: alpha_reloc.c,v 1.35 2010/01/14 11:57:06 skrll Exp $");
+__RCSID("$NetBSD: alpha_reloc.c,v 1.36 2010/01/14 11:58:31 skrll Exp $");
 #endif /* not lint */
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <string.h>
 #include "rtld.h"
 #include "debug.h"
 #ifdef RTLD_DEBUG_ALPHA
 #define	adbg(x)		xprintf x
 #else
 #define	adbg(x)		/* nothing */
 @@ -290,27 +290,28 @@ _rtld_relocate_plt_lazy(const Obj_Entry
 		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)
+_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;
 	Elf_Addr stubaddr;
 	unsigned long info = rela->r_info;
 	assert(ELF_R_TYPE(info) == R_TYPE(JMP_SLOT));
 	def = _rtld_find_plt_symdef(ELF_R_SYM(info), obj, &defobj, tp != NULL);
 	if (__predict_false(def == NULL))
 		return -1;

 @@ -1,18 +1,18 @@
-/*	$NetBSD: mdreloc.c,v 1.30 2010/01/13 22:34:07 skrll Exp $	*/
+/*	$NetBSD: mdreloc.c,v 1.31 2010/01/14 11:58:32 skrll Exp $	*/
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: mdreloc.c,v 1.30 2010/01/13 22:34:07 skrll Exp $");
+__RCSID("$NetBSD: mdreloc.c,v 1.31 2010/01/14 11:58:32 skrll 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);
 void
 @@ -178,27 +178,28 @@ _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 *)target));
 	if (*where != target)
 		*where = target;
 	if (tp)
 		*tp = target;
 	return 0;
+}
 caddr_t
 _rtld_bind(const Obj_Entry *obj, Elf_Word reloff)
+{
-	const Elf_Rel *rel = (const Elf_Rel *)((const uint8_t *)obj->pltrel + reloff);
+	const Elf_Rel *rel = (const Elf_Rel *)((const uint8_t *)obj->pltrel
 	    + reloff);
 	Elf_Addr new_value;
 	int err;
 	new_value = 0;	/* XXX gcc */
 	err = _rtld_relocate_plt_object(obj, rel, &new_value);
 	if (err)
 		_rtld_die();
 	return (caddr_t)new_value;
+}
 int

 @@ -1,23 +1,23 @@
-/*	$NetBSD: mdreloc.c,v 1.25 2010/01/13 20:17:22 christos Exp $	*/
+/*	$NetBSD: mdreloc.c,v 1.26 2010/01/14 11:58:32 skrll Exp $	*/
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: mdreloc.c,v 1.25 2010/01/13 20:17:22 christos Exp $");
+__RCSID("$NetBSD: mdreloc.c,v 1.26 2010/01/14 11:58:32 skrll Exp $");
 #endif /* not lint */
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: mdreloc.c,v 1.25 2010/01/13 20:17:22 christos Exp $");
+__RCSID("$NetBSD: mdreloc.c,v 1.26 2010/01/14 11:58:32 skrll 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 *);
 @@ -155,27 +155,28 @@ _rtld_relocate_plt_lazy(const Obj_Entry
 		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)
+_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;
 	unsigned long info = rela->r_info;
 	assert(ELF_R_TYPE(info) == R_TYPE(JMP_SLOT));
 	def = _rtld_find_plt_symdef(ELF_R_SYM(info), obj, &defobj, tp != NULL);
 	if (__predict_false(def == NULL))
 		return -1;
 	if (__predict_false(def == &_rtld_sym_zero))