 @@ -1,14 +1,14 @@
-#	$NetBSD: Makefile,v 1.146 2023/07/30 09:19:19 riastradh Exp $
+#	$NetBSD: Makefile,v 1.147 2023/07/30 09:20:14 riastradh Exp $
+#
 # NOTE: when changing ld.so, ensure that ldd still compiles.
+#
 NOLIBCSANITIZER=# defined
 NOSANITIZER=	# defined
 WARNS?=4
 LDELFSO_MACHINE_ARCH?= ${MACHINE_ARCH}
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
 .include <${BSD_MK_COMPAT_FILE}>
 .endif
 @@ -66,26 +66,27 @@ PROG=		ld.elf_so-${MLIBDIR}
 CPPFLAGS+=	-DRTLD_ARCH_SUBDIR=\"${MLIBDIR}\"
 .	if ${MLIBDIR} == "o32"
 .	endif
 .else
 PROG=		ld.elf_so
 .endif
 CLIBOBJ!=	cd ${NETBSDSRCDIR}/lib/libc && ${PRINTOBJDIR}
 SRCS+=		compat.c
 SRCS+=		debug.c
 SRCS+=		diagassert.c
 SRCS+=		expand.c
 SRCS+=		hash.c
 SRCS+=		headers.c
 SRCS+=		load.c
 SRCS+=		map_object.c
 SRCS+=		paths.c
 SRCS+=		reloc.c
 SRCS+=		rtld.c
 SRCS+=		search.c
 SRCS+=		symbol.c
 SRCS+=		symver.c
 SRCS+=		tls.c
 SRCS+=		xmalloc.c
 SRCS+=		xprintf.c

 @@ -1,14 +1,14 @@
-/*	$NetBSD: rtld.h,v 1.146 2023/06/04 01:24:56 joerg Exp $	 */
+/*	$NetBSD: rtld.h,v 1.147 2023/07/30 09:20:14 riastradh 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
 @@ -432,28 +432,26 @@ int _rtld_relocate_objects(Obj_Entry *,
 int _rtld_relocate_nonplt_objects(Obj_Entry *);
 int _rtld_relocate_plt_lazy(Obj_Entry *);
 int _rtld_relocate_plt_objects(const Obj_Entry *);
 void _rtld_setup_pltgot(const Obj_Entry *);
 Elf_Addr _rtld_resolve_ifunc(const Obj_Entry *, const Elf_Sym *);
 Elf_Addr _rtld_resolve_ifunc2(const Obj_Entry *, Elf_Addr);
 void _rtld_call_ifunc(Obj_Entry *, sigset_t *, u_int);
 /* search.c */
 Obj_Entry *_rtld_load_library(const char *, const Obj_Entry *, int);
 /* symbol.c */
 Elf32_Word _rtld_sysv_hash(const char *);
 Elf32_Word _rtld_gnu_hash(const char *);
 const Elf_Sym *_rtld_symlook_obj(const char *, Elf_Hash *,
     const Obj_Entry *, u_int, const Ver_Entry *);
 const Elf_Sym *_rtld_find_symdef(unsigned long, const Obj_Entry *,
     const Obj_Entry **, u_int);
 const Elf_Sym *_rtld_find_plt_symdef(unsigned long, const Obj_Entry *,
     const Obj_Entry **, bool);
 const Elf_Sym *_rtld_symlook_list(const char *, Elf_Hash *,
     const Objlist *, const Obj_Entry **, u_int, const Ver_Entry *, DoneList *);
 const Elf_Sym *_rtld_symlook_default(const char *, Elf_Hash *,
     const Obj_Entry *, const Obj_Entry **, u_int, const Ver_Entry *);
 const Elf_Sym *_rtld_symlook_needed(const char *, Elf_Hash *,
     const Needed_Entry *, const Obj_Entry **, u_int, const Ver_Entry *,

 @@ -1,14 +1,14 @@
-/*	$NetBSD: reloc.c,v 1.117 2021/12/04 08:53:34 skrll Exp $	 */
+/*	$NetBSD: reloc.c,v 1.118 2023/07/30 09:20:14 riastradh 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
 @@ -29,43 +29,44 @@
  * 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: reloc.c,v 1.117 2021/12/04 08:53:34 skrll Exp $");
+__RCSID("$NetBSD: reloc.c,v 1.118 2023/07/30 09:20:14 riastradh 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 "hash.h"
 #include "rtld.h"
 #ifndef RTLD_INHIBIT_COPY_RELOCS
 static int _rtld_do_copy_relocation(const Obj_Entry *, const Elf_Rela *);
 static int
 _rtld_do_copy_relocation(const Obj_Entry *dstobj, const Elf_Rela *rela)
+{
 	void           *dstaddr = (void *)(dstobj->relocbase + rela->r_offset);
 	const Elf_Sym  *dstsym = dstobj->symtab + ELF_R_SYM(rela->r_info);
 	const char     *name = dstobj->strtab + dstsym->st_name;
 	Elf_Hash        hash;
 	size_t          size = dstsym->st_size;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: rtld.c,v 1.214 2023/06/04 23:42:38 riastradh Exp $	 */
+/*	$NetBSD: rtld.c,v 1.215 2023/07/30 09:20:14 riastradh 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,49 @@
  * 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.214 2023/06/04 23:42:38 riastradh Exp $");
+__RCSID("$NetBSD: rtld.c,v 1.215 2023/07/30 09:20:14 riastradh 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>
 #include <unistd.h>
 #include <dirent.h>
 #include <ctype.h>
 #include <dlfcn.h>
 #include "debug.h"
 #include "hash.h"
 #include "rtld.h"
 #if !defined(lint)
 #include "sysident.h"
 #endif
 /*
  * Function declarations.
  */
 static void     _rtld_init(caddr_t, caddr_t, const char *);
 static void     _rtld_exit(void);
 Elf_Addr        _rtld(Elf_Addr *, Elf_Addr);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: symbol.c,v 1.75 2023/04/18 22:42:52 christos Exp $	 */
+/*	$NetBSD: symbol.c,v 1.76 2023/07/30 09:20:14 riastradh 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,99 +30,67 @@
  * 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.75 2023/04/18 22:42:52 christos Exp $");
+__RCSID("$NetBSD: symbol.c,v 1.76 2023/07/30 09:20:14 riastradh 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 "hash.h"
 #include "rtld.h"
 /*
  * 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;
 	/*
 	 * Our donelist allocation may not always be sufficient as we're not
 	 * thread safe. We'll handle it properly anyway.
 	 */
 	if (dlp->num_used < dlp->num_alloc)
 		dlp->objs[dlp->num_used++] = obj;
 	return false;
+}
 /*
  * SysV hash function for symbol table lookup.  It is a slightly optimized
  * version of the hash specified by the System V ABI.
  */
 Elf32_Word
 _rtld_sysv_hash(const char *name)
 	const unsigned char *p = (const unsigned char *) name;
 	Elf32_Word h = 0;
 	while (__predict_true(*p != '\0')) {
 		h = (h << 4) + *p++;
 		h ^= (h >> 24) & 0xf0;
 	return (h & 0x0fffffff);
 /*
  * Hash function for symbol table lookup.  Don't even think about changing
  * this.  It is specified by the GNU toolchain ABI.
  */
 Elf32_Word
 _rtld_gnu_hash(const char *name)
 	const unsigned char *p = (const unsigned char *) name;
 	uint_fast32_t h = 5381;
 	unsigned char c;
 	for (c = *p; c != '\0'; c = *++p)
 		h = h * 33 + c;
 	return (h & 0xffffffff);
 const Elf_Sym *
 _rtld_symlook_list(const char *name, Elf_Hash *hash, const Objlist *objlist,
     const Obj_Entry **defobj_out, u_int flags, const Ver_Entry *ventry,
     DoneList *dlp)
+{
 	const Elf_Sym *symp;
 	const Elf_Sym *def;
 	const Obj_Entry *defobj;
 	const Objlist_Entry *elm;
 	def = NULL;
 	defobj = NULL;
 	SIMPLEQ_FOREACH(elm, objlist, link) {