 @@ -1,14 +1,14 @@
-#	$NetBSD: Makefile,v 1.110 2011/10/07 09:15:21 mrg Exp $
+#	$NetBSD: Makefile,v 1.110.6.1 2013/01/22 21:47:27 matt Exp $
+#
 # NOTE: when changing ld.so, ensure that ldd still compiles.
+#
 WARNS?=4
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
 .include <${BSD_MK_COMPAT_FILE}>
 .endif
 # We are not building this with PIE
 PIE_CFLAGS=
 @@ -33,27 +33,27 @@ M=		${.CURDIR}/arch/${ARCHSUBDIR}
      (${MACHINE_ARCH} == "powerpc") ||					\
      (${MACHINE_CPU} == "sh3") ||					\
      (${MACHINE_ARCH} == "sparc") ||					\
      (${MACHINE_ARCH} == "sparc64") ||					\
      (${MACHINE_ARCH} == "x86_64") ||					\
      (${MACHINE_ARCH} == "vax")) &&					\
     ${MKPIC} != "no"
 LDFLAGS+=	${${ACTIVE_CC} == "clang":? -Wl,-Bsymbolic : -symbolic} \
 		-shared -nostartfiles -nodefaultlibs
 LDFLAGS+=	-Wl,-static
 LDFLAGS+=	-Wl,--warn-shared-textrel
-CFLAGS+=	-fvisibility=hidden
+COPTS+=		-fvisibility=hidden
 # Adds SRCS, CPPFLAGS, LDFLAGS, etc.  Must go first so MD startup source
 # is first.
 .if exists($M/Makefile.inc)
 .include "$M/Makefile.inc"
 .endif
 # Support compat ld.elf_so.
 .if defined(MLIBDIR)
 PROG=		ld.elf_so-${MLIBDIR}
 CPPFLAGS+=	-DRTLD_ARCH_SUBDIR=\"${MLIBDIR}\"
 .else
 PROG=		ld.elf_so
 @@ -82,30 +82,30 @@ xprintf.c: errlist_concat.h
 CLEANFILES+=	errlist_concat.h
 BINDIR=		${SHLINKINSTALLDIR}
 CPPFLAGS+=	-DLIBDIR=\"${LIBDIR}\" -D_PATH_RTLD=\"${BINDIR}/${PROG}\"
 CPPFLAGS+=	-I${.CURDIR} -I.
 CPPFLAGS+=	-DRTLD_LOADER
 CPPFLAGS+=	-D_RTLD_SOURCE
 CPPFLAGS+=	-DCOMBRELOC
 #CPPFLAGS+=	-DDEBUG
 #CPPFLAGS+=	-DRTLD_DEBUG
 #CPPFLAGS+=	-DRTLD_DEBUG_RELOC
 #DBG=		-g
-DBG=		-O3 -fomit-frame-pointer
+COPTS=		-O3 -fomit-frame-pointer
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
-DBG+=		-mno-3dnow -mno-mmx -mno-sse -mno-sse2 -mno-sse3
+COPTS+=		-mno-3dnow -mno-mmx -mno-sse -mno-sse2 -mno-sse3
 .endif
 .if ${SHLIBDIR} != ${LIBDIR}
 CPPFLAGS+=	-DRTLD_DEFAULT_LIBRARY_PATH=\"${SHLIBDIR}:${LIBDIR}\"
 .endif
 # rtld.c and symbol.c use alloca, so disable SSP warnings.
 COPTS.rtld.c+=	-Wno-stack-protector
 COPTS.symbol.c+=-Wno-stack-protector
 LDADD+=		-L${CLIBOBJ} -L${DESTDIR}${LIBDIR}
 .if ${MKPICLIB} != "no"

 @@ -1,14 +1,14 @@
-/*	$NetBSD: headers.c,v 1.41.4.1 2012/08/08 06:24:51 jdc Exp $	 */
+/*	$NetBSD: headers.c,v 1.41.4.1.2.1 2013/01/22 21:47:27 matt Exp $	 */
 /*
  * Copyright 1996 John D. Polstra.
  * Copyright 1996 Matt Thomas <matt@3am-software.com>
  * Copyright 2002 Charles M. Hannum <root@ihack.net>
  * All rights reserved.
+ *
  * 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
 @@ -30,27 +30,27 @@
  * 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.
  */
 /*
  * Dynamic linker for ELF.
+ *
  * John Polstra <jdp@polstra.com>.
  */
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: headers.c,v 1.41.4.1 2012/08/08 06:24:51 jdc Exp $");
+__RCSID("$NetBSD: headers.c,v 1.41.4.1.2.1 2013/01/22 21:47:27 matt Exp $");
 #endif /* not lint */
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/mman.h>
 #include <sys/bitops.h>
 @@ -217,30 +217,52 @@ _rtld_digest_dynamic(const char *execnam
 			 * table yet.
 		         */
 			dyn_rpath = dynp;
 			break;
 		case DT_SONAME:
 			/* Not used by the dynamic linker. */
 			break;
 		case DT_INIT:
 			init = dynp->d_un.d_ptr;
 			break;
 #ifdef HAVE_INITFINI_ARRAY
 		case DT_INIT_ARRAY:
 			obj->init_array =
 			    (fptr_t *)(obj->relocbase + dynp->d_un.d_ptr);
 			break;
 		case DT_INIT_ARRAYSZ:
 			obj->init_arraysz = dynp->d_un.d_val / sizeof(fptr_t);
 			break;
 #endif
 		case DT_FINI:
 			fini = dynp->d_un.d_ptr;
 			break;
 #ifdef HAVE_INITFINI_ARRAY
 		case DT_FINI_ARRAY:
 			obj->fini_array =
 			    (fptr_t *)(obj->relocbase + dynp->d_un.d_ptr);
 			break;
 		case DT_FINI_ARRAYSZ:
 			obj->fini_arraysz = dynp->d_un.d_val / sizeof(fptr_t);
 			break;
 #endif
 		/*
 		 * Don't process DT_DEBUG on MIPS as the dynamic section
 		 * is mapped read-only. DT_MIPS_RLD_MAP is used instead.
 		 * XXX: n32/n64 may use DT_DEBUG, not sure yet.
 		 */
 #ifndef __mips__
 		case DT_DEBUG:
 #ifdef RTLD_LOADER
 			dynp->d_un.d_ptr = (Elf_Addr)&_rtld_debug;
 #endif
 			break;
 #endif

 @@ -1,14 +1,14 @@
-/*	$NetBSD: rtld.c,v 1.155 2011/11/25 21:27:15 joerg Exp $	 */
+/*	$NetBSD: rtld.c,v 1.155.4.1 2013/01/22 21:47:28 matt Exp $	 */
 /*
  * Copyright 1996 John D. Polstra.
  * Copyright 1996 Matt Thomas <matt@3am-software.com>
  * Copyright 2002 Charles M. Hannum <root@ihack.net>
  * All rights reserved.
+ *
  * 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
 @@ -30,27 +30,27 @@
  * 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.
  */
 /*
  * Dynamic linker for ELF.
+ *
  * John Polstra <jdp@polstra.com>.
  */
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: rtld.c,v 1.155 2011/11/25 21:27:15 joerg Exp $");
+__RCSID("$NetBSD: rtld.c,v 1.155.4.1 2013/01/22 21:47:28 matt Exp $");
 #endif /* not lint */
 #include <sys/param.h>
 #include <sys/atomic.h>
 #include <sys/mman.h>
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <lwp.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 @@ -124,146 +124,180 @@ extern Elf_Dyn  _DYNAMIC;
 static void _rtld_call_fini_functions(sigset_t *, int);
 static void _rtld_call_init_functions(sigset_t *);
 static void _rtld_initlist_visit(Objlist *, Obj_Entry *, int);
 static void _rtld_initlist_tsort(Objlist *, int);
 static Obj_Entry *_rtld_dlcheck(void *);
 static void _rtld_init_dag(Obj_Entry *);
 static void _rtld_init_dag1(Obj_Entry *, Obj_Entry *);
 static void _rtld_objlist_remove(Objlist *, Obj_Entry *);
 static void _rtld_objlist_clear(Objlist *);
 static void _rtld_unload_object(sigset_t *, Obj_Entry *, bool);
 static void _rtld_unref_dag(Obj_Entry *);
 static Obj_Entry *_rtld_obj_from_addr(const void *);
 static inline void
 _rtld_call_initfini_function(fptr_t func, sigset_t *mask)
+{
 	_rtld_exclusive_exit(mask);
 	(*func)();
 	_rtld_exclusive_enter(mask);
+}
 static void
 _rtld_call_fini_function(Obj_Entry *obj, sigset_t *mask, u_int cur_objgen)
+{
 	if (obj->fini_arraysz == 0 && (obj->fini == NULL || obj->fini_called)) {
 		    	return;
+	}
 	if (obj->fini != NULL && !obj->fini_called) {
 		dbg (("calling fini function %s at %p%s", obj->path,
 		    (void *)obj->fini,
 		    obj->z_initfirst ? " (DF_1_INITFIRST)" : ""));
 		obj->fini_called = 1;
 		_rtld_call_initfini_function(obj->fini, mask);
+	}
 #ifdef HAVE_INITFINI_ARRAY
 	/*
 	 * Now process the fini_array if it exists.  Simply go from
 	 * start to end.  We need to make restartable so just advance
 	 * the array pointer and decrement the size each time through
 	 * the loop.
 	 */
 	while (obj->fini_arraysz > 0 && _rtld_objgen == cur_objgen) {
 		fptr_t fini = *obj->fini_array++;
 		obj->fini_arraysz--;
 		dbg (("calling fini array function %s at %p%s", obj->path,
 		    (void *)fini,
 		    obj->z_initfirst ? " (DF_1_INITFIRST)" : ""));
 		_rtld_call_initfini_function(fini, mask);
+	}
 #endif /* HAVE_INITFINI_ARRAY */
+}
 static void
 _rtld_call_fini_functions(sigset_t *mask, int force)
+{
 	Objlist_Entry *elm;
 	Objlist finilist;
 	Obj_Entry *obj;
 	void (*fini)(void);
 	u_int cur_objgen;
 	dbg(("_rtld_call_fini_functions(%d)", force));
 restart:
 	cur_objgen = ++_rtld_objgen;
 	SIMPLEQ_INIT(&finilist);
 	_rtld_initlist_tsort(&finilist, 1);
 	/* First pass: objects _not_ marked with DF_1_INITFIRST. */
 	SIMPLEQ_FOREACH(elm, &finilist, link) {
-		obj = elm->obj;
+		Obj_Entry * const obj = elm->obj;
-		if (obj->refcount > 0 && !force) {
+		if (!obj->z_initfirst) {
-			continue;
+			if (obj->refcount > 0 && !force) {
 				continue;
 		if (obj->fini == NULL || obj->fini_called || obj->z_initfirst) {
-		    	continue;
+			/*
 			 * XXX This can race against a concurrent dlclose().
 			 * XXX In that case, the object could be unmapped before
 			 * XXX the fini() call or the fini_array has completed.
 			 */
 			_rtld_call_fini_function(obj, mask, cur_objgen);
 			if (_rtld_objgen != cur_objgen) {
 				dbg(("restarting fini iteration"));
 				_rtld_objlist_clear(&finilist);
 				goto restart;
+		}
 		dbg (("calling fini function %s at %p",  obj->path,
 		    (void *)obj->fini));
 		obj->fini_called = 1;
 		/*
 		 * XXX This can race against a concurrent dlclose().
 		 * XXX In that case, the object could be unmapped before
 		 * XXX the fini() call is done.
 		 */
 		fini = obj->fini;
 		_rtld_exclusive_exit(mask);
 		(*fini)();
 		_rtld_exclusive_enter(mask);
 		if (_rtld_objgen != cur_objgen) {
 			dbg(("restarting fini iteration"));
 			_rtld_objlist_clear(&finilist);
 			goto restart;
+		}
+	}
 	/* Second pass: objects marked with DF_1_INITFIRST. */
 	SIMPLEQ_FOREACH(elm, &finilist, link) {
-		obj = elm->obj;
+		Obj_Entry * const obj = elm->obj;
 		if (obj->refcount > 0 && !force) {
 			continue;
+		}
 		if (obj->fini == NULL || obj->fini_called) {
 		    	continue;
 		dbg (("calling fini function %s at %p (DF_1_INITFIRST)",
 		    obj->path, (void *)obj->fini));
 		obj->fini_called = 1;
 		/* XXX See above for the race condition here */
-		fini = obj->fini;
+		_rtld_call_fini_function(obj, mask, cur_objgen);
 		_rtld_exclusive_exit(mask);
 		(*fini)();
 		_rtld_exclusive_enter(mask);
 		if (_rtld_objgen != cur_objgen) {
 			dbg(("restarting fini iteration"));
 			_rtld_objlist_clear(&finilist);
 			goto restart;
+		}
+	}
         _rtld_objlist_clear(&finilist);
+}
 static void
 _rtld_call_init_function(Obj_Entry *obj, sigset_t *mask, u_int cur_objgen)
+{
 	if (obj->init_arraysz == 0 && (obj->init_called || obj->init == NULL)) {
 		return;
+	}
 	if (!obj->init_called && obj->init != NULL) {
 		dbg (("calling init function %s at %p%s",
 		    obj->path, (void *)obj->init,
 		    obj->z_initfirst ? " (DF_1_INITFIRST)" : ""));
 		obj->init_called = 1;
 		_rtld_call_initfini_function(obj->init, mask);
+	}
 #ifdef HAVE_INITFINI_ARRAY
 	/*
 	 * Now process the init_array if it exists.  Simply go from
 	 * start to end.  We need to make restartable so just advance
 	 * the array pointer and decrement the size each time through
 	 * the loop.
 	 */
 	while (obj->init_arraysz > 0 && _rtld_objgen == cur_objgen) {
 		fptr_t init = *obj->init_array++;
 		obj->init_arraysz--;
 		dbg (("calling init_array function %s at %p%s",
 		    obj->path, (void *)init,
 		    obj->z_initfirst ? " (DF_1_INITFIRST)" : ""));
 		_rtld_call_initfini_function(init, mask);
+	}
 #endif /* HAVE_INITFINI_ARRAY */
+}
 static void
 _rtld_call_init_functions(sigset_t *mask)
+{
 	Objlist_Entry *elm;
 	Objlist initlist;
 	Obj_Entry *obj;
 	void (*init)(void);
 	u_int cur_objgen;
 	dbg(("_rtld_call_init_functions()"));
 restart:
 	cur_objgen = ++_rtld_objgen;
 	SIMPLEQ_INIT(&initlist);
 	_rtld_initlist_tsort(&initlist, 0);
 	/* First pass: objects marked with DF_1_INITFIRST. */
 	SIMPLEQ_FOREACH(elm, &initlist, link) {
-		obj = elm->obj;
+		Obj_Entry * const obj = elm->obj;
-		if (obj->init == NULL || obj->init_called || !obj->z_initfirst) {
+		if (obj->z_initfirst) {
-			continue;
+			_rtld_call_init_function(obj, mask, cur_objgen);
 			if (_rtld_objgen != cur_objgen) {
-		dbg (("calling init function %s at %p (DF_1_INITFIRST)",
+				dbg(("restarting init iteration"));
-		    obj->path, (void *)obj->init));
+				_rtld_objlist_clear(&initlist);
-		obj->init_called = 1;
+				goto restart;
 		init = obj->init;
 		_rtld_exclusive_exit(mask);
 		(*init)();
 		_rtld_exclusive_enter(mask);
 		if (_rtld_objgen != cur_objgen) {
 			dbg(("restarting init iteration"));
 			_rtld_objlist_clear(&initlist);
 			goto restart;
+		}
+	}
 	/* Second pass: all other objects. */
 	SIMPLEQ_FOREACH(elm, &initlist, link) {
-		obj = elm->obj;
+		_rtld_call_init_function(elm->obj, mask, cur_objgen);
 		if (obj->init == NULL || obj->init_called) {
 			continue;
 		dbg (("calling init function %s at %p",  obj->path,
 		    (void *)obj->init));
 		obj->init_called = 1;
 		init = obj->init;
 		_rtld_exclusive_exit(mask);
 		(*init)();
 		_rtld_exclusive_enter(mask);
 		if (_rtld_objgen != cur_objgen) {
 			dbg(("restarting init iteration"));
 			_rtld_objlist_clear(&initlist);
 			goto restart;
+		}
+	}
         _rtld_objlist_clear(&initlist);
+}
 /*
  * Initialize the dynamic linker.  The argument is the address at which
  * the dynamic linker has been mapped into memory.  The primary task of

 @@ -1,14 +1,14 @@
-/*	$NetBSD: rtld.h,v 1.107 2011/12/02 09:06:49 skrll Exp $	 */
+/*	$NetBSD: rtld.h,v 1.107.4.1 2013/01/22 21:47:28 matt Exp $	 */
 /*
  * Copyright 1996 John D. Polstra.
  * Copyright 1996 Matt Thomas <matt@3am-software.com>
  * All rights reserved.
+ *
  * 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
 @@ -104,53 +104,54 @@ typedef struct _rtld_search_path_t {
 	size_t          sp_pathlen;
 } Search_Path;
 typedef struct Struct_Ver_Entry {
 	Elf_Word        hash;
 	u_int           flags;
 	const char     *name;
 	const char     *file;
 } Ver_Entry;
 /* Ver_Entry.flags */
 #define VER_INFO_HIDDEN	0x01
 #define RTLD_MAX_ENTRY 10
 #define RTLD_MAX_LIBRARY 4
 #define RTLD_MAX_CTL 2
 typedef struct _rtld_library_xform_t {
 	struct _rtld_library_xform_t *next;
 	char *name;
 	const char *ctlname;
 	struct {
 		char *value;
 		char *library[RTLD_MAX_LIBRARY];
 	} entry[RTLD_MAX_ENTRY];
 } Library_Xform;
 /*
  * Shared object descriptor.
+ *
  * Items marked with "(%)" are dynamically allocated, and must be freed
  * when the structure is destroyed.
+ *
  * The layout of this structure needs to be preserved because pre-2.0 binaries
  * hard-coded the location of dlopen() and friends.
  */
 #define RTLD_MAGIC	0xd550b87a
 #define RTLD_VERSION	1
 typedef void (*fptr_t)(void);
 typedef struct Struct_Obj_Entry {
 	Elf32_Word      magic;		/* Magic number (sanity check) */
 	Elf32_Word      version;	/* Version number of struct format */
 	struct Struct_Obj_Entry *next;
 	char           *path;		/* Pathname of underlying file (%) */
 	int             refcount;
 	int             dl_refcount;	/* Number of times loaded by dlopen */
 	/* These items are computed by map_object() or by digest_phdr(). */
 	caddr_t         mapbase;	/* Base address of mapped region */
 	size_t          mapsize;	/* Size of mapped region in bytes */
 	size_t          textsize;	/* Size of text segment in bytes */
 @@ -178,28 +179,28 @@ typedef struct Struct_Obj_Entry {
 	Elf_Word        local_gotno;	/* Number of local GOT entries */
 	Elf_Word        symtabno;	/* Number of dynamic symbols */
 	Elf_Word        gotsym;		/* First dynamic symbol in GOT */
 #endif
 	const Elf_Symindx *buckets;	/* Hash table buckets array */
 	unsigned long	unused1;	/* Used to be nbuckets */
 	const Elf_Symindx *chains;	/* Hash table chain array */
 	unsigned long   nchains;	/* Number of chains */
 	Search_Path    *rpaths;		/* Search path specified in object */
 	Needed_Entry   *needed;		/* Shared objects needed by this (%) */
-	void            (*init)(void); 	/* Initialization function to call */
+	fptr_t		init;		/* Initialization function to call */
-	void            (*fini)(void);	/* Termination function to call */
+	fptr_t		fini;		/* Termination function to call */
 	/*
 	 * BACKWARDS COMPAT Entry points for dlopen() and friends.
+	 *
 	 * DO NOT MOVE OR ADD TO THE LIST
+	 *
 	 */
 	void           *(*dlopen)(const char *, int);
 	void           *(*dlsym)(void *, const char *);
 	char           *(*dlerror)(void);
 	int             (*dlclose)(void *);
 	int             (*dladdr)(const void *, Dl_info *);
 @@ -267,26 +268,32 @@ typedef struct Struct_Obj_Entry {
 	size_t		tlsalign;	/* Needed alignment for static TLS */
 #endif
 	/* symbol versioning */
 	const Elf_Verneed *verneed;	/* Required versions. */
 	Elf_Word	verneednum;	/* Number of entries in verneed table */
 	const Elf_Verdef  *verdef;	/* Provided versions. */
 	Elf_Word	verdefnum;	/* Number of entries in verdef table */
 	const Elf_Versym *versyms;	/* Symbol versions table */
 	Ver_Entry	*vertab;	/* Versions required/defined by this
 					 * object */
 	int		vertabnum;	/* Number of entries in vertab */
 	/* init_array/fini_array */
 	fptr_t		*init_array;	/* start of init array */
 	size_t		init_arraysz;	/* # of entries in it */
 	fptr_t		*fini_array;	/* start of fini array */
 	size_t		fini_arraysz;	/* # of entries in it */
 } Obj_Entry;
 typedef struct Struct_DoneList {
 	const Obj_Entry **objs;		/* Array of object pointers */
 	unsigned int num_alloc;		/* Allocated size of the array */
 	unsigned int num_used;		/* Number of array slots used */
 } DoneList;
 #if defined(_RTLD_SOURCE)
 extern struct r_debug _rtld_debug;
 extern Search_Path *_rtld_default_paths;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: symbol.c,v 1.59 2011/11/25 14:39:02 joerg Exp $	 */
+/*	$NetBSD: symbol.c,v 1.59.4.1 2013/01/22 21:47:28 matt Exp $	 */
 /*
  * Copyright 1996 John D. Polstra.
  * Copyright 1996 Matt Thomas <matt@3am-software.com>
  * Copyright 2002 Charles M. Hannum <root@ihack.net>
  * All rights reserved.
+ *
  * 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
 @@ -30,47 +30,45 @@
  * 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.
  */
 /*
  * Dynamic linker for ELF.
+ *
  * John Polstra <jdp@polstra.com>.
  */
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: symbol.c,v 1.59 2011/11/25 14:39:02 joerg Exp $");
+__RCSID("$NetBSD: symbol.c,v 1.59.4.1 2013/01/22 21:47:28 matt Exp $");
 #endif /* not lint */
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/mman.h>
 #include <sys/bitops.h>
 #include <dirent.h>
 #include "debug.h"
 #include "rtld.h"
 typedef void (*fptr_t)(void);
 /*
  * If the given object is already in the donelist, return true.  Otherwise
  * add the object to the list and return false.
  */
 static bool
 _rtld_donelist_check(DoneList *dlp, const Obj_Entry *obj)
+{
 	unsigned int i;
 	for (i = 0;  i < dlp->num_used;  i++)
 		if (dlp->objs[i] == obj)
 			return true;
 	/*

 @@ -1,14 +1,14 @@
-/*	$NetBSD: rtld_start.S,v 1.10 2009/11/11 14:15:41 skrll Exp $	*/
+/*	$NetBSD: rtld_start.S,v 1.10.10.1 2013/01/22 21:47:28 matt Exp $	*/
 /*-
  * Copyright (c) 1998, 2002 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Matt Thomas 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,77 +21,76 @@
  * 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 <machine/asm.h>
-RCSID("$NetBSD: rtld_start.S,v 1.10 2009/11/11 14:15:41 skrll Exp $")
+RCSID("$NetBSD: rtld_start.S,v 1.10.10.1 2013/01/22 21:47:28 matt Exp $")
 	.text
 	.align	0
 	.globl	_rtld_start
 	.type	_rtld_start,%function
 _rtld_start:
 	sub	sp, sp, #8		/* make room for obj_main & exit proc */
 	mov	r4, r0			/* save ps_strings */
 	ldr	sl, .L2
 	ldr	r5, .L2+4
 	ldr	r0, .L2+8
 .L1:
 	add	sl, pc, sl
 	ldr	r5, [sl, r5]
 	ldr	r0, [sl, r0]
 	sub	r1, sl, r5		/* relocbase */
 	add	r0, r1, r0		/* &_DYNAMIC */
 	bl	_rtld_relocate_nonplt_self
 	sub	r1, sl, r5		/* relocbase */
 	mov	r0, sp			/* sp */
 	bl	_rtld			/* call the shared loader */
 	mov	r3, r0			/* save entry point */
-	ldr	r2, [sp, #0]		/* r2 = cleanup */
+	ldr	r2, [sp], #4		/* pop r2 = cleanup */
-	ldr	r1, [sp, #4]		/* r1 = obj_main */
+	ldr	r1, [sp], #4		/* pop r1 = obj_main */
 	add	sp, sp, #8		/* restore stack */
 	mov	r0, r4			/* restore ps_strings */
 #ifdef _ARM_ARCH_4T
 	bx	r3			/* jump to the entry point */
 #else
 	mov	pc, r3			/* jump to the entry point */
 #endif
 .L2:
 	.word	_GLOBAL_OFFSET_TABLE_ - (.L1+8)
 	.word	_GLOBAL_OFFSET_TABLE_(GOT)
 	.word	_DYNAMIC(GOT)
 	.align	0
 	.globl	_rtld_bind_start
 	.type	_rtld_bind_start,%function
 /*
  *	stack[0] = RA
  *	ip = &GOT[n+3]
  *	lr = &GOT[2]
  */
 _rtld_bind_start:
-	stmdb	sp!,{r0-r4,sl,fp}
+	stmdb	sp!,{r0-r4,sl,fp}	/* 8 byte aligned (lr already saved) */
 	sub	r1, ip, lr		/* r1 = 4 * (n + 1) */
 	sub	r1, r1, #4		/* r1 = 4 * n */
 	add	r1, r1, r1		/* r1 = 8 * n */
 	ldr	r0, [lr, #-4]		/* get obj ptr from GOT[1] */
 	mov	r4, ip			/* save GOT location */
 	bl	_rtld_bind		/* Call the binder */
 	str	r0, [r4]		/* save address in GOT */
 	mov	ip, r0			/* save new address */

 @@ -1,10 +1,13 @@
-#	$NetBSD: Makefile.inc,v 1.11 2005/06/04 16:17:17 lukem Exp $
+#	$NetBSD: Makefile.inc,v 1.11.46.1 2013/01/22 21:47:28 matt Exp $
 SRCS+=		rtld_start.S mdreloc.c
 # XXX Should not be in CPPFLAGS!
 CPPFLAGS+=	-fpic
 CPPFLAGS+=	-DELFSIZE=32
 .if ${MACHINE_ARCH} == "earm" || ${MACHINE_ARCH} == "earmeb"
 CPPFLAGS+=	-DHAVE_INITFINI_ARRAY
 .endif
 LDFLAGS+=	-Wl,-e,_rtld_start