D48509.1793534591.diff
No OneTemporary
Actions

Authored By

Unknown

Size

256 KB

Referenced Files

None

Subscribers

None

D48509.1793534591.diff
View Options

This file is larger than 256 KB, so syntax highlighting was skipped.

	diff --git a/libexec/rtld-elf/amd64/reloc.c b/libexec/rtld-elf/amd64/reloc.c
	--- a/libexec/rtld-elf/amd64/reloc.c
	+++ b/libexec/rtld-elf/amd64/reloc.c
	@@ -34,6 +34,7 @@
	#define _WANT_P_OSREL
	#include <sys/param.h>
	#include <sys/mman.h>
	+
	#include <machine/cpufunc.h>
	#include <machine/specialreg.h>
	#include <machine/sysarch.h>
	@@ -62,64 +63,68 @@
	int
	do_copy_relocations(Obj_Entry *dstobj)
	{
	- const Elf_Rela *relalim;
	- const Elf_Rela *rela;
	-
	- assert(dstobj->mainprog); /* COPY relocations are invalid elsewhere */
	-
	- relalim = (const Elf_Rela )((const char ) dstobj->rela + dstobj->relasize);
	- for (rela = dstobj->rela; rela < relalim; rela++) {
	- if (ELF_R_TYPE(rela->r_info) == R_X86_64_COPY) {
	- void *dstaddr;
	- const Elf_Sym *dstsym;
	- const char *name;
	- size_t size;
	- const void *srcaddr;
	- const Elf_Sym *srcsym;
	- const Obj_Entry srcobj, defobj;
	- SymLook req;
	- int res;
	-
	- dstaddr = (void *)(dstobj->relocbase + rela->r_offset);
	- dstsym = dstobj->symtab + ELF_R_SYM(rela->r_info);
	- name = dstobj->strtab + dstsym->st_name;
	- size = dstsym->st_size;
	- symlook_init(&req, name);
	- req.ventry = fetch_ventry(dstobj, ELF_R_SYM(rela->r_info));
	- req.flags = SYMLOOK_EARLY;
	-
	- for (srcobj = globallist_next(dstobj); srcobj != NULL;
	- srcobj = globallist_next(srcobj)) {
	- res = symlook_obj(&req, srcobj);
	- if (res == 0) {
	- srcsym = req.sym_out;
	- defobj = req.defobj_out;
	- break;
	- }
	- }
	+ const Elf_Rela *relalim;
	+ const Elf_Rela *rela;

	- if (srcobj == NULL) {
	- _rtld_error("Undefined symbol \"%s\" referenced from COPY"
	- " relocation in %s", name, dstobj->path);
	- return -1;
	- }
	+ assert(dstobj->mainprog); /* COPY relocations are invalid elsewhere */
	+
	+ relalim = (const Elf_Rela )((const char )dstobj->rela +
	+ dstobj->relasize);
	+ for (rela = dstobj->rela; rela < relalim; rela++) {
	+ if (ELF_R_TYPE(rela->r_info) == R_X86_64_COPY) {
	+ void *dstaddr;
	+ const Elf_Sym *dstsym;
	+ const char *name;
	+ size_t size;
	+ const void *srcaddr;
	+ const Elf_Sym *srcsym;
	+ const Obj_Entry srcobj, defobj;
	+ SymLook req;
	+ int res;
	+
	+ dstaddr = (void *)(dstobj->relocbase + rela->r_offset);
	+ dstsym = dstobj->symtab + ELF_R_SYM(rela->r_info);
	+ name = dstobj->strtab + dstsym->st_name;
	+ size = dstsym->st_size;
	+ symlook_init(&req, name);
	+ req.ventry = fetch_ventry(dstobj,
	+ ELF_R_SYM(rela->r_info));
	+ req.flags = SYMLOOK_EARLY;
	+
	+ for (srcobj = globallist_next(dstobj); srcobj != NULL;
	+ srcobj = globallist_next(srcobj)) {
	+ res = symlook_obj(&req, srcobj);
	+ if (res == 0) {
	+ srcsym = req.sym_out;
	+ defobj = req.defobj_out;
	+ break;
	+ }
	+ }
	+
	+ if (srcobj == NULL) {
	+ _rtld_error(
	+ "Undefined symbol \"%s\" referenced from COPY relocation in %s",
	+ name, dstobj->path);
	+ return (-1);
	+ }

	- srcaddr = (const void *)(defobj->relocbase + srcsym->st_value);
	- memcpy(dstaddr, srcaddr, size);
	+ srcaddr = (const void *)(defobj->relocbase +
	+ srcsym->st_value);
	+ memcpy(dstaddr, srcaddr, size);
	+ }
	}
	- }

	- return 0;
	+ return (0);
	}

	/* Initialize the special GOT entries. */
	void
	init_pltgot(Obj_Entry *obj)
	{
	- if (obj->pltgot != NULL) {
	- obj->pltgot[1] = (Elf_Addr) obj;
	- obj->pltgot[2] = (Elf_Addr) &_rtld_bind_start;
	- }
	+ if (obj->pltgot != NULL) {
	+ obj->pltgot[1] = (Elf_Addr)obj;
	+ obj->pltgot[2] = (Elf_Addr)&_rtld_bind_start;
	+ }
	}

	/* Process the non-PLT relocations. */
	@@ -150,8 +155,8 @@
	} else
	cache = NULL;

	- relalim = (const Elf_Rela )((const char)obj->rela + obj->relasize);
	- for (rela = obj->rela; rela < relalim; rela++) {
	+ relalim = (const Elf_Rela )((const char )obj->rela + obj->relasize);
	+ for (rela = obj->rela; rela < relalim; rela++) {
	/*
	* First, resolve symbol for relocations which
	* reference symbols.
	@@ -165,10 +170,11 @@
	case R_X86_64_DTPMOD64:
	case R_X86_64_DTPOFF64:
	case R_X86_64_DTPOFF32:
	- def = find_symdef(ELF_R_SYM(rela->r_info), obj,
	- &defobj, flags, cache, lockstate);
	+ def = find_symdef(ELF_R_SYM(rela->r_info), obj, &defobj,
	+ flags, cache, lockstate);
	if (def == NULL)
	goto done;
	+
	/*
	* If symbol is IFUNC, only perform relocation
	* when caller allowed it by passing
	@@ -228,19 +234,21 @@
	* binutils-2.6 tools sometimes generate it.
	*/
	*where32 = (Elf32_Addr)(unsigned long)(symval +
	- rela->r_addend - (Elf_Addr)where);
	+ rela->r_addend - (Elf_Addr)where);
	break;
	/* missing: R_X86_64_GOT32 R_X86_64_PLT32 */
	case R_X86_64_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.
	+ * 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->mainprog) {
	- _rtld_error("%s: Unexpected R_X86_64_COPY "
	- "relocation in shared library", obj->path);
	+ _rtld_error(
	+ "%s: Unexpected R_X86_64_COPY relocation in shared library",
	+ obj->path);
	goto done;
	}
	break;
	@@ -257,10 +265,10 @@
	* of space, we generate an error.
	*/
	if (!defobj->tls_static) {
	- if (!allocate_tls_offset(
	- __DECONST(Obj_Entry *, defobj))) {
	- _rtld_error("%s: No space available "
	- "for static Thread Local Storage",
	+ if (!allocate_tls_offset(__DECONST(Obj_Entry *,
	+ defobj))) {
	+ _rtld_error(
	+ "%s: No space available for static Thread Local Storage",
	obj->path);
	goto done;
	}
	@@ -278,10 +286,10 @@
	* of space, we generate an error.
	*/
	if (!defobj->tls_static) {
	- if (!allocate_tls_offset(
	- __DECONST(Obj_Entry *, defobj))) {
	- _rtld_error("%s: No space available "
	- "for static Thread Local Storage",
	+ if (!allocate_tls_offset(__DECONST(Obj_Entry *,
	+ defobj))) {
	+ _rtld_error(
	+ "%s: No space available for static Thread Local Storage",
	obj->path);
	goto done;
	}
	@@ -312,9 +320,9 @@
	* R_X86_64_PC16, R_X86_64_8, R_X86_64_PC8
	*/
	default:
	- _rtld_error("%s: Unsupported relocation type %u"
	- " in non-PLT relocations\n", obj->path,
	- (unsigned int)ELF_R_TYPE(rela->r_info));
	+ _rtld_error(
	+ "%s: Unsupported relocation type %u in non-PLT relocations",
	+ obj->path, (unsigned int)ELF_R_TYPE(rela->r_info));
	goto done;
	}
	}
	@@ -328,86 +336,87 @@
	int
	reloc_plt(Obj_Entry obj, int flags __unused, RtldLockState lockstate __unused)
	{
	- const Elf_Rela *relalim;
	- const Elf_Rela *rela;
	-
	- relalim = (const Elf_Rela )((const char )obj->pltrela + obj->pltrelasize);
	- for (rela = obj->pltrela; rela < relalim; rela++) {
	- Elf_Addr *where;
	-
	- switch(ELF_R_TYPE(rela->r_info)) {
	- case R_X86_64_JMP_SLOT:
	- /* Relocate the GOT slot pointing into the PLT. */
	- where = (Elf_Addr *)(obj->relocbase + rela->r_offset);
	- *where += (Elf_Addr)obj->relocbase;
	- break;
	-
	- case R_X86_64_IRELATIVE:
	- obj->irelative = true;
	- break;
	-
	- default:
	- _rtld_error("Unknown relocation type %x in PLT",
	- (unsigned int)ELF_R_TYPE(rela->r_info));
	- return (-1);
	+ const Elf_Rela *relalim;
	+ const Elf_Rela *rela;
	+
	+ relalim = (const Elf_Rela )((const char )obj->pltrela +
	+ obj->pltrelasize);
	+ for (rela = obj->pltrela; rela < relalim; rela++) {
	+ Elf_Addr *where;
	+
	+ switch (ELF_R_TYPE(rela->r_info)) {
	+ case R_X86_64_JMP_SLOT:
	+ /* Relocate the GOT slot pointing into the PLT. */
	+ where = (Elf_Addr *)(obj->relocbase + rela->r_offset);
	+ *where += (Elf_Addr)obj->relocbase;
	+ break;
	+
	+ case R_X86_64_IRELATIVE:
	+ obj->irelative = true;
	+ break;
	+
	+ default:
	+ _rtld_error("Unknown relocation type %x in PLT",
	+ (unsigned int)ELF_R_TYPE(rela->r_info));
	+ return (-1);
	+ }
	}
	- }
	- return 0;
	+ return (0);
	}

	/* Relocate the jump slots in an object. */
	int
	reloc_jmpslots(Obj_Entry obj, int flags, RtldLockState lockstate)
	{
	- const Elf_Rela *relalim;
	- const Elf_Rela *rela;
	-
	- if (obj->jmpslots_done)
	- return 0;
	- relalim = (const Elf_Rela )((const char )obj->pltrela + obj->pltrelasize);
	- for (rela = obj->pltrela; rela < relalim; rela++) {
	- Elf_Addr *where, target;
	- const Elf_Sym *def;
	- const Obj_Entry *defobj;
	+ const Elf_Rela *relalim;
	+ const Elf_Rela *rela;

	- switch (ELF_R_TYPE(rela->r_info)) {
	- case R_X86_64_JMP_SLOT:
	- where = (Elf_Addr *)(obj->relocbase + rela->r_offset);
	- def = find_symdef(ELF_R_SYM(rela->r_info), obj, &defobj,
	- SYMLOOK_IN_PLT \| flags, NULL, lockstate);
	- if (def == NULL)
	- return (-1);
	- if (ELF_ST_TYPE(def->st_info) == STT_GNU_IFUNC) {
	- obj->gnu_ifunc = true;
	- continue;
	- }
	- target = (Elf_Addr)(defobj->relocbase + def->st_value + rela->r_addend);
	- reloc_jmpslot(where, target, defobj, obj, (const Elf_Rel *)rela);
	- break;
	-
	- case R_X86_64_IRELATIVE:
	- break;
	-
	- default:
	- _rtld_error("Unknown relocation type %x in PLT",
	- (unsigned int)ELF_R_TYPE(rela->r_info));
	- return (-1);
	+ if (obj->jmpslots_done)
	+ return (0);
	+ relalim = (const Elf_Rela )((const char )obj->pltrela +
	+ obj->pltrelasize);
	+ for (rela = obj->pltrela; rela < relalim; rela++) {
	+ Elf_Addr *where, target;
	+ const Elf_Sym *def;
	+ const Obj_Entry *defobj;
	+
	+ switch (ELF_R_TYPE(rela->r_info)) {
	+ case R_X86_64_JMP_SLOT:
	+ where = (Elf_Addr *)(obj->relocbase + rela->r_offset);
	+ def = find_symdef(ELF_R_SYM(rela->r_info), obj,
	+ &defobj, SYMLOOK_IN_PLT \| flags, NULL, lockstate);
	+ if (def == NULL)
	+ return (-1);
	+ if (ELF_ST_TYPE(def->st_info) == STT_GNU_IFUNC) {
	+ obj->gnu_ifunc = true;
	+ continue;
	+ }
	+ target = (Elf_Addr)(defobj->relocbase + def->st_value +
	+ rela->r_addend);
	+ reloc_jmpslot(where, target, defobj, obj,
	+ (const Elf_Rel *)rela);
	+ break;
	+
	+ case R_X86_64_IRELATIVE:
	+ break;
	+
	+ default:
	+ _rtld_error("Unknown relocation type %x in PLT",
	+ (unsigned int)ELF_R_TYPE(rela->r_info));
	+ return (-1);
	+ }
	}
	- }
	- obj->jmpslots_done = true;
	- return 0;
	+ obj->jmpslots_done = true;
	+ return (0);
	}

	/* Fixup the jump slot at "where" to transfer control to "target". */
	Elf_Addr
	reloc_jmpslot(Elf_Addr *where, Elf_Addr target,
	- const struct Struct_Obj_Entry *obj __unused,
	- const struct Struct_Obj_Entry *refobj __unused,
	- const Elf_Rel *rel __unused)
	+ const struct Struct_Obj_Entry *obj __unused,
	+ const struct Struct_Obj_Entry refobj __unused, const Elf_Rel rel __unused)
	{
	-#ifdef dbg
	dbg("reloc_jmpslot: %p = %p", where, (void )target);
	-#endif
	if (!ld_bind_not)
	*where = target;
	return (target);
	@@ -438,7 +447,7 @@
	obj->irelative = false;
	relalim = (const Elf_Rela )((const char )obj->pltrela +
	obj->pltrelasize);
	- for (rela = obj->pltrela; rela < relalim; rela++) {
	+ for (rela = obj->pltrela; rela < relalim; rela++) {
	if (ELF_R_TYPE(rela->r_info) == R_X86_64_IRELATIVE)
	reloc_iresolve_one(obj, rela, lockstate);
	}
	@@ -455,7 +464,7 @@
	return (0);
	obj->irelative_nonplt = false;
	relalim = (const Elf_Rela )((const char )obj->rela + obj->relasize);
	- for (rela = obj->rela; rela < relalim; rela++) {
	+ for (rela = obj->rela; rela < relalim; rela++) {
	if (ELF_R_TYPE(rela->r_info) == R_X86_64_IRELATIVE)
	reloc_iresolve_one(obj, rela, lockstate);
	}
	@@ -465,35 +474,37 @@
	int
	reloc_gnu_ifunc(Obj_Entry obj, int flags, RtldLockState lockstate)
	{
	- const Elf_Rela *relalim;
	- const Elf_Rela *rela;
	+ const Elf_Rela *relalim;
	+ const Elf_Rela *rela;

	- if (!obj->gnu_ifunc)
	- return (0);
	- relalim = (const Elf_Rela )((const char )obj->pltrela + obj->pltrelasize);
	- for (rela = obj->pltrela; rela < relalim; rela++) {
	- Elf_Addr *where, target;
	- const Elf_Sym *def;
	- const Obj_Entry *defobj;
	+ if (!obj->gnu_ifunc)
	+ return (0);
	+ relalim = (const Elf_Rela )((const char )obj->pltrela +
	+ obj->pltrelasize);
	+ for (rela = obj->pltrela; rela < relalim; rela++) {
	+ Elf_Addr *where, target;
	+ const Elf_Sym *def;
	+ const Obj_Entry *defobj;

	- switch (ELF_R_TYPE(rela->r_info)) {
	- case R_X86_64_JMP_SLOT:
	- where = (Elf_Addr *)(obj->relocbase + rela->r_offset);
	- def = find_symdef(ELF_R_SYM(rela->r_info), obj, &defobj,
	- SYMLOOK_IN_PLT \| flags, NULL, lockstate);
	- if (def == NULL)
	- return (-1);
	- if (ELF_ST_TYPE(def->st_info) != STT_GNU_IFUNC)
	- continue;
	- lock_release(rtld_bind_lock, lockstate);
	- target = (Elf_Addr)rtld_resolve_ifunc(defobj, def);
	- wlock_acquire(rtld_bind_lock, lockstate);
	- reloc_jmpslot(where, target, defobj, obj, (const Elf_Rel *)rela);
	- break;
	+ switch (ELF_R_TYPE(rela->r_info)) {
	+ case R_X86_64_JMP_SLOT:
	+ where = (Elf_Addr *)(obj->relocbase + rela->r_offset);
	+ def = find_symdef(ELF_R_SYM(rela->r_info), obj, &defobj,
	+ SYMLOOK_IN_PLT \| flags, NULL, lockstate);
	+ if (def == NULL)
	+ return (-1);
	+ if (ELF_ST_TYPE(def->st_info) != STT_GNU_IFUNC)
	+ continue;
	+ lock_release(rtld_bind_lock, lockstate);
	+ target = (Elf_Addr)rtld_resolve_ifunc(defobj, def);
	+ wlock_acquire(rtld_bind_lock, lockstate);
	+ reloc_jmpslot(where, target, defobj, obj,
	+ (const Elf_Rel *)rela);
	+ break;
	+ }
	}
	- }
	- obj->gnu_ifunc = false;
	- return (0);
	+ obj->gnu_ifunc = false;
	+ return (0);
	}

	uint32_t cpu_feature, cpu_feature2, cpu_stdext_feature, cpu_stdext_feature2;
	@@ -552,18 +563,18 @@
	}

	size_t
	-calculate_tls_offset(size_t prev_offset, size_t prev_size __unused,
	- size_t size, size_t align, size_t offset)
	+calculate_tls_offset(size_t prev_offset, size_t prev_size __unused, size_t size,
	+ size_t align, size_t offset)
	{
	size_t res;

	- /*
	+ /*
	* res is the smallest integer satisfying res - prev_offset >= size
	- * and (-res) % p_align = p_vaddr % p_align (= p_offset % p_align).
	+ * and (-res) % p_align = p_vaddr % p_align (= p_offset % p_align).
	*/
	- res = prev_offset + size + align - 1;
	- res -= (res + offset) & (align - 1);
	- return (res);
	+ res = prev_offset + size + align - 1;
	+ res -= (res + offset) & (align - 1);
	+ return (res);
	}

	size_t
	diff --git a/libexec/rtld-elf/i386/reloc.c b/libexec/rtld-elf/i386/reloc.c
	--- a/libexec/rtld-elf/i386/reloc.c
	+++ b/libexec/rtld-elf/i386/reloc.c
	@@ -33,6 +33,7 @@

	#include <sys/param.h>
	#include <sys/mman.h>
	+
	#include <machine/segments.h>
	#include <machine/sysarch.h>

	@@ -60,64 +61,68 @@
	int
	do_copy_relocations(Obj_Entry *dstobj)
	{
	- const Elf_Rel *rellim;
	- const Elf_Rel *rel;
	-
	- assert(dstobj->mainprog); /* COPY relocations are invalid elsewhere */
	-
	- rellim = (const Elf_Rel )((const char )dstobj->rel + dstobj->relsize);
	- for (rel = dstobj->rel; rel < rellim; rel++) {
	- if (ELF_R_TYPE(rel->r_info) == R_386_COPY) {
	- void *dstaddr;
	- const Elf_Sym *dstsym;
	- const char *name;
	- size_t size;
	- const void *srcaddr;
	- const Elf_Sym *srcsym;
	- const Obj_Entry srcobj, defobj;
	- SymLook req;
	- int res;
	-
	- dstaddr = (void *)(dstobj->relocbase + rel->r_offset);
	- dstsym = dstobj->symtab + ELF_R_SYM(rel->r_info);
	- name = dstobj->strtab + dstsym->st_name;
	- size = dstsym->st_size;
	- symlook_init(&req, name);
	- req.ventry = fetch_ventry(dstobj, ELF_R_SYM(rel->r_info));
	- req.flags = SYMLOOK_EARLY;
	-
	- for (srcobj = globallist_next(dstobj); srcobj != NULL;
	- srcobj = globallist_next(srcobj)) {
	- res = symlook_obj(&req, srcobj);
	- if (res == 0) {
	- srcsym = req.sym_out;
	- defobj = req.defobj_out;
	- break;
	- }
	- }
	+ const Elf_Rel *rellim;
	+ const Elf_Rel *rel;
	+
	+ assert(dstobj->mainprog); /* COPY relocations are invalid elsewhere */
	+
	+ rellim = (const Elf_Rel )((const char )dstobj->rel + dstobj->relsize);
	+ for (rel = dstobj->rel; rel < rellim; rel++) {
	+ if (ELF_R_TYPE(rel->r_info) == R_386_COPY) {
	+ void *dstaddr;
	+ const Elf_Sym *dstsym;
	+ const char *name;
	+ size_t size;
	+ const void *srcaddr;
	+ const Elf_Sym *srcsym;
	+ const Obj_Entry srcobj, defobj;
	+ SymLook req;
	+ int res;
	+
	+ dstaddr = (void *)(dstobj->relocbase + rel->r_offset);
	+ dstsym = dstobj->symtab + ELF_R_SYM(rel->r_info);
	+ name = dstobj->strtab + dstsym->st_name;
	+ size = dstsym->st_size;
	+ symlook_init(&req, name);
	+ req.ventry = fetch_ventry(dstobj,
	+ ELF_R_SYM(rel->r_info));
	+ req.flags = SYMLOOK_EARLY;
	+
	+ for (srcobj = globallist_next(dstobj); srcobj != NULL;
	+ srcobj = globallist_next(srcobj)) {
	+ res = symlook_obj(&req, srcobj);
	+ if (res == 0) {
	+ srcsym = req.sym_out;
	+ defobj = req.defobj_out;
	+ break;
	+ }
	+ }

	- if (srcobj == NULL) {
	- _rtld_error("Undefined symbol \"%s\" referenced from COPY"
	- " relocation in %s", name, dstobj->path);
	- return -1;
	- }
	+ if (srcobj == NULL) {
	+ _rtld_error(
	+ "Undefined symbol \"%s\" referenced from COPY"
	+ " relocation in %s",
	+ name, dstobj->path);
	+ return (-1);
	+ }

	- srcaddr = (const void *)(defobj->relocbase + srcsym->st_value);
	- memcpy(dstaddr, srcaddr, size);
	+ srcaddr = (const void *)(defobj->relocbase +
	+ srcsym->st_value);
	+ memcpy(dstaddr, srcaddr, size);
	+ }
	}
	- }

	- return 0;
	+ return (0);
	}

	/* Initialize the special GOT entries. */
	void
	init_pltgot(Obj_Entry *obj)
	{
	- if (obj->pltgot != NULL) {
	- obj->pltgot[1] = (Elf_Addr) obj;
	- obj->pltgot[2] = (Elf_Addr) &_rtld_bind_start;
	- }
	+ if (obj->pltgot != NULL) {
	+ obj->pltgot[1] = (Elf_Addr)obj;
	+ obj->pltgot[2] = (Elf_Addr)&_rtld_bind_start;
	+ }
	}

	/* Process the non-PLT relocations. */
	@@ -141,15 +146,16 @@
	if (obj != obj_rtld) {
	cache = calloc(obj->dynsymcount, sizeof(SymCache));
	/* No need to check for NULL here */
	- } else
	+ } else {
	cache = NULL;
	+ }

	/* Appease some compilers. */
	symval = 0;
	def = NULL;

	rellim = (const Elf_Rel )((const char )obj->rel + obj->relsize);
	- for (rel = obj->rel; rel < rellim; rel++) {
	+ for (rel = obj->rel; rel < rellim; rel++) {
	switch (ELF_R_TYPE(rel->r_info)) {
	case R_386_32:
	case R_386_PC32:
	@@ -171,8 +177,8 @@
	obj->non_plt_gnu_ifunc = true;
	continue;
	}
	- symval = (Elf_Addr)rtld_resolve_ifunc(
	- defobj, def);
	+ symval = (Elf_Addr)
	+ rtld_resolve_ifunc(defobj, def);
	break;
	case R_386_TLS_TPOFF:
	case R_386_TLS_TPOFF32:
	@@ -203,13 +209,13 @@
	*where += symval;
	break;
	case R_386_PC32:
	- /*
	- * I don't think the dynamic linker should ever
	- * see this type of relocation. But the
	- * binutils-2.6 tools sometimes generate it.
	- */
	- *where += symval - (Elf_Addr)where;
	- break;
	+ /*
	+ * I don't think the dynamic linker should ever
	+ * see this type of relocation. But the
	+ * binutils-2.6 tools sometimes generate it.
	+ */
	+ *where += symval - (Elf_Addr)where;
	+ break;
	case R_386_COPY:
	/*
	* These are deferred until all other
	@@ -219,8 +225,9 @@
	* only in executable files.
	*/
	if (!obj->mainprog) {
	- _rtld_error("%s: Unexpected R_386_COPY "
	- "relocation in shared library", obj->path);
	+ _rtld_error(
	+ "%s: Unexpected R_386_COPY relocation in shared library",
	+ obj->path);
	goto done;
	}
	break;
	@@ -243,8 +250,8 @@
	if (!defobj->tls_static) {
	if (!allocate_tls_offset(
	__DECONST(Obj_Entry *, defobj))) {
	- _rtld_error("%s: No space available "
	- "for static Thread Local Storage",
	+ _rtld_error(
	+ "%s: No space available for static Thread Local Storage",
	obj->path);
	goto done;
	}
	@@ -259,15 +266,15 @@
	*where += (Elf_Addr)defobj->tlsindex;
	break;
	case R_386_TLS_DTPOFF32:
	- *where += (Elf_Addr) def->st_value;
	+ *where += (Elf_Addr)def->st_value;
	break;
	case R_386_IRELATIVE:
	obj->irelative_nonplt = true;
	break;
	default:
	- _rtld_error("%s: Unsupported relocation type %d"
	- " in non-PLT relocations\n", obj->path,
	- ELF_R_TYPE(rel->r_info));
	+ _rtld_error(
	+ "%s: Unsupported relocation type %d in non-PLT relocations",
	+ obj->path, ELF_R_TYPE(rel->r_info));
	goto done;
	}
	}
	@@ -281,94 +288,90 @@
	int
	reloc_plt(Obj_Entry obj, int flags __unused, RtldLockState lockstate __unused)
	{
	- const Elf_Rel *rellim;
	- const Elf_Rel *rel;
	-
	- rellim = (const Elf_Rel )((const char )obj->pltrel + obj->pltrelsize);
	- for (rel = obj->pltrel; rel < rellim; rel++) {
	- Elf_Addr where/, val*/;
	-
	- switch (ELF_R_TYPE(rel->r_info)) {
	- case R_386_JMP_SLOT:
	- /* Relocate the GOT slot pointing into the PLT. */
	- where = (Elf_Addr *)(obj->relocbase + rel->r_offset);
	- *where += (Elf_Addr)obj->relocbase;
	- break;
	-
	- case R_386_IRELATIVE:
	- obj->irelative = true;
	- break;
	-
	- default:
	- _rtld_error("Unknown relocation type %x in PLT",
	- ELF_R_TYPE(rel->r_info));
	- return (-1);
	+ const Elf_Rel *rellim;
	+ const Elf_Rel *rel;
	+
	+ rellim = (const Elf_Rel )((const char )obj->pltrel + obj->pltrelsize);
	+ for (rel = obj->pltrel; rel < rellim; rel++) {
	+ Elf_Addr *where;
	+
	+ switch (ELF_R_TYPE(rel->r_info)) {
	+ case R_386_JMP_SLOT:
	+ /* Relocate the GOT slot pointing into the PLT. */
	+ where = (Elf_Addr *)(obj->relocbase + rel->r_offset);
	+ *where += (Elf_Addr)obj->relocbase;
	+ break;
	+
	+ case R_386_IRELATIVE:
	+ obj->irelative = true;
	+ break;
	+
	+ default:
	+ _rtld_error("Unknown relocation type %x in PLT",
	+ ELF_R_TYPE(rel->r_info));
	+ return (-1);
	+ }
	}
	- }
	- return 0;
	+ return (0);
	}

	/* Relocate the jump slots in an object. */
	int
	reloc_jmpslots(Obj_Entry obj, int flags, RtldLockState lockstate)
	{
	- const Elf_Rel *rellim;
	- const Elf_Rel *rel;
	+ const Elf_Rel *rellim;
	+ const Elf_Rel *rel;

	- if (obj->jmpslots_done)
	- return 0;
	- rellim = (const Elf_Rel )((const char )obj->pltrel + obj->pltrelsize);
	- for (rel = obj->pltrel; rel < rellim; rel++) {
	- Elf_Addr *where, target;
	- const Elf_Sym *def;
	- const Obj_Entry *defobj;
	+ if (obj->jmpslots_done)
	+ return (0);
	+ rellim = (const Elf_Rel )((const char )obj->pltrel + obj->pltrelsize);
	+ for (rel = obj->pltrel; rel < rellim; rel++) {
	+ Elf_Addr *where, target;
	+ const Elf_Sym *def;
	+ const Obj_Entry *defobj;
	+
	+ switch (ELF_R_TYPE(rel->r_info)) {
	+ case R_386_JMP_SLOT:
	+ where = (Elf_Addr *)(obj->relocbase + rel->r_offset);
	+ def = find_symdef(ELF_R_SYM(rel->r_info), obj, &defobj,
	+ SYMLOOK_IN_PLT \| flags, NULL, lockstate);
	+ if (def == NULL)
	+ return (-1);
	+ if (ELF_ST_TYPE(def->st_info) == STT_GNU_IFUNC) {
	+ obj->gnu_ifunc = true;
	+ continue;
	+ }
	+ target = (Elf_Addr)(defobj->relocbase + def->st_value);
	+ reloc_jmpslot(where, target, defobj, obj, rel);
	+ break;

	- switch (ELF_R_TYPE(rel->r_info)) {
	- case R_386_JMP_SLOT:
	- where = (Elf_Addr *)(obj->relocbase + rel->r_offset);
	- def = find_symdef(ELF_R_SYM(rel->r_info), obj, &defobj,
	- SYMLOOK_IN_PLT \| flags, NULL, lockstate);
	- if (def == NULL)
	- return (-1);
	- if (ELF_ST_TYPE(def->st_info) == STT_GNU_IFUNC) {
	- obj->gnu_ifunc = true;
	- continue;
	- }
	- target = (Elf_Addr)(defobj->relocbase + def->st_value);
	- reloc_jmpslot(where, target, defobj, obj, rel);
	- break;
	-
	- case R_386_IRELATIVE:
	- break;
	-
	- default:
	- _rtld_error("Unknown relocation type %x in PLT",
	- ELF_R_TYPE(rel->r_info));
	- return (-1);
	+ case R_386_IRELATIVE:
	+ break;
	+
	+ default:
	+ _rtld_error("Unknown relocation type %x in PLT",
	+ ELF_R_TYPE(rel->r_info));
	+ return (-1);
	+ }
	}
	- }

	- obj->jmpslots_done = true;
	- return 0;
	+ obj->jmpslots_done = true;
	+ return (0);
	}

	/* Fixup the jump slot at "where" to transfer control to "target". */
	Elf_Addr
	-reloc_jmpslot(Elf_Addr *where, Elf_Addr target,
	- const Obj_Entry obj __unused, const Obj_Entry refobj __unused,
	- const Elf_Rel *rel __unused)
	+reloc_jmpslot(Elf_Addr where, Elf_Addr target, const Obj_Entry obj __unused,
	+ const Obj_Entry refobj __unused, const Elf_Rel rel __unused)
	{
	-#ifdef dbg
	dbg("reloc_jmpslot: %p = %p", where, (void )target);
	-#endif
	if (!ld_bind_not)
	*where = target;
	return (target);
	}

	static void
	-reloc_iresolve_one(Obj_Entry obj, const Elf_Rel rel,
	- RtldLockState *lockstate)
	+reloc_iresolve_one(Obj_Entry obj, const Elf_Rel rel, RtldLockState *lockstate)
	{
	Elf_Addr *where, target;

	@@ -389,7 +392,7 @@
	return (0);
	obj->irelative = false;
	rellim = (const Elf_Rel )((const char )obj->pltrel + obj->pltrelsize);
	- for (rel = obj->pltrel; rel < rellim; rel++) {
	+ for (rel = obj->pltrel; rel < rellim; rel++) {
	if (ELF_R_TYPE(rel->r_info) == R_386_IRELATIVE)
	reloc_iresolve_one(obj, rel, lockstate);
	}
	@@ -406,7 +409,7 @@
	return (0);
	obj->irelative_nonplt = false;
	rellim = (const Elf_Rel )((const char )obj->rel + obj->relsize);
	- for (rel = obj->rel; rel < rellim; rel++) {
	+ for (rel = obj->rel; rel < rellim; rel++) {
	if (ELF_R_TYPE(rel->r_info) == R_386_IRELATIVE)
	reloc_iresolve_one(obj, rel, lockstate);
	}
	@@ -416,36 +419,36 @@
	int
	reloc_gnu_ifunc(Obj_Entry obj, int flags, RtldLockState lockstate)
	{
	- const Elf_Rel *rellim;
	- const Elf_Rel *rel;
	+ const Elf_Rel *rellim;
	+ const Elf_Rel *rel;

	- if (!obj->gnu_ifunc)
	- return (0);
	- rellim = (const Elf_Rel )((const char )obj->pltrel + obj->pltrelsize);
	- for (rel = obj->pltrel; rel < rellim; rel++) {
	- Elf_Addr *where, target;
	- const Elf_Sym *def;
	- const Obj_Entry *defobj;
	+ if (!obj->gnu_ifunc)
	+ return (0);
	+ rellim = (const Elf_Rel )((const char )obj->pltrel + obj->pltrelsize);
	+ for (rel = obj->pltrel; rel < rellim; rel++) {
	+ Elf_Addr *where, target;
	+ const Elf_Sym *def;
	+ const Obj_Entry *defobj;

	- switch (ELF_R_TYPE(rel->r_info)) {
	- case R_386_JMP_SLOT:
	- where = (Elf_Addr *)(obj->relocbase + rel->r_offset);
	- def = find_symdef(ELF_R_SYM(rel->r_info), obj, &defobj,
	- SYMLOOK_IN_PLT \| flags, NULL, lockstate);
	- if (def == NULL)
	- return (-1);
	- if (ELF_ST_TYPE(def->st_info) != STT_GNU_IFUNC)
	- continue;
	- lock_release(rtld_bind_lock, lockstate);
	- target = (Elf_Addr)rtld_resolve_ifunc(defobj, def);
	- wlock_acquire(rtld_bind_lock, lockstate);
	- reloc_jmpslot(where, target, defobj, obj, rel);
	- break;
	+ switch (ELF_R_TYPE(rel->r_info)) {
	+ case R_386_JMP_SLOT:
	+ where = (Elf_Addr *)(obj->relocbase + rel->r_offset);
	+ def = find_symdef(ELF_R_SYM(rel->r_info), obj, &defobj,
	+ SYMLOOK_IN_PLT \| flags, NULL, lockstate);
	+ if (def == NULL)
	+ return (-1);
	+ if (ELF_ST_TYPE(def->st_info) != STT_GNU_IFUNC)
	+ continue;
	+ lock_release(rtld_bind_lock, lockstate);
	+ target = (Elf_Addr)rtld_resolve_ifunc(defobj, def);
	+ wlock_acquire(rtld_bind_lock, lockstate);
	+ reloc_jmpslot(where, target, defobj, obj, rel);
	+ break;
	+ }
	}
	- }

	- obj->gnu_ifunc = false;
	- return (0);
	+ obj->gnu_ifunc = false;
	+ return (0);
	}

	uint32_t cpu_feature, cpu_feature2, cpu_stdext_feature, cpu_stdext_feature2;
	@@ -453,14 +456,13 @@
	static void
	rtld_cpuid_count(int idx, int cnt, u_int *p)
	{
	-
	__asm __volatile(
	" pushl %%ebx\n"
	" cpuid\n"
	" movl %%ebx,%1\n"
	" popl %%ebx\n"
	- : "=a" (p[0]), "=r" (p[1]), "=c" (p[2]), "=d" (p[3])
	- : "0" (idx), "2" (cnt));
	+ : "=a"(p[0]), "=r"(p[1]), "=c"(p[2]), "=d"(p[3])
	+ : "0"(idx), "2"(cnt));
	}

	void
	@@ -484,7 +486,9 @@
	" jmp 2f\n"
	"1: movl $0,%0\n"
	"2:\n"
	- : "=r" (cpuid_supported) : : "eax", "ecx");
	+ : "=r"(cpuid_supported)
	+ :
	+ : "eax", "ecx");
	if (!cpuid_supported)
	return;

	@@ -503,21 +507,20 @@
	void
	allocate_initial_tls(Obj_Entry *objs)
	{
	- void* tls;
	-
	- /*
	- * Fix the size of the static TLS block by using the maximum
	- * offset allocated so far and adding a bit for dynamic modules to
	- * use.
	- */
	- tls_static_space = tls_last_offset + ld_static_tls_extra;
	- tls = allocate_tls(objs, NULL, TLS_TCB_SIZE, TLS_TCB_ALIGN);
	- _tcb_set(tls);
	+ void *tls;
	+
	+ /*
	+ * Fix the size of the static TLS block by using the maximum
	+ * offset allocated so far and adding a bit for dynamic modules to
	+ * use.
	+ */
	+ tls_static_space = tls_last_offset + ld_static_tls_extra;
	+ tls = allocate_tls(objs, NULL, TLS_TCB_SIZE, TLS_TCB_ALIGN);
	+ _tcb_set(tls);
	}

	/* GNU ABI */
	-__attribute__((__regparm__(1)))
	-void *
	+__attribute__((__regparm__(1))) void *
	___tls_get_addr(tls_index *ti)
	{
	uintptr_t **dtvp;
	@@ -537,18 +540,18 @@
	}

	size_t
	-calculate_tls_offset(size_t prev_offset, size_t prev_size __unused,
	- size_t size, size_t align, size_t offset)
	+calculate_tls_offset(size_t prev_offset, size_t prev_size __unused, size_t size,
	+ size_t align, size_t offset)
	{
	size_t res;

	- /*
	+ /*
	* res is the smallest integer satisfying res - prev_offset >= size
	- * and (-res) % p_align = p_vaddr % p_align (= p_offset % p_align).
	+ * and (-res) % p_align = p_vaddr % p_align (= p_offset % p_align).
	*/
	- res = prev_offset + size + align - 1;
	- res -= (res + offset) & (align - 1);
	- return (res);
	+ res = prev_offset + size + align - 1;
	+ res -= (res + offset) & (align - 1);
	+ return (res);
	}

	size_t
	diff --git a/libexec/rtld-elf/map_object.c b/libexec/rtld-elf/map_object.c
	--- a/libexec/rtld-elf/map_object.c
	+++ b/libexec/rtld-elf/map_object.c
	@@ -62,274 +62,296 @@
	Obj_Entry *
	map_object(int fd, const char path, const struct stat sb)
	{
	- Obj_Entry *obj;
	- Elf_Ehdr *hdr;
	- int i;
	- Elf_Phdr *phdr;
	- Elf_Phdr *phlimit;
	- Elf_Phdr **segs;
	- int nsegs;
	- Elf_Phdr *phdyn;
	- Elf_Phdr *phinterp;
	- Elf_Phdr *phtls;
	- caddr_t mapbase;
	- size_t mapsize;
	- Elf_Addr base_vaddr;
	- Elf_Addr base_vlimit;
	- caddr_t base_addr;
	- int base_flags;
	- Elf_Off data_offset;
	- Elf_Addr data_vaddr;
	- Elf_Addr data_vlimit;
	- caddr_t data_addr;
	- int data_prot;
	- int data_flags;
	- Elf_Addr clear_vaddr;
	- caddr_t clear_addr;
	- caddr_t clear_page;
	- Elf_Addr phdr_vaddr;
	- size_t nclear, phsize;
	- Elf_Addr bss_vaddr;
	- Elf_Addr bss_vlimit;
	- caddr_t bss_addr;
	- Elf_Word stack_flags;
	- Elf_Addr note_start;
	- Elf_Addr note_end;
	- char *note_map;
	- size_t note_map_len;
	- Elf_Addr text_end;
	-
	- hdr = get_elf_header(fd, path, sb, &phdr);
	- if (hdr == NULL)
	- return (NULL);
	+ Obj_Entry *obj;
	+ Elf_Ehdr *hdr;
	+ int i;
	+ Elf_Phdr *phdr;
	+ Elf_Phdr *phlimit;
	+ Elf_Phdr **segs;
	+ int nsegs;
	+ Elf_Phdr *phdyn;
	+ Elf_Phdr *phinterp;
	+ Elf_Phdr *phtls;
	+ caddr_t mapbase;
	+ size_t mapsize;
	+ Elf_Addr base_vaddr;
	+ Elf_Addr base_vlimit;
	+ caddr_t base_addr;
	+ int base_flags;
	+ Elf_Off data_offset;
	+ Elf_Addr data_vaddr;
	+ Elf_Addr data_vlimit;
	+ caddr_t data_addr;
	+ int data_prot;
	+ int data_flags;
	+ Elf_Addr clear_vaddr;
	+ caddr_t clear_addr;
	+ caddr_t clear_page;
	+ Elf_Addr phdr_vaddr;
	+ size_t nclear, phsize;
	+ Elf_Addr bss_vaddr;
	+ Elf_Addr bss_vlimit;
	+ caddr_t bss_addr;
	+ Elf_Word stack_flags;
	+ Elf_Addr note_start;
	+ Elf_Addr note_end;
	+ char *note_map;
	+ size_t note_map_len;
	+ Elf_Addr text_end;
	+
	+ hdr = get_elf_header(fd, path, sb, &phdr);
	+ if (hdr == NULL)
	+ return (NULL);

	- /*
	- * Scan the program header entries, and save key information.
	- * We expect that the loadable segments are ordered by load address.
	- */
	- phsize = hdr->e_phnum * sizeof(phdr[0]);
	- phlimit = phdr + hdr->e_phnum;
	- nsegs = -1;
	- phdyn = phinterp = phtls = NULL;
	- phdr_vaddr = 0;
	- note_start = 0;
	- note_end = 0;
	- note_map = NULL;
	- note_map_len = 0;
	- segs = alloca(sizeof(segs[0]) * hdr->e_phnum);
	- stack_flags = PF_X \| PF_R \| PF_W;
	- text_end = 0;
	- while (phdr < phlimit) {
	- switch (phdr->p_type) {
	-
	- case PT_INTERP:
	- phinterp = phdr;
	- break;
	-
	- case PT_LOAD:
	- segs[++nsegs] = phdr;
	- if ((segs[nsegs]->p_align & (page_size - 1)) != 0) {
	- _rtld_error("%s: PT_LOAD segment %d not page-aligned",
	- path, nsegs);
	- goto error;
	- }
	- if ((segs[nsegs]->p_flags & PF_X) == PF_X) {
	- text_end = MAX(text_end,
	- rtld_round_page(segs[nsegs]->p_vaddr +
	- segs[nsegs]->p_memsz));
	- }
	- break;
	-
	- case PT_PHDR:
	- phdr_vaddr = phdr->p_vaddr;
	- phsize = phdr->p_memsz;
	- break;
	-
	- case PT_DYNAMIC:
	- phdyn = phdr;
	- break;
	-
	- case PT_TLS:
	- phtls = phdr;
	- break;
	-
	- case PT_GNU_STACK:
	- stack_flags = phdr->p_flags;
	- break;
	-
	- case PT_NOTE:
	- if (phdr->p_offset > page_size \|\|
	- phdr->p_offset + phdr->p_filesz > page_size) {
	- note_map_len = rtld_round_page(phdr->p_offset +
	- phdr->p_filesz) - rtld_trunc_page(phdr->p_offset);
	- note_map = mmap(NULL, note_map_len, PROT_READ,
	- MAP_PRIVATE, fd, rtld_trunc_page(phdr->p_offset));
	- if (note_map == MAP_FAILED) {
	- _rtld_error("%s: error mapping PT_NOTE (%d)", path, errno);
	- goto error;
	+ /*
	+ * Scan the program header entries, and save key information.
	+ * We expect that the loadable segments are ordered by load address.
	+ */
	+ phsize = hdr->e_phnum * sizeof(phdr[0]);
	+ phlimit = phdr + hdr->e_phnum;
	+ nsegs = -1;
	+ phdyn = phinterp = phtls = NULL;
	+ phdr_vaddr = 0;
	+ note_start = 0;
	+ note_end = 0;
	+ note_map = NULL;
	+ note_map_len = 0;
	+ segs = alloca(sizeof(segs[0]) * hdr->e_phnum);
	+ stack_flags = PF_X \| PF_R \| PF_W;
	+ text_end = 0;
	+ while (phdr < phlimit) {
	+ switch (phdr->p_type) {
	+ case PT_INTERP:
	+ phinterp = phdr;
	+ break;
	+
	+ case PT_LOAD:
	+ segs[++nsegs] = phdr;
	+ if ((segs[nsegs]->p_align & (page_size - 1)) != 0) {
	+ _rtld_error(
	+ "%s: PT_LOAD segment %d not page-aligned",
	+ path, nsegs);
	+ goto error;
	+ }
	+ if ((segs[nsegs]->p_flags & PF_X) == PF_X) {
	+ text_end = MAX(text_end,
	+ rtld_round_page(segs[nsegs]->p_vaddr +
	+ segs[nsegs]->p_memsz));
	+ }
	+ break;
	+
	+ case PT_PHDR:
	+ phdr_vaddr = phdr->p_vaddr;
	+ phsize = phdr->p_memsz;
	+ break;
	+
	+ case PT_DYNAMIC:
	+ phdyn = phdr;
	+ break;
	+
	+ case PT_TLS:
	+ phtls = phdr;
	+ break;
	+
	+ case PT_GNU_STACK:
	+ stack_flags = phdr->p_flags;
	+ break;
	+
	+ case PT_NOTE:
	+ if (phdr->p_offset > page_size \|\|
	+ phdr->p_offset + phdr->p_filesz > page_size) {
	+ note_map_len = rtld_round_page(phdr->p_offset +
	+ phdr->p_filesz) -
	+ rtld_trunc_page(phdr->p_offset);
	+ note_map = mmap(NULL, note_map_len, PROT_READ,
	+ MAP_PRIVATE, fd,
	+ rtld_trunc_page(phdr->p_offset));
	+ if (note_map == MAP_FAILED) {
	+ _rtld_error(
	+ "%s: error mapping PT_NOTE (%d)",
	+ path, errno);
	+ goto error;
	+ }
	+ note_start = (Elf_Addr)(note_map +
	+ phdr->p_offset -
	+ rtld_trunc_page(phdr->p_offset));
	+ } else {
	+ note_start = (Elf_Addr)(char *)hdr +
	+ phdr->p_offset;
	+ }
	+ note_end = note_start + phdr->p_filesz;
	+ break;
	}
	- note_start = (Elf_Addr)(note_map + phdr->p_offset -
	- rtld_trunc_page(phdr->p_offset));
	- } else {
	- note_start = (Elf_Addr)(char *)hdr + phdr->p_offset;
	- }
	- note_end = note_start + phdr->p_filesz;
	- break;
	- }

	- ++phdr;
	- }
	- if (phdyn == NULL) {
	- _rtld_error("%s: object is not dynamically-linked", path);
	- goto error;
	- }
	-
	- if (nsegs < 0) {
	- _rtld_error("%s: too few PT_LOAD segments", path);
	- goto error;
	- }
	-
	- /*
	- * Map the entire address space of the object, to stake out our
	- * contiguous region, and to establish the base address for relocation.
	- */
	- base_vaddr = rtld_trunc_page(segs[0]->p_vaddr);
	- base_vlimit = rtld_round_page(segs[nsegs]->p_vaddr + segs[nsegs]->p_memsz);
	- mapsize = base_vlimit - base_vaddr;
	- base_addr = (caddr_t) base_vaddr;
	- base_flags = __getosreldate() >= P_OSREL_MAP_GUARD ? MAP_GUARD :
	- MAP_PRIVATE \| MAP_ANON \| MAP_NOCORE;
	- if (npagesizes > 1 && rtld_round_page(segs[0]->p_filesz) >= pagesizes[1])
	- base_flags \|= MAP_ALIGNED_SUPER;
	- if (base_vaddr != 0)
	- base_flags \|= MAP_FIXED \| MAP_EXCL;
	-
	- mapbase = mmap(base_addr, mapsize, PROT_NONE, base_flags, -1, 0);
	- if (mapbase == MAP_FAILED) {
	- _rtld_error("%s: mmap of entire address space failed: %s",
	- path, rtld_strerror(errno));
	- goto error;
	- }
	- if (base_addr != NULL && mapbase != base_addr) {
	- _rtld_error("%s: mmap returned wrong address: wanted %p, got %p",
	- path, base_addr, mapbase);
	- goto error1;
	- }
	-
	- for (i = 0; i <= nsegs; i++) {
	- /* Overlay the segment onto the proper region. */
	- data_offset = rtld_trunc_page(segs[i]->p_offset);
	- data_vaddr = rtld_trunc_page(segs[i]->p_vaddr);
	- data_vlimit = rtld_round_page(segs[i]->p_vaddr + segs[i]->p_filesz);
	- data_addr = mapbase + (data_vaddr - base_vaddr);
	- data_prot = convert_prot(segs[i]->p_flags);
	- data_flags = convert_flags(segs[i]->p_flags) \| MAP_FIXED;
	- if (data_vlimit != data_vaddr &&
	- mmap(data_addr, data_vlimit - data_vaddr, data_prot,
	- data_flags \| MAP_PREFAULT_READ, fd, data_offset) == MAP_FAILED) {
	- _rtld_error("%s: mmap of data failed: %s", path,
	- rtld_strerror(errno));
	- goto error1;
	+ ++phdr;
	+ }
	+ if (phdyn == NULL) {
	+ _rtld_error("%s: object is not dynamically-linked", path);
	+ goto error;
	}

	- /* Do BSS setup */
	- if (segs[i]->p_filesz != segs[i]->p_memsz) {
	+ if (nsegs < 0) {
	+ _rtld_error("%s: too few PT_LOAD segments", path);
	+ goto error;
	+ }

	- /* Clear any BSS in the last page of the segment. */
	- clear_vaddr = segs[i]->p_vaddr + segs[i]->p_filesz;
	- clear_addr = mapbase + (clear_vaddr - base_vaddr);
	- clear_page = mapbase + (rtld_trunc_page(clear_vaddr) - base_vaddr);
	+ /*
	+ * Map the entire address space of the object, to stake out our
	+ * contiguous region, and to establish the base address for relocation.
	+ */
	+ base_vaddr = rtld_trunc_page(segs[0]->p_vaddr);
	+ base_vlimit = rtld_round_page(segs[nsegs]->p_vaddr +
	+ segs[nsegs]->p_memsz);
	+ mapsize = base_vlimit - base_vaddr;
	+ base_addr = (caddr_t)base_vaddr;
	+ base_flags = __getosreldate() >= P_OSREL_MAP_GUARD ?
	+ MAP_GUARD : MAP_PRIVATE \| MAP_ANON \| MAP_NOCORE;
	+ if (npagesizes > 1 && rtld_round_page(segs[0]->p_filesz) >=
	+ pagesizes[1])
	+ base_flags \|= MAP_ALIGNED_SUPER;
	+ if (base_vaddr != 0)
	+ base_flags \|= MAP_FIXED \| MAP_EXCL;
	+
	+ mapbase = mmap(base_addr, mapsize, PROT_NONE, base_flags, -1, 0);
	+ if (mapbase == MAP_FAILED) {
	+ _rtld_error("%s: mmap of entire address space failed: %s",
	+ path, rtld_strerror(errno));
	+ goto error;
	+ }
	+ if (base_addr != NULL && mapbase != base_addr) {
	+ _rtld_error(
	+ "%s: mmap returned wrong address: wanted %p, got %p",
	+ path, base_addr, mapbase);
	+ goto error1;
	+ }

	- if ((nclear = data_vlimit - clear_vaddr) > 0) {
	- /* Make sure the end of the segment is writable */
	- if ((data_prot & PROT_WRITE) == 0 && -1 ==
	- mprotect(clear_page, page_size, data_prot\|PROT_WRITE)) {
	- _rtld_error("%s: mprotect failed: %s", path,
	- rtld_strerror(errno));
	+ for (i = 0; i <= nsegs; i++) {
	+ /* Overlay the segment onto the proper region. */
	+ data_offset = rtld_trunc_page(segs[i]->p_offset);
	+ data_vaddr = rtld_trunc_page(segs[i]->p_vaddr);
	+ data_vlimit = rtld_round_page(segs[i]->p_vaddr +
	+ segs[i]->p_filesz);
	+ data_addr = mapbase + (data_vaddr - base_vaddr);
	+ data_prot = convert_prot(segs[i]->p_flags);
	+ data_flags = convert_flags(segs[i]->p_flags) \| MAP_FIXED;
	+ if (data_vlimit != data_vaddr && mmap(data_addr,
	+ data_vlimit - data_vaddr, data_prot, data_flags \|
	+ MAP_PREFAULT_READ, fd, data_offset) == MAP_FAILED) {
	+ _rtld_error("%s: mmap of data failed: %s",
	+ path, rtld_strerror(errno));
	goto error1;
	}

	- memset(clear_addr, 0, nclear);
	-
	- /* Reset the data protection back */
	- if ((data_prot & PROT_WRITE) == 0)
	- mprotect(clear_page, page_size, data_prot);
	- }
	-
	- /* Overlay the BSS segment onto the proper region. */
	- bss_vaddr = data_vlimit;
	- bss_vlimit = rtld_round_page(segs[i]->p_vaddr + segs[i]->p_memsz);
	- bss_addr = mapbase + (bss_vaddr - base_vaddr);
	- if (bss_vlimit > bss_vaddr) { /* There is something to do */
	- if (mmap(bss_addr, bss_vlimit - bss_vaddr, data_prot,
	- data_flags \| MAP_ANON, -1, 0) == MAP_FAILED) {
	- _rtld_error("%s: mmap of bss failed: %s", path,
	- rtld_strerror(errno));
	- goto error1;
	+ /* Do BSS setup */
	+ if (segs[i]->p_filesz != segs[i]->p_memsz) {
	+ /* Clear any BSS in the last page of the segment. */
	+ clear_vaddr = segs[i]->p_vaddr + segs[i]->p_filesz;
	+ clear_addr = mapbase + (clear_vaddr - base_vaddr);
	+ clear_page = mapbase + (rtld_trunc_page(clear_vaddr) -
	+ base_vaddr);
	+
	+ if ((nclear = data_vlimit - clear_vaddr) > 0) {
	+ /*
	+ * Make sure the end of the segment is
	+ * writable.
	+ */
	+ if ((data_prot & PROT_WRITE) == 0 &&
	+ mprotect(clear_page, page_size,
	+ data_prot \| PROT_WRITE) == -1) {
	+ _rtld_error("%s: mprotect failed: %s",
	+ path, rtld_strerror(errno));
	+ goto error1;
	+ }
	+
	+ memset(clear_addr, 0, nclear);
	+
	+ /* Reset the data protection back */
	+ if ((data_prot & PROT_WRITE) == 0)
	+ mprotect(clear_page, page_size,
	+ data_prot);
	+ }
	+
	+ /* Overlay the BSS segment onto the proper region. */
	+ bss_vaddr = data_vlimit;
	+ bss_vlimit = rtld_round_page(segs[i]->p_vaddr +
	+ segs[i]->p_memsz);
	+ bss_addr = mapbase + (bss_vaddr - base_vaddr);
	+ if (bss_vlimit > bss_vaddr) {
	+ /* There is something to do */
	+ if (mmap(bss_addr, bss_vlimit - bss_vaddr,
	+ data_prot, data_flags \| MAP_ANON, -1,
	+ 0) == MAP_FAILED) {
	+ _rtld_error(
	+ "%s: mmap of bss failed: %s",
	+ path, rtld_strerror(errno));
	+ goto error1;
	+ }
	+ }
	+ }
	+
	+ if (phdr_vaddr == 0 && data_offset <= hdr->e_phoff &&
	+ data_vlimit - data_vaddr + data_offset >=
	+ hdr->e_phoff + hdr->e_phnum * sizeof(Elf_Phdr)) {
	+ phdr_vaddr = data_vaddr + hdr->e_phoff - data_offset;
	}
	- }
	}

	- if (phdr_vaddr == 0 && data_offset <= hdr->e_phoff &&
	- (data_vlimit - data_vaddr + data_offset) >=
	- (hdr->e_phoff + hdr->e_phnum * sizeof (Elf_Phdr))) {
	- phdr_vaddr = data_vaddr + hdr->e_phoff - data_offset;
	+ obj = obj_new();
	+ if (sb != NULL) {
	+ obj->dev = sb->st_dev;
	+ obj->ino = sb->st_ino;
	+ }
	+ obj->mapbase = mapbase;
	+ obj->mapsize = mapsize;
	+ obj->vaddrbase = base_vaddr;
	+ obj->relocbase = mapbase - base_vaddr;
	+ obj->dynamic = (const Elf_Dyn *)(obj->relocbase + phdyn->p_vaddr);
	+ if (hdr->e_entry != 0)
	+ obj->entry = (caddr_t)(obj->relocbase + hdr->e_entry);
	+ if (phdr_vaddr != 0) {
	+ obj->phdr = (const Elf_Phdr *)(obj->relocbase + phdr_vaddr);
	+ } else {
	+ obj->phdr = malloc(phsize);
	+ if (obj->phdr == NULL) {
	+ obj_free(obj);
	+ _rtld_error("%s: cannot allocate program header",
	+ path);
	+ goto error1;
	+ }
	+ memcpy(__DECONST(char , obj->phdr), (char )hdr + hdr->e_phoff,
	+ phsize);
	+ obj->phdr_alloc = true;
	}
	- }
	-
	- obj = obj_new();
	- if (sb != NULL) {
	- obj->dev = sb->st_dev;
	- obj->ino = sb->st_ino;
	- }
	- obj->mapbase = mapbase;
	- obj->mapsize = mapsize;
	- obj->vaddrbase = base_vaddr;
	- obj->relocbase = mapbase - base_vaddr;
	- obj->dynamic = (const Elf_Dyn *)(obj->relocbase + phdyn->p_vaddr);
	- if (hdr->e_entry != 0)
	- obj->entry = (caddr_t)(obj->relocbase + hdr->e_entry);
	- if (phdr_vaddr != 0) {
	- obj->phdr = (const Elf_Phdr *)(obj->relocbase + phdr_vaddr);
	- } else {
	- obj->phdr = malloc(phsize);
	- if (obj->phdr == NULL) {
	- obj_free(obj);
	- _rtld_error("%s: cannot allocate program header", path);
	- goto error1;
	+ obj->phsize = phsize;
	+ if (phinterp != NULL)
	+ obj->interp = (const char *)(obj->relocbase +
	+ phinterp->p_vaddr);
	+ if (phtls != NULL) {
	+ tls_dtv_generation++;
	+ obj->tlsindex = ++tls_max_index;
	+ obj->tlssize = phtls->p_memsz;
	+ obj->tlsalign = phtls->p_align;
	+ obj->tlspoffset = phtls->p_offset;
	+ obj->tlsinitsize = phtls->p_filesz;
	+ obj->tlsinit = mapbase + phtls->p_vaddr;
	}
	- memcpy(__DECONST(char , obj->phdr), (char )hdr + hdr->e_phoff, phsize);
	- obj->phdr_alloc = true;
	- }
	- obj->phsize = phsize;
	- if (phinterp != NULL)
	- obj->interp = (const char *)(obj->relocbase + phinterp->p_vaddr);
	- if (phtls != NULL) {
	- tls_dtv_generation++;
	- obj->tlsindex = ++tls_max_index;
	- obj->tlssize = phtls->p_memsz;
	- obj->tlsalign = phtls->p_align;
	- obj->tlspoffset = phtls->p_offset;
	- obj->tlsinitsize = phtls->p_filesz;
	- obj->tlsinit = mapbase + phtls->p_vaddr;
	- }
	- obj->stack_flags = stack_flags;
	- if (note_start < note_end)
	- digest_notes(obj, note_start, note_end);
	- if (note_map != NULL)
	- munmap(note_map, note_map_len);
	- munmap(hdr, page_size);
	- return (obj);
	+ obj->stack_flags = stack_flags;
	+ if (note_start < note_end)
	+ digest_notes(obj, note_start, note_end);
	+ if (note_map != NULL)
	+ munmap(note_map, note_map_len);
	+ munmap(hdr, page_size);
	+ return (obj);

	error1:
	- munmap(mapbase, mapsize);
	+ munmap(mapbase, mapsize);
	error:
	- if (note_map != NULL && note_map != MAP_FAILED)
	- munmap(note_map, note_map_len);
	- if (!phdr_in_zero_page(hdr))
	- munmap(phdr, hdr->e_phnum * sizeof(phdr[0]));
	- munmap(hdr, page_size);
	- return (NULL);
	+ if (note_map != NULL && note_map != MAP_FAILED)
	+ munmap(note_map, note_map_len);
	+ if (!phdr_in_zero_page(hdr))
	+ munmap(phdr, hdr->e_phnum * sizeof(phdr[0]));
	+ munmap(hdr, page_size);
	+ return (NULL);
	}

	bool
	@@ -359,7 +381,8 @@
	}
	if (hdr->e_phentsize != sizeof(Elf_Phdr)) {
	_rtld_error(
	- "%s: invalid shared object: e_phentsize != sizeof(Elf_Phdr)", path);
	+ "%s: invalid shared object: e_phentsize != sizeof(Elf_Phdr)",
	+ path);
	return (false);
	}
	return (true);
	@@ -397,9 +420,8 @@
	if (phdr_in_zero_page(hdr)) {
	phdr = (Elf_Phdr )((char )hdr + hdr->e_phoff);
	} else {
	- phdr = mmap(NULL, hdr->e_phnum * sizeof(phdr[0]),
	- PROT_READ, MAP_PRIVATE \| MAP_PREFAULT_READ, fd,
	- hdr->e_phoff);
	+ phdr = mmap(NULL, hdr->e_phnum * sizeof(phdr[0]), PROT_READ,
	+ MAP_PRIVATE \| MAP_PREFAULT_READ, fd, hdr->e_phoff);
	if (phdr == MAP_FAILED) {
	_rtld_error("%s: error mapping phdr: %s", path,
	rtld_strerror(errno));
	@@ -417,55 +439,57 @@
	void
	obj_free(Obj_Entry *obj)
	{
	- Objlist_Entry *elm;
	-
	- if (obj->tls_static)
	- free_tls_offset(obj);
	- while (obj->needed != NULL) {
	- Needed_Entry *needed = obj->needed;
	- obj->needed = needed->next;
	- free(needed);
	- }
	- while (!STAILQ_EMPTY(&obj->names)) {
	- Name_Entry *entry = STAILQ_FIRST(&obj->names);
	- STAILQ_REMOVE_HEAD(&obj->names, link);
	- free(entry);
	- }
	- while (!STAILQ_EMPTY(&obj->dldags)) {
	- elm = STAILQ_FIRST(&obj->dldags);
	- STAILQ_REMOVE_HEAD(&obj->dldags, link);
	- free(elm);
	- }
	- while (!STAILQ_EMPTY(&obj->dagmembers)) {
	- elm = STAILQ_FIRST(&obj->dagmembers);
	- STAILQ_REMOVE_HEAD(&obj->dagmembers, link);
	- free(elm);
	- }
	- if (obj->vertab)
	- free(obj->vertab);
	- if (obj->origin_path)
	- free(obj->origin_path);
	- if (obj->z_origin)
	- free(__DECONST(void*, obj->rpath));
	- if (obj->priv)
	- free(obj->priv);
	- if (obj->path)
	- free(obj->path);
	- if (obj->phdr_alloc)
	- free(__DECONST(void *, obj->phdr));
	- free(obj);
	+ Objlist_Entry *elm;
	+
	+ if (obj->tls_static)
	+ free_tls_offset(obj);
	+ while (obj->needed != NULL) {
	+ Needed_Entry *needed = obj->needed;
	+
	+ obj->needed = needed->next;
	+ free(needed);
	+ }
	+ while (!STAILQ_EMPTY(&obj->names)) {
	+ Name_Entry *entry = STAILQ_FIRST(&obj->names);
	+
	+ STAILQ_REMOVE_HEAD(&obj->names, link);
	+ free(entry);
	+ }
	+ while (!STAILQ_EMPTY(&obj->dldags)) {
	+ elm = STAILQ_FIRST(&obj->dldags);
	+ STAILQ_REMOVE_HEAD(&obj->dldags, link);
	+ free(elm);
	+ }
	+ while (!STAILQ_EMPTY(&obj->dagmembers)) {
	+ elm = STAILQ_FIRST(&obj->dagmembers);
	+ STAILQ_REMOVE_HEAD(&obj->dagmembers, link);
	+ free(elm);
	+ }
	+ if (obj->vertab)
	+ free(obj->vertab);
	+ if (obj->origin_path)
	+ free(obj->origin_path);
	+ if (obj->z_origin)
	+ free(__DECONST(void *, obj->rpath));
	+ if (obj->priv)
	+ free(obj->priv);
	+ if (obj->path)
	+ free(obj->path);
	+ if (obj->phdr_alloc)
	+ free(__DECONST(void *, obj->phdr));
	+ free(obj);
	}

	Obj_Entry *
	obj_new(void)
	{
	- Obj_Entry *obj;
	+ Obj_Entry *obj;

	- obj = CNEW(Obj_Entry);
	- STAILQ_INIT(&obj->dldags);
	- STAILQ_INIT(&obj->dagmembers);
	- STAILQ_INIT(&obj->names);
	- return obj;
	+ obj = CNEW(Obj_Entry);
	+ STAILQ_INIT(&obj->dldags);
	+ STAILQ_INIT(&obj->dagmembers);
	+ STAILQ_INIT(&obj->names);
	+ return (obj);
	}

	/*
	@@ -475,26 +499,27 @@
	int
	convert_prot(int elfflags)
	{
	- int prot = 0;
	- if (elfflags & PF_R)
	- prot \|= PROT_READ;
	- if (elfflags & PF_W)
	- prot \|= PROT_WRITE;
	- if (elfflags & PF_X)
	- prot \|= PROT_EXEC;
	- return prot;
	+ int prot = 0;
	+
	+ if ((elfflags & PF_R) != 0)
	+ prot \|= PROT_READ;
	+ if ((elfflags & PF_W) != 0)
	+ prot \|= PROT_WRITE;
	+ if ((elfflags & PF_X) != 0)
	+ prot \|= PROT_EXEC;
	+ return (prot);
	}

	static int
	convert_flags(int elfflags)
	{
	- int flags = MAP_PRIVATE; /* All mappings are private */
	-
	- /*
	- * Readonly mappings are marked "MAP_NOCORE", because they can be
	- * reconstructed by a debugger.
	- */
	- if (!(elfflags & PF_W))
	- flags \|= MAP_NOCORE;
	- return flags;
	+ int flags = MAP_PRIVATE; /* All mappings are private */
	+
	+ /*
	+ * Readonly mappings are marked "MAP_NOCORE", because they can be
	+ * reconstructed by a debugger.
	+ */
	+ if ((elfflags & PF_W) == 0)
	+ flags \|= MAP_NOCORE;
	+ return (flags);
	}
	diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c
	--- a/libexec/rtld-elf/rtld.c
	+++ b/libexec/rtld-elf/rtld.c
	@@ -39,13 +39,13 @@
	*/

	#include <sys/param.h>
	-#include <sys/mount.h>
	+#include <sys/ktrace.h>
	#include <sys/mman.h>
	+#include <sys/mount.h>
	#include <sys/stat.h>
	#include <sys/sysctl.h>
	#include <sys/uio.h>
	#include <sys/utsname.h>
	-#include <sys/ktrace.h>

	#include <dlfcn.h>
	#include <err.h>
	@@ -58,20 +58,19 @@
	#include <unistd.h>

	#include "debug.h"
	-#include "rtld.h"
	#include "libmap.h"
	+#include "notes.h"
	+#include "rtld.h"
	+#include "rtld_libc.h"
	+#include "rtld_malloc.h"
	#include "rtld_paths.h"
	-#include "rtld_tls.h"
	#include "rtld_printf.h"
	-#include "rtld_malloc.h"
	+#include "rtld_tls.h"
	#include "rtld_utrace.h"
	-#include "notes.h"
	-#include "rtld_libc.h"

	/* Types. */
	typedef void (*func_ptr_type)(void);
	-typedef void * (path_enum_proc) (const char path, size_t len, void *arg);
	-
	+typedef void (path_enum_proc)(const char path, size_t len, void arg);

	/* Variables that cannot be static: */
	extern struct r_debug r_debug; /* For GDB */
	@@ -138,7 +137,7 @@
	static void objlist_remove(Objlist , Obj_Entry );
	static int open_binary_fd(const char *argv0, bool search_in_path,
	const char **binpath_res);
	-static int parse_args(char* argv[], int argc, bool use_pathp, int fdp,
	+static int parse_args(char argv[], int argc, bool use_pathp, int *fdp,
	const char *argv0, bool dir_ignore);
	static int parse_integer(const char *);
	static void path_enumerate(const char , path_enum_proc, const char , void );
	@@ -174,15 +173,15 @@
	static void unload_object(Obj_Entry , RtldLockState lockstate);
	static void unref_dag(Obj_Entry *);
	static void ref_dag(Obj_Entry *);
	-static char origin_subst_one(Obj_Entry , char , const char ,
	- const char *, bool);
	+static char origin_subst_one(Obj_Entry , char , const char , const char *,
	+ bool);
	static char origin_subst(Obj_Entry , const char *);
	static bool obj_resolve_origin(Obj_Entry *obj);
	static void preinit_main(void);
	-static int rtld_verify_versions(const Objlist *);
	-static int rtld_verify_object_versions(Obj_Entry *);
	+static int rtld_verify_versions(const Objlist *);
	+static int rtld_verify_object_versions(Obj_Entry *);
	static void object_add_name(Obj_Entry , const char );
	-static int object_match_name(const Obj_Entry , const char );
	+static int object_match_name(const Obj_Entry , const char );
	static void ld_utrace_log(int, void , void , size_t, int, const char *);
	static void rtld_fill_dl_phdr_info(const Obj_Entry *obj,
	struct dl_phdr_info *phdr_info);
	@@ -198,45 +197,49 @@
	/*
	* Data declarations.
	*/
	-struct r_debug r_debug __exported; /* for GDB; */
	-static bool libmap_disable; /* Disable libmap */
	-static bool ld_loadfltr; /* Immediate filters processing */
	-static const char libmap_override;/ Maps to use in addition to libmap.conf */
	-static bool trust; /* False for setuid and setgid programs */
	-static bool dangerous_ld_env; /* True if environment variables have been
	- used to affect the libraries loaded */
	-bool ld_bind_not; /* Disable PLT update */
	-static const char ld_bind_now; / Environment variable for immediate binding */
	+struct r_debug r_debug __exported; /* for GDB; */
	+static bool libmap_disable; /* Disable libmap */
	+static bool ld_loadfltr; /* Immediate filters processing */
	+static const char libmap_override; / Maps to use in addition to libmap.conf */
	+static bool trust; /* False for setuid and setgid programs */
	+static bool dangerous_ld_env; /* True if environment variables have been
	+ used to affect the libraries loaded */
	+bool ld_bind_not; /* Disable PLT update */
	+static const char ld_bind_now; / Environment variable for immediate binding */
	static const char ld_debug; / Environment variable for debugging */
	static bool ld_dynamic_weak = true; /* True if non-weak definition overrides
	weak definition */
	-static const char ld_library_path;/ Environment variable for search path */
	-static const char ld_library_dirs;/ Environment variable for library descriptors */
	-static const char ld_preload; / Environment variable for libraries to
	- load first */
	-static const char ld_preload_fds;/ Environment variable for libraries represented by
	- descriptors */
	-static const char ld_elf_hints_path; / Environment variable for alternative hints path */
	-static const char ld_tracing; / Called from ldd to print libs */
	-static const char ld_utrace; / Use utrace() to log events. */
	-static struct obj_entry_q obj_list; /* Queue of all loaded objects */
	-static Obj_Entry obj_main; / The main program shared object */
	-static Obj_Entry obj_rtld; /* The dynamic linker shared object */
	-static unsigned int obj_count; /* Number of objects in obj_list */
	-static unsigned int obj_loads; /* Number of loads of objects (gen count) */
	-size_t ld_static_tls_extra = /* Static TLS extra space (bytes) */
	- RTLD_STATIC_TLS_EXTRA;
	-
	-static Objlist list_global = /* Objects dlopened with RTLD_GLOBAL */
	- STAILQ_HEAD_INITIALIZER(list_global);
	-static Objlist list_main = /* Objects loaded at program startup */
	- STAILQ_HEAD_INITIALIZER(list_main);
	-static Objlist list_fini = /* Objects needing fini() calls */
	- STAILQ_HEAD_INITIALIZER(list_fini);
	-
	-Elf_Sym sym_zero; /* For resolving undefined weak refs. */
	-
	-#define GDB_STATE(s,m) r_debug.r_state = s; r_debug_state(&r_debug,m);
	+static const char ld_library_path; / Environment variable for search path */
	+static const char
	+ ld_library_dirs; / Environment variable for library descriptors */
	+static const char ld_preload; / Environment variable for libraries to
	+ load first */
	+static const char ld_preload_fds; / Environment variable for libraries
	+ represented by descriptors */
	+static const char
	+ ld_elf_hints_path; / Environment variable for alternative hints path */
	+static const char ld_tracing; / Called from ldd to print libs */
	+static const char ld_utrace; / Use utrace() to log events. */
	+static struct obj_entry_q obj_list; /* Queue of all loaded objects */
	+static Obj_Entry obj_main; / The main program shared object */
	+static Obj_Entry obj_rtld; /* The dynamic linker shared object */
	+static unsigned int obj_count; /* Number of objects in obj_list */
	+static unsigned int obj_loads; /* Number of loads of objects (gen count) */
	+size_t ld_static_tls_extra = /* Static TLS extra space (bytes) */
	+ RTLD_STATIC_TLS_EXTRA;
	+
	+static Objlist list_global = /* Objects dlopened with RTLD_GLOBAL */
	+ STAILQ_HEAD_INITIALIZER(list_global);
	+static Objlist list_main = /* Objects loaded at program startup */
	+ STAILQ_HEAD_INITIALIZER(list_main);
	+static Objlist list_fini = /* Objects needing fini() calls */
	+ STAILQ_HEAD_INITIALIZER(list_fini);
	+
	+Elf_Sym sym_zero; /* For resolving undefined weak refs. */
	+
	+#define GDB_STATE(s, m) \
	+ r_debug.r_state = s; \
	+ r_debug_state(&r_debug, m);

	extern Elf_Dyn _DYNAMIC;
	#pragma weak _DYNAMIC
	@@ -251,7 +254,7 @@
	int dladdr(const void , Dl_info ) __exported;
	void dllockinit(void , void ()(void ), void ()(void ), void ()(void ),
	void ()(void ), void ()(void ), void ()(void )) __exported;
	-int dlinfo(void , int , void ) __exported;
	+int dlinfo(void , int, void ) __exported;
	int _dl_iterate_phdr_locked(__dl_iterate_hdr_callback, void *) __exported;
	int dl_iterate_phdr(__dl_iterate_hdr_callback, void *) __exported;
	int _rtld_addr_phdr(const void , struct dl_phdr_info ) __exported;
	@@ -290,12 +293,12 @@
	/*
	* Globals to control TLS allocation.
	*/
	-size_t tls_last_offset; /* Static TLS offset of last module */
	-size_t tls_last_size; /* Static TLS size of last module */
	-size_t tls_static_space; /* Static TLS space allocated */
	+size_t tls_last_offset; /* Static TLS offset of last module */
	+size_t tls_last_size; /* Static TLS size of last module */
	+size_t tls_static_space; /* Static TLS space allocated */
	static size_t tls_static_max_align;
	-Elf_Addr tls_dtv_generation = 1; /* Used to detect when dtv size changes */
	-int tls_max_index = 1; /* Largest module index allocated */
	+Elf_Addr tls_dtv_generation = 1; /* Used to detect when dtv size changes */
	+int tls_max_index = 1; /* Largest module index allocated */

	static bool ld_library_path_rpath = false;
	bool ld_fast_sigblock = false;
	@@ -316,16 +319,16 @@
	* the currently-loaded objects. Keep this as a macro since it calls
	* alloca and we want that to occur within the scope of the caller.
	*/
	-#define donelist_init(dlp) \
	- ((dlp)->objs = alloca(obj_count * sizeof (dlp)->objs[0]), \
	- assert((dlp)->objs != NULL), \
	- (dlp)->num_alloc = obj_count, \
	- (dlp)->num_used = 0)
	+#define donelist_init(dlp) \
	+ ((dlp)->objs = alloca(obj_count * sizeof(dlp)->objs[0]), \
	+ assert((dlp)->objs != NULL), (dlp)->num_alloc = obj_count, \
	+ (dlp)->num_used = 0)

	-#define LD_UTRACE(e, h, mb, ms, r, n) do { \
	- if (ld_utrace != NULL) \
	- ld_utrace_log(e, h, mb, ms, r, n); \
	-} while (0)
	+#define LD_UTRACE(e, h, mb, ms, r, n) \
	+ do { \
	+ if (ld_utrace != NULL) \
	+ ld_utrace_log(e, h, mb, ms, r, n); \
	+ } while (0)

	static void
	ld_utrace_log(int event, void handle, void mapbase, size_t mapsize,
	@@ -347,19 +350,15 @@
	}

	struct ld_env_var_desc {
	- const char * const n;
	+ const char *const n;
	const char *val;
	- const bool unsecure:1;
	- const bool can_update:1;
	- const bool debug:1;
	- bool owned:1;
	+ const bool unsecure : 1;
	+ const bool can_update : 1;
	+ const bool debug : 1;
	+ bool owned : 1;
	};
	-#define LD_ENV_DESC(var, unsec, ...) \
	- [LD_##var] = { \
	- .n = #var, \
	- .unsecure = unsec, \
	- __VA_ARGS__ \
	- }
	+#define LD_ENV_DESC(var, unsec, ...) \
	+ [LD_##var] = { .n = #var, .unsecure = unsec, __VA_ARGS__ }

	static struct ld_env_var_desc ld_env_vars[] = {
	LD_ENV_DESC(BIND_NOW, false),
	@@ -494,506 +493,524 @@
	func_ptr_type
	_rtld(Elf_Addr sp, func_ptr_type exit_proc, Obj_Entry **objp)
	{
	- Elf_Auxinfo aux, auxp, auxpf, aux_info[AT_COUNT];
	- Objlist_Entry *entry;
	- Obj_Entry last_interposer, obj, *preload_tail;
	- const Elf_Phdr *phdr;
	- Objlist initlist;
	- RtldLockState lockstate;
	- struct stat st;
	- Elf_Addr *argcp;
	- char argv, env, *envp, kexecpath;
	- const char argv0, binpath, library_path_rpath, static_tls_extra;
	- struct ld_env_var_desc *lvd;
	- caddr_t imgentry;
	- char buf[MAXPATHLEN];
	- int argc, fd, i, mib[4], old_osrel, osrel, phnum, rtld_argc;
	- size_t sz;
	+ Elf_Auxinfo aux, auxp, auxpf, aux_info[AT_COUNT];
	+ Objlist_Entry *entry;
	+ Obj_Entry last_interposer, obj, *preload_tail;
	+ const Elf_Phdr *phdr;
	+ Objlist initlist;
	+ RtldLockState lockstate;
	+ struct stat st;
	+ Elf_Addr *argcp;
	+ char argv, env, *envp, kexecpath;
	+ const char argv0, binpath, library_path_rpath, static_tls_extra;
	+ struct ld_env_var_desc *lvd;
	+ caddr_t imgentry;
	+ char buf[MAXPATHLEN];
	+ int argc, fd, i, mib[4], old_osrel, osrel, phnum, rtld_argc;
	+ size_t sz;
	#ifdef __powerpc__
	- int old_auxv_format = 1;
	+ int old_auxv_format = 1;
	#endif
	- bool dir_enable, dir_ignore, direct_exec, explicit_fd, search_in_path;
	-
	- /*
	- * On entry, the dynamic linker itself has not been relocated yet.
	- * Be very careful not to reference any global data until after
	- * init_rtld has returned. It is OK to reference file-scope statics
	- * and string constants, and to call static and global functions.
	- */
	-
	- /* Find the auxiliary vector on the stack. */
	- argcp = sp;
	- argc = *sp++;
	- argv = (char **) sp;
	- sp += argc + 1; /* Skip over arguments and NULL terminator */
	- env = (char **) sp;
	- while (sp++ != 0) / Skip over environment, and NULL terminator */
	- ;
	- aux = (Elf_Auxinfo *) sp;
	-
	- /* Digest the auxiliary vector. */
	- for (i = 0; i < AT_COUNT; i++)
	- aux_info[i] = NULL;
	- for (auxp = aux; auxp->a_type != AT_NULL; auxp++) {
	- if (auxp->a_type < AT_COUNT)
	- aux_info[auxp->a_type] = auxp;
	+ bool dir_enable, dir_ignore, direct_exec, explicit_fd, search_in_path;
	+
	+ /*
	+ * On entry, the dynamic linker itself has not been relocated yet.
	+ * Be very careful not to reference any global data until after
	+ * init_rtld has returned. It is OK to reference file-scope statics
	+ * and string constants, and to call static and global functions.
	+ */
	+
	+ /* Find the auxiliary vector on the stack. */
	+ argcp = sp;
	+ argc = *sp++;
	+ argv = (char **)sp;
	+ sp += argc + 1; /* Skip over arguments and NULL terminator */
	+ env = (char **)sp;
	+ while (sp++ != 0) / Skip over environment, and NULL terminator */
	+ ;
	+ aux = (Elf_Auxinfo *)sp;
	+
	+ /* Digest the auxiliary vector. */
	+ for (i = 0; i < AT_COUNT; i++)
	+ aux_info[i] = NULL;
	+ for (auxp = aux; auxp->a_type != AT_NULL; auxp++) {
	+ if (auxp->a_type < AT_COUNT)
	+ aux_info[auxp->a_type] = auxp;
	#ifdef __powerpc__
	- if (auxp->a_type == 23) /* AT_STACKPROT */
	- old_auxv_format = 0;
	+ if (auxp->a_type == 23) /* AT_STACKPROT */
	+ old_auxv_format = 0;
	#endif
	- }
	+ }

	#ifdef __powerpc__
	- if (old_auxv_format) {
	- /* Remap from old-style auxv numbers. */
	- aux_info[23] = aux_info[21]; /* AT_STACKPROT */
	- aux_info[21] = aux_info[19]; /* AT_PAGESIZESLEN */
	- aux_info[19] = aux_info[17]; /* AT_NCPUS */
	- aux_info[17] = aux_info[15]; /* AT_CANARYLEN */
	- aux_info[15] = aux_info[13]; /* AT_EXECPATH */
	- aux_info[13] = NULL; /* AT_GID */
	-
	- aux_info[20] = aux_info[18]; /* AT_PAGESIZES */
	- aux_info[18] = aux_info[16]; /* AT_OSRELDATE */
	- aux_info[16] = aux_info[14]; /* AT_CANARY */
	- aux_info[14] = NULL; /* AT_EGID */
	- }
	+ if (old_auxv_format) {
	+ /* Remap from old-style auxv numbers. */
	+ aux_info[23] = aux_info[21]; /* AT_STACKPROT */
	+ aux_info[21] = aux_info[19]; /* AT_PAGESIZESLEN */
	+ aux_info[19] = aux_info[17]; /* AT_NCPUS */
	+ aux_info[17] = aux_info[15]; /* AT_CANARYLEN */
	+ aux_info[15] = aux_info[13]; /* AT_EXECPATH */
	+ aux_info[13] = NULL; /* AT_GID */
	+
	+ aux_info[20] = aux_info[18]; /* AT_PAGESIZES */
	+ aux_info[18] = aux_info[16]; /* AT_OSRELDATE */
	+ aux_info[16] = aux_info[14]; /* AT_CANARY */
	+ aux_info[14] = NULL; /* AT_EGID */
	+ }
	#endif

	- /* Initialize and relocate ourselves. */
	- assert(aux_info[AT_BASE] != NULL);
	- init_rtld((caddr_t) aux_info[AT_BASE]->a_un.a_ptr, aux_info);
	-
	- dlerror_dflt_init();
	-
	- __progname = obj_rtld.path;
	- argv0 = argv[0] != NULL ? argv[0] : "(null)";
	- environ = env;
	- main_argc = argc;
	- main_argv = argv;
	-
	- if (aux_info[AT_BSDFLAGS] != NULL &&
	- (aux_info[AT_BSDFLAGS]->a_un.a_val & ELF_BSDF_SIGFASTBLK) != 0)
	- ld_fast_sigblock = true;
	-
	- trust = !issetugid();
	- direct_exec = false;
	-
	- md_abi_variant_hook(aux_info);
	- rtld_init_env_vars(env);
	-
	- fd = -1;
	- if (aux_info[AT_EXECFD] != NULL) {
	- fd = aux_info[AT_EXECFD]->a_un.a_val;
	- } else {
	- assert(aux_info[AT_PHDR] != NULL);
	- phdr = (const Elf_Phdr *)aux_info[AT_PHDR]->a_un.a_ptr;
	- if (phdr == obj_rtld.phdr) {
	- if (!trust) {
	- _rtld_error("Tainted process refusing to run binary %s",
	- argv0);
	- rtld_die();
	- }
	- direct_exec = true;
	-
	- dbg("opening main program in direct exec mode");
	- if (argc >= 2) {
	- rtld_argc = parse_args(argv, argc, &search_in_path, &fd,
	- &argv0, &dir_ignore);
	- explicit_fd = (fd != -1);
	- binpath = NULL;
	- if (!explicit_fd)
	- fd = open_binary_fd(argv0, search_in_path, &binpath);
	- if (fstat(fd, &st) == -1) {
	- _rtld_error("Failed to fstat FD %d (%s): %s", fd,
	- explicit_fd ? "user-provided descriptor" : argv0,
	- rtld_strerror(errno));
	- rtld_die();
	- }
	+ /* Initialize and relocate ourselves. */
	+ assert(aux_info[AT_BASE] != NULL);
	+ init_rtld((caddr_t)aux_info[AT_BASE]->a_un.a_ptr, aux_info);

	- /*
	- * Rough emulation of the permission checks done by
	- * execve(2), only Unix DACs are checked, ACLs are
	- * ignored. Preserve the semantic of disabling owner
	- * to execute if owner x bit is cleared, even if
	- * others x bit is enabled.
	- * mmap(2) does not allow to mmap with PROT_EXEC if
	- * binary' file comes from noexec mount. We cannot
	- * set a text reference on the binary.
	- */
	- dir_enable = false;
	- if (st.st_uid == geteuid()) {
	- if ((st.st_mode & S_IXUSR) != 0)
	- dir_enable = true;
	- } else if (st.st_gid == getegid()) {
	- if ((st.st_mode & S_IXGRP) != 0)
	- dir_enable = true;
	- } else if ((st.st_mode & S_IXOTH) != 0) {
	- dir_enable = true;
	- }
	- if (!dir_enable && !dir_ignore) {
	- _rtld_error("No execute permission for binary %s",
	- argv0);
	- rtld_die();
	- }
	+ dlerror_dflt_init();

	- /*
	- * For direct exec mode, argv[0] is the interpreter
	- * name, we must remove it and shift arguments left
	- * before invoking binary main. Since stack layout
	- * places environment pointers and aux vectors right
	- * after the terminating NULL, we must shift
	- * environment and aux as well.
	- */
	- main_argc = argc - rtld_argc;
	- for (i = 0; i <= main_argc; i++)
	- argv[i] = argv[i + rtld_argc];
	- *argcp -= rtld_argc;
	- environ = env = envp = argv + main_argc + 1;
	- dbg("move env from %p to %p", envp + rtld_argc, envp);
	- do {
	- envp = (envp + rtld_argc);
	- } while (*envp++ != NULL);
	- aux = auxp = (Elf_Auxinfo *)envp;
	- auxpf = (Elf_Auxinfo *)(envp + rtld_argc);
	- dbg("move aux from %p to %p", auxpf, aux);
	- /* XXXKIB insert place for AT_EXECPATH if not present */
	- for (;; auxp++, auxpf++) {
	- auxp = auxpf;
	- if (auxp->a_type == AT_NULL)
	- break;
	- }
	- /* Since the auxiliary vector has moved, redigest it. */
	- for (i = 0; i < AT_COUNT; i++)
	- aux_info[i] = NULL;
	- for (auxp = aux; auxp->a_type != AT_NULL; auxp++) {
	- if (auxp->a_type < AT_COUNT)
	- aux_info[auxp->a_type] = auxp;
	+ __progname = obj_rtld.path;
	+ argv0 = argv[0] != NULL ? argv[0] : "(null)";
	+ environ = env;
	+ main_argc = argc;
	+ main_argv = argv;
	+
	+ if (aux_info[AT_BSDFLAGS] != NULL &&
	+ (aux_info[AT_BSDFLAGS]->a_un.a_val & ELF_BSDF_SIGFASTBLK) != 0)
	+ ld_fast_sigblock = true;
	+
	+ trust = !issetugid();
	+ direct_exec = false;
	+
	+ md_abi_variant_hook(aux_info);
	+ rtld_init_env_vars(env);
	+
	+ fd = -1;
	+ if (aux_info[AT_EXECFD] != NULL) {
	+ fd = aux_info[AT_EXECFD]->a_un.a_val;
	+ } else {
	+ assert(aux_info[AT_PHDR] != NULL);
	+ phdr = (const Elf_Phdr *)aux_info[AT_PHDR]->a_un.a_ptr;
	+ if (phdr == obj_rtld.phdr) {
	+ if (!trust) {
	+ _rtld_error(
	+ "Tainted process refusing to run binary %s",
	+ argv0);
	+ rtld_die();
	+ }
	+ direct_exec = true;
	+
	+ dbg("opening main program in direct exec mode");
	+ if (argc >= 2) {
	+ rtld_argc = parse_args(argv, argc,
	+ &search_in_path, &fd, &argv0, &dir_ignore);
	+ explicit_fd = (fd != -1);
	+ binpath = NULL;
	+ if (!explicit_fd)
	+ fd = open_binary_fd(argv0,
	+ search_in_path, &binpath);
	+ if (fstat(fd, &st) == -1) {
	+ _rtld_error(
	+ "Failed to fstat FD %d (%s): %s",
	+ fd,
	+ explicit_fd ?
	+ "user-provided descriptor" :
	+ argv0,
	+ rtld_strerror(errno));
	+ rtld_die();
	+ }
	+
	+ /*
	+ * Rough emulation of the permission checks done
	+ * by execve(2), only Unix DACs are checked,
	+ * ACLs are ignored. Preserve the semantic of
	+ * disabling owner to execute if owner x bit is
	+ * cleared, even if others x bit is enabled.
	+ * mmap(2) does not allow to mmap with PROT_EXEC
	+ * if binary' file comes from noexec mount. We
	+ * cannot set a text reference on the binary.
	+ */
	+ dir_enable = false;
	+ if (st.st_uid == geteuid()) {
	+ if ((st.st_mode & S_IXUSR) != 0)
	+ dir_enable = true;
	+ } else if (st.st_gid == getegid()) {
	+ if ((st.st_mode & S_IXGRP) != 0)
	+ dir_enable = true;
	+ } else if ((st.st_mode & S_IXOTH) != 0) {
	+ dir_enable = true;
	+ }
	+ if (!dir_enable && !dir_ignore) {
	+ _rtld_error(
	+ "No execute permission for binary %s",
	+ argv0);
	+ rtld_die();
	+ }
	+
	+ /*
	+ * For direct exec mode, argv[0] is the
	+ * interpreter name, we must remove it and shift
	+ * arguments left before invoking binary main.
	+ * Since stack layout places environment
	+ * pointers and aux vectors right after the
	+ * terminating NULL, we must shift environment
	+ * and aux as well.
	+ */
	+ main_argc = argc - rtld_argc;
	+ for (i = 0; i <= main_argc; i++)
	+ argv[i] = argv[i + rtld_argc];
	+ *argcp -= rtld_argc;
	+ environ = env = envp = argv + main_argc + 1;
	+ dbg("move env from %p to %p", envp + rtld_argc,
	+ envp);
	+ do {
	+ envp = (envp + rtld_argc);
	+ } while (*envp++ != NULL);
	+ aux = auxp = (Elf_Auxinfo *)envp;
	+ auxpf = (Elf_Auxinfo *)(envp + rtld_argc);
	+ dbg("move aux from %p to %p", auxpf, aux);
	+ /* XXXKIB insert place for AT_EXECPATH if not
	+ * present */
	+ for (;; auxp++, auxpf++) {
	+ auxp = auxpf;
	+ if (auxp->a_type == AT_NULL)
	+ break;
	+ }
	+ /* Since the auxiliary vector has moved,
	+ * redigest it. */
	+ for (i = 0; i < AT_COUNT; i++)
	+ aux_info[i] = NULL;
	+ for (auxp = aux; auxp->a_type != AT_NULL;
	+ auxp++) {
	+ if (auxp->a_type < AT_COUNT)
	+ aux_info[auxp->a_type] = auxp;
	+ }
	+
	+ /* Point AT_EXECPATH auxv and aux_info to the
	+ * binary path. */
	+ if (binpath == NULL) {
	+ aux_info[AT_EXECPATH] = NULL;
	+ } else {
	+ if (aux_info[AT_EXECPATH] == NULL) {
	+ aux_info[AT_EXECPATH] = xmalloc(
	+ sizeof(Elf_Auxinfo));
	+ aux_info[AT_EXECPATH]->a_type =
	+ AT_EXECPATH;
	+ }
	+ aux_info[AT_EXECPATH]->a_un.a_ptr =
	+ __DECONST(void *, binpath);
	+ }
	+ } else {
	+ _rtld_error("No binary");
	+ rtld_die();
	+ }
	}
	+ }

	- /* Point AT_EXECPATH auxv and aux_info to the binary path. */
	- if (binpath == NULL) {
	- aux_info[AT_EXECPATH] = NULL;
	- } else {
	- if (aux_info[AT_EXECPATH] == NULL) {
	- aux_info[AT_EXECPATH] = xmalloc(sizeof(Elf_Auxinfo));
	- aux_info[AT_EXECPATH]->a_type = AT_EXECPATH;
	- }
	- aux_info[AT_EXECPATH]->a_un.a_ptr = __DECONST(void *,
	- binpath);
	+ ld_bind_now = ld_get_env_var(LD_BIND_NOW);
	+
	+ /*
	+ * If the process is tainted, then we un-set the dangerous environment
	+ * variables. The process will be marked as tainted until setuid(2)
	+ * is called. If any child process calls setuid(2) we do not want any
	+ * future processes to honor the potentially un-safe variables.
	+ */
	+ if (!trust) {
	+ for (i = 0; i < (int)nitems(ld_env_vars); i++) {
	+ lvd = &ld_env_vars[i];
	+ if (lvd->unsecure)
	+ lvd->val = NULL;
	}
	- } else {
	- _rtld_error("No binary");
	- rtld_die();
	- }
	- }
	- }
	-
	- ld_bind_now = ld_get_env_var(LD_BIND_NOW);
	-
	- /*
	- * If the process is tainted, then we un-set the dangerous environment
	- * variables. The process will be marked as tainted until setuid(2)
	- * is called. If any child process calls setuid(2) we do not want any
	- * future processes to honor the potentially un-safe variables.
	- */
	- if (!trust) {
	- for (i = 0; i < (int)nitems(ld_env_vars); i++) {
	- lvd = &ld_env_vars[i];
	- if (lvd->unsecure)
	- lvd->val = NULL;
	- }
	- }
	-
	- ld_debug = ld_get_env_var(LD_DEBUG);
	- if (ld_bind_now == NULL)
	- ld_bind_not = ld_get_env_var(LD_BIND_NOT) != NULL;
	- ld_dynamic_weak = ld_get_env_var(LD_DYNAMIC_WEAK) == NULL;
	- libmap_disable = ld_get_env_var(LD_LIBMAP_DISABLE) != NULL;
	- libmap_override = ld_get_env_var(LD_LIBMAP);
	- ld_library_path = ld_get_env_var(LD_LIBRARY_PATH);
	- ld_library_dirs = ld_get_env_var(LD_LIBRARY_PATH_FDS);
	- ld_preload = ld_get_env_var(LD_PRELOAD);
	- ld_preload_fds = ld_get_env_var(LD_PRELOAD_FDS);
	- ld_elf_hints_path = ld_get_env_var(LD_ELF_HINTS_PATH);
	- ld_loadfltr = ld_get_env_var(LD_LOADFLTR) != NULL;
	- library_path_rpath = ld_get_env_var(LD_LIBRARY_PATH_RPATH);
	- if (library_path_rpath != NULL) {
	- if (library_path_rpath[0] == 'y' \|\|
	- library_path_rpath[0] == 'Y' \|\|
	- library_path_rpath[0] == '1')
	- ld_library_path_rpath = true;
	- else
	- ld_library_path_rpath = false;
	- }
	- static_tls_extra = ld_get_env_var(LD_STATIC_TLS_EXTRA);
	- if (static_tls_extra != NULL && static_tls_extra[0] != '\0') {
	- sz = parse_integer(static_tls_extra);
	- if (sz >= RTLD_STATIC_TLS_EXTRA && sz <= SIZE_T_MAX)
	- ld_static_tls_extra = sz;
	- }
	- dangerous_ld_env = libmap_disable \|\| libmap_override != NULL \|\|
	- ld_library_path != NULL \|\| ld_preload != NULL \|\|
	- ld_elf_hints_path != NULL \|\| ld_loadfltr \|\| !ld_dynamic_weak \|\|
	- static_tls_extra != NULL;
	- ld_tracing = ld_get_env_var(LD_TRACE_LOADED_OBJECTS);
	- ld_utrace = ld_get_env_var(LD_UTRACE);
	-
	- set_ld_elf_hints_path();
	- if (ld_debug != NULL && *ld_debug != '\0')
	- debug = 1;
	- dbg("%s is initialized, base address = %p", __progname,
	- (caddr_t) aux_info[AT_BASE]->a_un.a_ptr);
	- dbg("RTLD dynamic = %p", obj_rtld.dynamic);
	- dbg("RTLD pltgot = %p", obj_rtld.pltgot);
	-
	- dbg("initializing thread locks");
	- lockdflt_init();
	-
	- /*
	- * Load the main program, or process its program header if it is
	- * already loaded.
	- */
	- if (fd != -1) { /* Load the main program. */
	- dbg("loading main program");
	- obj_main = map_object(fd, argv0, NULL);
	- close(fd);
	- if (obj_main == NULL)
	- rtld_die();
	- max_stack_flags = obj_main->stack_flags;
	- } else { /* Main program already loaded. */
	- dbg("processing main program's program header");
	- assert(aux_info[AT_PHDR] != NULL);
	- phdr = (const Elf_Phdr *) aux_info[AT_PHDR]->a_un.a_ptr;
	- assert(aux_info[AT_PHNUM] != NULL);
	- phnum = aux_info[AT_PHNUM]->a_un.a_val;
	- assert(aux_info[AT_PHENT] != NULL);
	- assert(aux_info[AT_PHENT]->a_un.a_val == sizeof(Elf_Phdr));
	- assert(aux_info[AT_ENTRY] != NULL);
	- imgentry = (caddr_t) aux_info[AT_ENTRY]->a_un.a_ptr;
	- if ((obj_main = digest_phdr(phdr, phnum, imgentry, argv0)) == NULL)
	- rtld_die();
	- }
	-
	- if (aux_info[AT_EXECPATH] != NULL && fd == -1) {
	- kexecpath = aux_info[AT_EXECPATH]->a_un.a_ptr;
	- dbg("AT_EXECPATH %p %s", kexecpath, kexecpath);
	- if (kexecpath[0] == '/')
	- obj_main->path = kexecpath;
	- else if (getcwd(buf, sizeof(buf)) == NULL \|\|
	- strlcat(buf, "/", sizeof(buf)) >= sizeof(buf) \|\|
	- strlcat(buf, kexecpath, sizeof(buf)) >= sizeof(buf))
	- obj_main->path = xstrdup(argv0);
	- else
	- obj_main->path = xstrdup(buf);
	- } else {
	- dbg("No AT_EXECPATH or direct exec");
	- obj_main->path = xstrdup(argv0);
	- }
	- dbg("obj_main path %s", obj_main->path);
	- obj_main->mainprog = true;
	-
	- if (aux_info[AT_STACKPROT] != NULL &&
	- aux_info[AT_STACKPROT]->a_un.a_val != 0)
	- stack_prot = aux_info[AT_STACKPROT]->a_un.a_val;
	+ }
	+
	+ ld_debug = ld_get_env_var(LD_DEBUG);
	+ if (ld_bind_now == NULL)
	+ ld_bind_not = ld_get_env_var(LD_BIND_NOT) != NULL;
	+ ld_dynamic_weak = ld_get_env_var(LD_DYNAMIC_WEAK) == NULL;
	+ libmap_disable = ld_get_env_var(LD_LIBMAP_DISABLE) != NULL;
	+ libmap_override = ld_get_env_var(LD_LIBMAP);
	+ ld_library_path = ld_get_env_var(LD_LIBRARY_PATH);
	+ ld_library_dirs = ld_get_env_var(LD_LIBRARY_PATH_FDS);
	+ ld_preload = ld_get_env_var(LD_PRELOAD);
	+ ld_preload_fds = ld_get_env_var(LD_PRELOAD_FDS);
	+ ld_elf_hints_path = ld_get_env_var(LD_ELF_HINTS_PATH);
	+ ld_loadfltr = ld_get_env_var(LD_LOADFLTR) != NULL;
	+ library_path_rpath = ld_get_env_var(LD_LIBRARY_PATH_RPATH);
	+ if (library_path_rpath != NULL) {
	+ if (library_path_rpath[0] == 'y' \|\|
	+ library_path_rpath[0] == 'Y' \|\|
	+ library_path_rpath[0] == '1')
	+ ld_library_path_rpath = true;
	+ else
	+ ld_library_path_rpath = false;
	+ }
	+ static_tls_extra = ld_get_env_var(LD_STATIC_TLS_EXTRA);
	+ if (static_tls_extra != NULL && static_tls_extra[0] != '\0') {
	+ sz = parse_integer(static_tls_extra);
	+ if (sz >= RTLD_STATIC_TLS_EXTRA && sz <= SIZE_T_MAX)
	+ ld_static_tls_extra = sz;
	+ }
	+ dangerous_ld_env = libmap_disable \|\| libmap_override != NULL \|\|
	+ ld_library_path != NULL \|\| ld_preload != NULL \|\|
	+ ld_elf_hints_path != NULL \|\| ld_loadfltr \|\| !ld_dynamic_weak \|\|
	+ static_tls_extra != NULL;
	+ ld_tracing = ld_get_env_var(LD_TRACE_LOADED_OBJECTS);
	+ ld_utrace = ld_get_env_var(LD_UTRACE);
	+
	+ set_ld_elf_hints_path();
	+ if (ld_debug != NULL && *ld_debug != '\0')
	+ debug = 1;
	+ dbg("%s is initialized, base address = %p", __progname,
	+ (caddr_t)aux_info[AT_BASE]->a_un.a_ptr);
	+ dbg("RTLD dynamic = %p", obj_rtld.dynamic);
	+ dbg("RTLD pltgot = %p", obj_rtld.pltgot);
	+
	+ dbg("initializing thread locks");
	+ lockdflt_init();
	+
	+ /*
	+ * Load the main program, or process its program header if it is
	+ * already loaded.
	+ */
	+ if (fd != -1) { /* Load the main program. */
	+ dbg("loading main program");
	+ obj_main = map_object(fd, argv0, NULL);
	+ close(fd);
	+ if (obj_main == NULL)
	+ rtld_die();
	+ max_stack_flags = obj_main->stack_flags;
	+ } else { /* Main program already loaded. */
	+ dbg("processing main program's program header");
	+ assert(aux_info[AT_PHDR] != NULL);
	+ phdr = (const Elf_Phdr *)aux_info[AT_PHDR]->a_un.a_ptr;
	+ assert(aux_info[AT_PHNUM] != NULL);
	+ phnum = aux_info[AT_PHNUM]->a_un.a_val;
	+ assert(aux_info[AT_PHENT] != NULL);
	+ assert(aux_info[AT_PHENT]->a_un.a_val == sizeof(Elf_Phdr));
	+ assert(aux_info[AT_ENTRY] != NULL);
	+ imgentry = (caddr_t)aux_info[AT_ENTRY]->a_un.a_ptr;
	+ if ((obj_main = digest_phdr(phdr, phnum, imgentry, argv0)) ==
	+ NULL)
	+ rtld_die();
	+ }
	+
	+ if (aux_info[AT_EXECPATH] != NULL && fd == -1) {
	+ kexecpath = aux_info[AT_EXECPATH]->a_un.a_ptr;
	+ dbg("AT_EXECPATH %p %s", kexecpath, kexecpath);
	+ if (kexecpath[0] == '/')
	+ obj_main->path = kexecpath;
	+ else if (getcwd(buf, sizeof(buf)) == NULL \|\|
	+ strlcat(buf, "/", sizeof(buf)) >= sizeof(buf) \|\|
	+ strlcat(buf, kexecpath, sizeof(buf)) >= sizeof(buf))
	+ obj_main->path = xstrdup(argv0);
	+ else
	+ obj_main->path = xstrdup(buf);
	+ } else {
	+ dbg("No AT_EXECPATH or direct exec");
	+ obj_main->path = xstrdup(argv0);
	+ }
	+ dbg("obj_main path %s", obj_main->path);
	+ obj_main->mainprog = true;
	+
	+ if (aux_info[AT_STACKPROT] != NULL &&
	+ aux_info[AT_STACKPROT]->a_un.a_val != 0)
	+ stack_prot = aux_info[AT_STACKPROT]->a_un.a_val;

	#ifndef COMPAT_libcompat
	- /*
	- * Get the actual dynamic linker pathname from the executable if
	- * possible. (It should always be possible.) That ensures that
	- * gdb will find the right dynamic linker even if a non-standard
	- * one is being used.
	- */
	- if (obj_main->interp != NULL &&
	- strcmp(obj_main->interp, obj_rtld.path) != 0) {
	- free(obj_rtld.path);
	- obj_rtld.path = xstrdup(obj_main->interp);
	- __progname = obj_rtld.path;
	- }
	+ /*
	+ * Get the actual dynamic linker pathname from the executable if
	+ * possible. (It should always be possible.) That ensures that
	+ * gdb will find the right dynamic linker even if a non-standard
	+ * one is being used.
	+ */
	+ if (obj_main->interp != NULL &&
	+ strcmp(obj_main->interp, obj_rtld.path) != 0) {
	+ free(obj_rtld.path);
	+ obj_rtld.path = xstrdup(obj_main->interp);
	+ __progname = obj_rtld.path;
	+ }
	#endif

	- if (!digest_dynamic(obj_main, 0))
	- rtld_die();
	- dbg("%s valid_hash_sysv %d valid_hash_gnu %d dynsymcount %d",
	- obj_main->path, obj_main->valid_hash_sysv, obj_main->valid_hash_gnu,
	- obj_main->dynsymcount);
	-
	- linkmap_add(obj_main);
	- linkmap_add(&obj_rtld);
	-
	- /* Link the main program into the list of objects. */
	- TAILQ_INSERT_HEAD(&obj_list, obj_main, next);
	- obj_count++;
	- obj_loads++;
	-
	- /* Initialize a fake symbol for resolving undefined weak references. */
	- sym_zero.st_info = ELF_ST_INFO(STB_GLOBAL, STT_NOTYPE);
	- sym_zero.st_shndx = SHN_UNDEF;
	- sym_zero.st_value = -(uintptr_t)obj_main->relocbase;
	-
	- if (!libmap_disable)
	- libmap_disable = (bool)lm_init(libmap_override);
	-
	- if (aux_info[AT_KPRELOAD] != NULL &&
	- aux_info[AT_KPRELOAD]->a_un.a_ptr != NULL) {
	- dbg("loading kernel vdso");
	- if (load_kpreload(aux_info[AT_KPRELOAD]->a_un.a_ptr) == -1)
	- rtld_die();
	- }
	-
	- dbg("loading LD_PRELOAD_FDS libraries");
	- if (load_preload_objects(ld_preload_fds, true) == -1)
	- rtld_die();
	+ if (!digest_dynamic(obj_main, 0))
	+ rtld_die();
	+ dbg("%s valid_hash_sysv %d valid_hash_gnu %d dynsymcount %d",
	+ obj_main->path, obj_main->valid_hash_sysv, obj_main->valid_hash_gnu,
	+ obj_main->dynsymcount);

	- dbg("loading LD_PRELOAD libraries");
	- if (load_preload_objects(ld_preload, false) == -1)
	- rtld_die();
	- preload_tail = globallist_curr(TAILQ_LAST(&obj_list, obj_entry_q));
	+ linkmap_add(obj_main);
	+ linkmap_add(&obj_rtld);

	- dbg("loading needed objects");
	- if (load_needed_objects(obj_main, ld_tracing != NULL ? RTLD_LO_TRACE :
	- 0) == -1)
	- rtld_die();
	+ /* Link the main program into the list of objects. */
	+ TAILQ_INSERT_HEAD(&obj_list, obj_main, next);
	+ obj_count++;
	+ obj_loads++;

	- /* Make a list of all objects loaded at startup. */
	- last_interposer = obj_main;
	- TAILQ_FOREACH(obj, &obj_list, next) {
	- if (obj->marker)
	- continue;
	- if (obj->z_interpose && obj != obj_main) {
	- objlist_put_after(&list_main, last_interposer, obj);
	- last_interposer = obj;
	- } else {
	- objlist_push_tail(&list_main, obj);
	+ /* Initialize a fake symbol for resolving undefined weak references. */
	+ sym_zero.st_info = ELF_ST_INFO(STB_GLOBAL, STT_NOTYPE);
	+ sym_zero.st_shndx = SHN_UNDEF;
	+ sym_zero.st_value = -(uintptr_t)obj_main->relocbase;
	+
	+ if (!libmap_disable)
	+ libmap_disable = (bool)lm_init(libmap_override);
	+
	+ if (aux_info[AT_KPRELOAD] != NULL &&
	+ aux_info[AT_KPRELOAD]->a_un.a_ptr != NULL) {
	+ dbg("loading kernel vdso");
	+ if (load_kpreload(aux_info[AT_KPRELOAD]->a_un.a_ptr) == -1)
	+ rtld_die();
	}
	- obj->refcount++;
	- }

	- dbg("checking for required versions");
	- if (rtld_verify_versions(&list_main) == -1 && !ld_tracing)
	- rtld_die();
	+ dbg("loading LD_PRELOAD_FDS libraries");
	+ if (load_preload_objects(ld_preload_fds, true) == -1)
	+ rtld_die();
	+
	+ dbg("loading LD_PRELOAD libraries");
	+ if (load_preload_objects(ld_preload, false) == -1)
	+ rtld_die();
	+ preload_tail = globallist_curr(TAILQ_LAST(&obj_list, obj_entry_q));

	- if (ld_get_env_var(LD_SHOW_AUXV) != NULL)
	- dump_auxv(aux_info);
	+ dbg("loading needed objects");
	+ if (load_needed_objects(obj_main,
	+ ld_tracing != NULL ? RTLD_LO_TRACE : 0) == -1)
	+ rtld_die();

	- if (ld_tracing) { /* We're done */
	- trace_loaded_objects(obj_main, true);
	- exit(0);
	- }
	-
	- if (ld_get_env_var(LD_DUMP_REL_PRE) != NULL) {
	- dump_relocations(obj_main);
	- exit (0);
	- }
	-
	- /*
	- * Processing tls relocations requires having the tls offsets
	- * initialized. Prepare offsets before starting initial
	- * relocation processing.
	- */
	- dbg("initializing initial thread local storage offsets");
	- STAILQ_FOREACH(entry, &list_main, link) {
	- /*
	- * Allocate all the initial objects out of the static TLS
	- * block even if they didn't ask for it.
	- */
	- allocate_tls_offset(entry->obj);
	- }
	+ /* Make a list of all objects loaded at startup. */
	+ last_interposer = obj_main;
	+ TAILQ_FOREACH(obj, &obj_list, next) {
	+ if (obj->marker)
	+ continue;
	+ if (obj->z_interpose && obj != obj_main) {
	+ objlist_put_after(&list_main, last_interposer, obj);
	+ last_interposer = obj;
	+ } else {
	+ objlist_push_tail(&list_main, obj);
	+ }
	+ obj->refcount++;
	+ }

	- if (relocate_objects(obj_main,
	- ld_bind_now != NULL && *ld_bind_now != '\0',
	- &obj_rtld, SYMLOOK_EARLY, NULL) == -1)
	- rtld_die();
	+ dbg("checking for required versions");
	+ if (rtld_verify_versions(&list_main) == -1 && !ld_tracing)
	+ rtld_die();

	- dbg("doing copy relocations");
	- if (do_copy_relocations(obj_main) == -1)
	- rtld_die();
	+ if (ld_get_env_var(LD_SHOW_AUXV) != NULL)
	+ dump_auxv(aux_info);

	- if (ld_get_env_var(LD_DUMP_REL_POST) != NULL) {
	- dump_relocations(obj_main);
	- exit (0);
	- }
	+ if (ld_tracing) { /* We're done */
	+ trace_loaded_objects(obj_main, true);
	+ exit(0);
	+ }

	- ifunc_init(aux_info);
	+ if (ld_get_env_var(LD_DUMP_REL_PRE) != NULL) {
	+ dump_relocations(obj_main);
	+ exit(0);
	+ }

	- /*
	- * Setup TLS for main thread. This must be done after the
	- * relocations are processed, since tls initialization section
	- * might be the subject for relocations.
	- */
	- dbg("initializing initial thread local storage");
	- allocate_initial_tls(globallist_curr(TAILQ_FIRST(&obj_list)));
	+ /*
	+ * Processing tls relocations requires having the tls offsets
	+ * initialized. Prepare offsets before starting initial
	+ * relocation processing.
	+ */
	+ dbg("initializing initial thread local storage offsets");
	+ STAILQ_FOREACH(entry, &list_main, link) {
	+ /*
	+ * Allocate all the initial objects out of the static TLS
	+ * block even if they didn't ask for it.
	+ */
	+ allocate_tls_offset(entry->obj);
	+ }

	- dbg("initializing key program variables");
	- set_program_var("__progname", argv[0] != NULL ? basename(argv[0]) : "");
	- set_program_var("environ", env);
	- set_program_var("__elf_aux_vector", aux);
	+ if (relocate_objects(obj_main,
	+ ld_bind_now != NULL && *ld_bind_now != '\0', &obj_rtld,
	+ SYMLOOK_EARLY, NULL) == -1)
	+ rtld_die();

	- /* Make a list of init functions to call. */
	- objlist_init(&initlist);
	- initlist_add_objects(globallist_curr(TAILQ_FIRST(&obj_list)),
	- preload_tail, &initlist);
	+ dbg("doing copy relocations");
	+ if (do_copy_relocations(obj_main) == -1)
	+ rtld_die();

	- r_debug_state(NULL, &obj_main->linkmap); /* say hello to gdb! */
	+ if (ld_get_env_var(LD_DUMP_REL_POST) != NULL) {
	+ dump_relocations(obj_main);
	+ exit(0);
	+ }

	- map_stacks_exec(NULL);
	+ ifunc_init(aux_info);

	- if (!obj_main->crt_no_init) {
	/*
	- * Make sure we don't call the main program's init and fini
	- * functions for binaries linked with old crt1 which calls
	- * _init itself.
	+ * Setup TLS for main thread. This must be done after the
	+ * relocations are processed, since tls initialization section
	+ * might be the subject for relocations.
	*/
	- obj_main->init = obj_main->fini = (Elf_Addr)NULL;
	- obj_main->preinit_array = obj_main->init_array =
	- obj_main->fini_array = (Elf_Addr)NULL;
	- }
	-
	- if (direct_exec) {
	- /* Set osrel for direct-execed binary */
	- mib[0] = CTL_KERN;
	- mib[1] = KERN_PROC;
	- mib[2] = KERN_PROC_OSREL;
	- mib[3] = getpid();
	- osrel = obj_main->osrel;
	- sz = sizeof(old_osrel);
	- dbg("setting osrel to %d", osrel);
	- (void)sysctl(mib, 4, &old_osrel, &sz, &osrel, sizeof(osrel));
	- }
	-
	- wlock_acquire(rtld_bind_lock, &lockstate);
	-
	- dbg("resolving ifuncs");
	- if (initlist_objects_ifunc(&initlist, ld_bind_now != NULL &&
	- *ld_bind_now != '\0', SYMLOOK_EARLY, &lockstate) == -1)
	- rtld_die();
	+ dbg("initializing initial thread local storage");
	+ allocate_initial_tls(globallist_curr(TAILQ_FIRST(&obj_list)));

	- rtld_exit_ptr = rtld_exit;
	- if (obj_main->crt_no_init)
	- preinit_main();
	- objlist_call_init(&initlist, &lockstate);
	- _r_debug_postinit(&obj_main->linkmap);
	- objlist_clear(&initlist);
	- dbg("loading filtees");
	- TAILQ_FOREACH(obj, &obj_list, next) {
	- if (obj->marker)
	- continue;
	- if (ld_loadfltr \|\| obj->z_loadfltr)
	- load_filtees(obj, 0, &lockstate);
	- }
	-
	- dbg("enforcing main obj relro");
	- if (obj_enforce_relro(obj_main) == -1)
	- rtld_die();
	+ dbg("initializing key program variables");
	+ set_program_var("__progname", argv[0] != NULL ? basename(argv[0]) : "");
	+ set_program_var("environ", env);
	+ set_program_var("__elf_aux_vector", aux);
	+
	+ /* Make a list of init functions to call. */
	+ objlist_init(&initlist);
	+ initlist_add_objects(globallist_curr(TAILQ_FIRST(&obj_list)),
	+ preload_tail, &initlist);
	+
	+ r_debug_state(NULL, &obj_main->linkmap); /* say hello to gdb! */
	+
	+ map_stacks_exec(NULL);
	+
	+ if (!obj_main->crt_no_init) {
	+ /*
	+ * Make sure we don't call the main program's init and fini
	+ * functions for binaries linked with old crt1 which calls
	+ * _init itself.
	+ */
	+ obj_main->init = obj_main->fini = (Elf_Addr)NULL;
	+ obj_main->preinit_array = obj_main->init_array =
	+ obj_main->fini_array = (Elf_Addr)NULL;
	+ }
	+
	+ if (direct_exec) {
	+ /* Set osrel for direct-execed binary */
	+ mib[0] = CTL_KERN;
	+ mib[1] = KERN_PROC;
	+ mib[2] = KERN_PROC_OSREL;
	+ mib[3] = getpid();
	+ osrel = obj_main->osrel;
	+ sz = sizeof(old_osrel);
	+ dbg("setting osrel to %d", osrel);
	+ (void)sysctl(mib, 4, &old_osrel, &sz, &osrel, sizeof(osrel));
	+ }
	+
	+ wlock_acquire(rtld_bind_lock, &lockstate);
	+
	+ dbg("resolving ifuncs");
	+ if (initlist_objects_ifunc(&initlist,
	+ ld_bind_now != NULL && *ld_bind_now != '\0', SYMLOOK_EARLY,
	+ &lockstate) == -1)
	+ rtld_die();
	+
	+ rtld_exit_ptr = rtld_exit;
	+ if (obj_main->crt_no_init)
	+ preinit_main();
	+ objlist_call_init(&initlist, &lockstate);
	+ _r_debug_postinit(&obj_main->linkmap);
	+ objlist_clear(&initlist);
	+ dbg("loading filtees");
	+ TAILQ_FOREACH(obj, &obj_list, next) {
	+ if (obj->marker)
	+ continue;
	+ if (ld_loadfltr \|\| obj->z_loadfltr)
	+ load_filtees(obj, 0, &lockstate);
	+ }
	+
	+ dbg("enforcing main obj relro");
	+ if (obj_enforce_relro(obj_main) == -1)
	+ rtld_die();

	- lock_release(rtld_bind_lock, &lockstate);
	+ lock_release(rtld_bind_lock, &lockstate);

	- dbg("transferring control to program entry point = %p", obj_main->entry);
	+ dbg("transferring control to program entry point = %p",
	+ obj_main->entry);

	- /* Return the exit procedure and the program entry point. */
	- *exit_proc = rtld_exit_ptr;
	- *objp = obj_main;
	- return ((func_ptr_type)obj_main->entry);
	+ /* Return the exit procedure and the program entry point. */
	+ *exit_proc = rtld_exit_ptr;
	+ *objp = obj_main;
	+ return ((func_ptr_type)obj_main->entry);
	}

	void *
	@@ -1010,47 +1027,45 @@
	Elf_Addr
	_rtld_bind(Obj_Entry *obj, Elf_Size reloff)
	{
	- const Elf_Rel *rel;
	- const Elf_Sym *def;
	- const Obj_Entry *defobj;
	- Elf_Addr *where;
	- Elf_Addr target;
	- RtldLockState lockstate;
	-
	- rlock_acquire(rtld_bind_lock, &lockstate);
	- if (sigsetjmp(lockstate.env, 0) != 0)
	- lock_upgrade(rtld_bind_lock, &lockstate);
	- if (obj->pltrel)
	- rel = (const Elf_Rel )((const char )obj->pltrel + reloff);
	- else
	- rel = (const Elf_Rel )((const char )obj->pltrela + reloff);
	-
	- where = (Elf_Addr *)(obj->relocbase + rel->r_offset);
	- def = find_symdef(ELF_R_SYM(rel->r_info), obj, &defobj, SYMLOOK_IN_PLT,
	- NULL, &lockstate);
	- if (def == NULL)
	- rtld_die();
	- if (ELF_ST_TYPE(def->st_info) == STT_GNU_IFUNC)
	- target = (Elf_Addr)rtld_resolve_ifunc(defobj, def);
	- else
	- target = (Elf_Addr)(defobj->relocbase + def->st_value);
	-
	- dbg("\"%s\" in \"%s\" ==> %p in \"%s\"",
	- defobj->strtab + def->st_name,
	- obj->path == NULL ? NULL : basename(obj->path),
	- (void *)target,
	- defobj->path == NULL ? NULL : basename(defobj->path));
	-
	- /*
	- * Write the new contents for the jmpslot. Note that depending on
	- * architecture, the value which we need to return back to the
	- * lazy binding trampoline may or may not be the target
	- * address. The value returned from reloc_jmpslot() is the value
	- * that the trampoline needs.
	- */
	- target = reloc_jmpslot(where, target, defobj, obj, rel);
	- lock_release(rtld_bind_lock, &lockstate);
	- return (target);
	+ const Elf_Rel *rel;
	+ const Elf_Sym *def;
	+ const Obj_Entry *defobj;
	+ Elf_Addr *where;
	+ Elf_Addr target;
	+ RtldLockState lockstate;
	+
	+ rlock_acquire(rtld_bind_lock, &lockstate);
	+ if (sigsetjmp(lockstate.env, 0) != 0)
	+ lock_upgrade(rtld_bind_lock, &lockstate);
	+ if (obj->pltrel)
	+ rel = (const Elf_Rel )((const char )obj->pltrel + reloff);
	+ else
	+ rel = (const Elf_Rel )((const char )obj->pltrela + reloff);
	+
	+ where = (Elf_Addr *)(obj->relocbase + rel->r_offset);
	+ def = find_symdef(ELF_R_SYM(rel->r_info), obj, &defobj, SYMLOOK_IN_PLT,
	+ NULL, &lockstate);
	+ if (def == NULL)
	+ rtld_die();
	+ if (ELF_ST_TYPE(def->st_info) == STT_GNU_IFUNC)
	+ target = (Elf_Addr)rtld_resolve_ifunc(defobj, def);
	+ else
	+ target = (Elf_Addr)(defobj->relocbase + def->st_value);
	+
	+ dbg("\"%s\" in \"%s\" ==> %p in \"%s\"", defobj->strtab + def->st_name,
	+ obj->path == NULL ? NULL : basename(obj->path), (void *)target,
	+ defobj->path == NULL ? NULL : basename(defobj->path));
	+
	+ /*
	+ * Write the new contents for the jmpslot. Note that depending on
	+ * architecture, the value which we need to return back to the
	+ * lazy binding trampoline may or may not be the target
	+ * address. The value returned from reloc_jmpslot() is the value
	+ * that the trampoline needs.
	+ */
	+ target = reloc_jmpslot(where, target, defobj, obj, rel);
	+ lock_release(rtld_bind_lock, &lockstate);
	+ return (target);
	}

	/*
	@@ -1064,8 +1079,8 @@
	va_list ap;

	va_start(ap, fmt);
	- rtld_vsnprintf(lockinfo.dlerror_loc(), lockinfo.dlerror_loc_sz,
	- fmt, ap);
	+ rtld_vsnprintf(lockinfo.dlerror_loc(), lockinfo.dlerror_loc_sz, fmt,
	+ ap);
	va_end(ap);
	*lockinfo.dlerror_seen() = 0;
	dbg("rtld_error: %s", lockinfo.dlerror_loc());
	@@ -1117,8 +1132,8 @@
	static struct utsname uts;

	static char *
	-origin_subst_one(Obj_Entry obj, char real, const char *kw,
	- const char *subst, bool may_free)
	+origin_subst_one(Obj_Entry obj, char real, const char kw, const char subst,
	+ bool may_free)
	{
	char p, p1, res, resp;
	int subst_len, kw_len, subst_count, old_len, new_len;
	@@ -1216,8 +1231,8 @@
	/* __DECONST is safe here since without may_free real is unchanged */
	res = __DECONST(char *, real);
	for (i = 0; i < (int)nitems(tokens); i++) {
	- res = origin_subst_one(tokens[i].pass_obj ? obj : NULL,
	- res, tokens[i].kw, tokens[i].subst, i != 0);
	+ res = origin_subst_one(tokens[i].pass_obj ? obj : NULL, res,
	+ tokens[i].kw, tokens[i].subst, i != 0);
	}
	return (res);
	}
	@@ -1225,14 +1240,14 @@
	void
	rtld_die(void)
	{
	- const char *msg = dlerror();
	+ const char *msg = dlerror();

	- if (msg == NULL)
	- msg = "Fatal error";
	- rtld_fdputstr(STDERR_FILENO, _BASENAME_RTLD ": ");
	- rtld_fdputstr(STDERR_FILENO, msg);
	- rtld_fdputchar(STDERR_FILENO, '\n');
	- _exit(1);
	+ if (msg == NULL)
	+ msg = "Fatal error";
	+ rtld_fdputstr(STDERR_FILENO, _BASENAME_RTLD ": ");
	+ rtld_fdputstr(STDERR_FILENO, msg);
	+ rtld_fdputchar(STDERR_FILENO, '\n');
	+ _exit(1);
	}

	/*
	@@ -1243,464 +1258,478 @@
	digest_dynamic1(Obj_Entry obj, int early, const Elf_Dyn *dyn_rpath,
	const Elf_Dyn dyn_soname, const Elf_Dyn dyn_runpath)
	{
	- const Elf_Dyn *dynp;
	- Needed_Entry **needed_tail = &obj->needed;
	- Needed_Entry **needed_filtees_tail = &obj->needed_filtees;
	- Needed_Entry **needed_aux_filtees_tail = &obj->needed_aux_filtees;
	- const Elf_Hashelt *hashtab;
	- const Elf32_Word *hashval;
	- Elf32_Word bkt, nmaskwords;
	- int bloom_size32;
	- int plttype = DT_REL;
	-
	- *dyn_rpath = NULL;
	- *dyn_soname = NULL;
	- *dyn_runpath = NULL;
	-
	- obj->bind_now = false;
	- dynp = obj->dynamic;
	- if (dynp == NULL)
	- return;
	- for (; dynp->d_tag != DT_NULL; dynp++) {
	- switch (dynp->d_tag) {
	-
	- case DT_REL:
	- obj->rel = (const Elf_Rel *)(obj->relocbase + dynp->d_un.d_ptr);
	- break;
	-
	- case DT_RELSZ:
	- obj->relsize = dynp->d_un.d_val;
	- break;
	-
	- case DT_RELENT:
	- assert(dynp->d_un.d_val == sizeof(Elf_Rel));
	- break;
	-
	- case DT_JMPREL:
	- obj->pltrel = (const Elf_Rel *)
	- (obj->relocbase + dynp->d_un.d_ptr);
	- break;
	-
	- case DT_PLTRELSZ:
	- obj->pltrelsize = dynp->d_un.d_val;
	- break;
	-
	- case DT_RELA:
	- obj->rela = (const Elf_Rela *)(obj->relocbase + dynp->d_un.d_ptr);
	- break;
	-
	- case DT_RELASZ:
	- obj->relasize = dynp->d_un.d_val;
	- break;
	-
	- case DT_RELAENT:
	- assert(dynp->d_un.d_val == sizeof(Elf_Rela));
	- break;
	-
	- case DT_RELR:
	- obj->relr = (const Elf_Relr *)(obj->relocbase + dynp->d_un.d_ptr);
	- break;
	-
	- case DT_RELRSZ:
	- obj->relrsize = dynp->d_un.d_val;
	- break;
	-
	- case DT_RELRENT:
	- assert(dynp->d_un.d_val == sizeof(Elf_Relr));
	- break;
	-
	- case DT_PLTREL:
	- plttype = dynp->d_un.d_val;
	- assert(dynp->d_un.d_val == DT_REL \|\| plttype == DT_RELA);
	- break;
	-
	- case DT_SYMTAB:
	- obj->symtab = (const Elf_Sym *)
	- (obj->relocbase + dynp->d_un.d_ptr);
	- break;
	-
	- case DT_SYMENT:
	- assert(dynp->d_un.d_val == sizeof(Elf_Sym));
	- break;
	-
	- case DT_STRTAB:
	- obj->strtab = (const char *)(obj->relocbase + dynp->d_un.d_ptr);
	- break;
	-
	- case DT_STRSZ:
	- obj->strsize = dynp->d_un.d_val;
	- break;
	-
	- case DT_VERNEED:
	- obj->verneed = (const Elf_Verneed *)(obj->relocbase +
	- dynp->d_un.d_val);
	- break;
	-
	- case DT_VERNEEDNUM:
	- obj->verneednum = dynp->d_un.d_val;
	- break;
	-
	- case DT_VERDEF:
	- obj->verdef = (const Elf_Verdef *)(obj->relocbase +
	- dynp->d_un.d_val);
	- break;
	-
	- case DT_VERDEFNUM:
	- obj->verdefnum = dynp->d_un.d_val;
	- break;
	-
	- case DT_VERSYM:
	- obj->versyms = (const Elf_Versym *)(obj->relocbase +
	- dynp->d_un.d_val);
	- break;
	-
	- case DT_HASH:
	- {
	- hashtab = (const Elf_Hashelt *)(obj->relocbase +
	- dynp->d_un.d_ptr);
	- obj->nbuckets = hashtab[0];
	- obj->nchains = hashtab[1];
	- obj->buckets = hashtab + 2;
	- obj->chains = obj->buckets + obj->nbuckets;
	- obj->valid_hash_sysv = obj->nbuckets > 0 && obj->nchains > 0 &&
	- obj->buckets != NULL;
	- }
	- break;
	-
	- case DT_GNU_HASH:
	- {
	- hashtab = (const Elf_Hashelt *)(obj->relocbase +
	- dynp->d_un.d_ptr);
	- obj->nbuckets_gnu = hashtab[0];
	- obj->symndx_gnu = hashtab[1];
	- nmaskwords = hashtab[2];
	- bloom_size32 = (__ELF_WORD_SIZE / 32) * nmaskwords;
	- obj->maskwords_bm_gnu = nmaskwords - 1;
	- obj->shift2_gnu = hashtab[3];
	- obj->bloom_gnu = (const Elf_Addr *)(hashtab + 4);
	- obj->buckets_gnu = hashtab + 4 + bloom_size32;
	- obj->chain_zero_gnu = obj->buckets_gnu + obj->nbuckets_gnu -
	- obj->symndx_gnu;
	- /* Number of bitmask words is required to be power of 2 */
	- obj->valid_hash_gnu = powerof2(nmaskwords) &&
	- obj->nbuckets_gnu > 0 && obj->buckets_gnu != NULL;
	- }
	- break;
	-
	- case DT_NEEDED:
	- if (!obj->rtld) {
	- Needed_Entry *nep = NEW(Needed_Entry);
	- nep->name = dynp->d_un.d_val;
	- nep->obj = NULL;
	- nep->next = NULL;
	-
	- *needed_tail = nep;
	- needed_tail = &nep->next;
	- }
	- break;
	-
	- case DT_FILTER:
	- if (!obj->rtld) {
	- Needed_Entry *nep = NEW(Needed_Entry);
	- nep->name = dynp->d_un.d_val;
	- nep->obj = NULL;
	- nep->next = NULL;
	-
	- *needed_filtees_tail = nep;
	- needed_filtees_tail = &nep->next;
	-
	- if (obj->linkmap.l_refname == NULL)
	- obj->linkmap.l_refname = (char *)dynp->d_un.d_val;
	- }
	- break;
	-
	- case DT_AUXILIARY:
	- if (!obj->rtld) {
	- Needed_Entry *nep = NEW(Needed_Entry);
	- nep->name = dynp->d_un.d_val;
	- nep->obj = NULL;
	- nep->next = NULL;
	-
	- *needed_aux_filtees_tail = nep;
	- needed_aux_filtees_tail = &nep->next;
	- }
	- break;
	-
	- case DT_PLTGOT:
	- obj->pltgot = (Elf_Addr *)(obj->relocbase + dynp->d_un.d_ptr);
	- break;
	-
	- case DT_TEXTREL:
	- obj->textrel = true;
	- break;
	-
	- case DT_SYMBOLIC:
	- obj->symbolic = true;
	- break;
	-
	- case DT_RPATH:
	- /*
	- * We have to wait until later to process this, because we
	- * might not have gotten the address of the string table yet.
	- */
	- *dyn_rpath = dynp;
	- break;
	-
	- case DT_SONAME:
	- *dyn_soname = dynp;
	- break;
	-
	- case DT_RUNPATH:
	- *dyn_runpath = dynp;
	- break;
	-
	- case DT_INIT:
	- obj->init = (Elf_Addr)(obj->relocbase + dynp->d_un.d_ptr);
	- break;
	-
	- case DT_PREINIT_ARRAY:
	- obj->preinit_array = (Elf_Addr)(obj->relocbase + dynp->d_un.d_ptr);
	- break;
	-
	- case DT_PREINIT_ARRAYSZ:
	- obj->preinit_array_num = dynp->d_un.d_val / sizeof(Elf_Addr);
	- break;
	-
	- case DT_INIT_ARRAY:
	- obj->init_array = (Elf_Addr)(obj->relocbase + dynp->d_un.d_ptr);
	- break;
	-
	- case DT_INIT_ARRAYSZ:
	- obj->init_array_num = dynp->d_un.d_val / sizeof(Elf_Addr);
	- break;
	-
	- case DT_FINI:
	- obj->fini = (Elf_Addr)(obj->relocbase + dynp->d_un.d_ptr);
	- break;
	-
	- case DT_FINI_ARRAY:
	- obj->fini_array = (Elf_Addr)(obj->relocbase + dynp->d_un.d_ptr);
	- break;
	-
	- case DT_FINI_ARRAYSZ:
	- obj->fini_array_num = dynp->d_un.d_val / sizeof(Elf_Addr);
	- break;
	-
	- case DT_DEBUG:
	- if (!early)
	- dbg("Filling in DT_DEBUG entry");
	- (__DECONST(Elf_Dyn *, dynp))->d_un.d_ptr = (Elf_Addr)&r_debug;
	- break;
	-
	- case DT_FLAGS:
	- if (dynp->d_un.d_val & DF_ORIGIN)
	- obj->z_origin = true;
	- if (dynp->d_un.d_val & DF_SYMBOLIC)
	- obj->symbolic = true;
	- if (dynp->d_un.d_val & DF_TEXTREL)
	- obj->textrel = true;
	- if (dynp->d_un.d_val & DF_BIND_NOW)
	- obj->bind_now = true;
	- if (dynp->d_un.d_val & DF_STATIC_TLS)
	- obj->static_tls = true;
	- break;
	-
	- case DT_FLAGS_1:
	- if (dynp->d_un.d_val & DF_1_NOOPEN)
	- obj->z_noopen = true;
	- if (dynp->d_un.d_val & DF_1_ORIGIN)
	- obj->z_origin = true;
	- if (dynp->d_un.d_val & DF_1_GLOBAL)
	- obj->z_global = true;
	- if (dynp->d_un.d_val & DF_1_BIND_NOW)
	- obj->bind_now = true;
	- if (dynp->d_un.d_val & DF_1_NODELETE)
	- obj->z_nodelete = true;
	- if (dynp->d_un.d_val & DF_1_LOADFLTR)
	- obj->z_loadfltr = true;
	- if (dynp->d_un.d_val & DF_1_INTERPOSE)
	- obj->z_interpose = true;
	- if (dynp->d_un.d_val & DF_1_NODEFLIB)
	- obj->z_nodeflib = true;
	- if (dynp->d_un.d_val & DF_1_PIE)
	- obj->z_pie = true;
	- break;
	+ const Elf_Dyn *dynp;
	+ Needed_Entry **needed_tail = &obj->needed;
	+ Needed_Entry **needed_filtees_tail = &obj->needed_filtees;
	+ Needed_Entry **needed_aux_filtees_tail = &obj->needed_aux_filtees;
	+ const Elf_Hashelt *hashtab;
	+ const Elf32_Word *hashval;
	+ Elf32_Word bkt, nmaskwords;
	+ int bloom_size32;
	+ int plttype = DT_REL;

	- default:
	- if (arch_digest_dynamic(obj, dynp))
	- break;
	+ *dyn_rpath = NULL;
	+ *dyn_soname = NULL;
	+ *dyn_runpath = NULL;

	- if (!early) {
	- dbg("Ignoring d_tag %ld = %#lx", (long)dynp->d_tag,
	- (long)dynp->d_tag);
	- }
	- break;
	- }
	- }
	+ obj->bind_now = false;
	+ dynp = obj->dynamic;
	+ if (dynp == NULL)
	+ return;
	+ for (; dynp->d_tag != DT_NULL; dynp++) {
	+ switch (dynp->d_tag) {
	+ case DT_REL:
	+ obj->rel = (const Elf_Rel *)(obj->relocbase +
	+ dynp->d_un.d_ptr);
	+ break;

	- obj->traced = false;
	+ case DT_RELSZ:
	+ obj->relsize = dynp->d_un.d_val;
	+ break;

	- if (plttype == DT_RELA) {
	- obj->pltrela = (const Elf_Rela *) obj->pltrel;
	- obj->pltrel = NULL;
	- obj->pltrelasize = obj->pltrelsize;
	- obj->pltrelsize = 0;
	- }
	+ case DT_RELENT:
	+ assert(dynp->d_un.d_val == sizeof(Elf_Rel));
	+ break;

	- /* Determine size of dynsym table (equal to nchains of sysv hash) */
	- if (obj->valid_hash_sysv)
	- obj->dynsymcount = obj->nchains;
	- else if (obj->valid_hash_gnu) {
	- obj->dynsymcount = 0;
	- for (bkt = 0; bkt < obj->nbuckets_gnu; bkt++) {
	- if (obj->buckets_gnu[bkt] == 0)
	- continue;
	- hashval = &obj->chain_zero_gnu[obj->buckets_gnu[bkt]];
	- do
	- obj->dynsymcount++;
	- while ((*hashval++ & 1u) == 0);
	- }
	- obj->dynsymcount += obj->symndx_gnu;
	- }
	+ case DT_JMPREL:
	+ obj->pltrel = (const Elf_Rel *)(obj->relocbase +
	+ dynp->d_un.d_ptr);
	+ break;

	- if (obj->linkmap.l_refname != NULL)
	- obj->linkmap.l_refname = obj->strtab + (unsigned long)obj->
	- linkmap.l_refname;
	-}
	+ case DT_PLTRELSZ:
	+ obj->pltrelsize = dynp->d_un.d_val;
	+ break;

	-static bool
	-obj_resolve_origin(Obj_Entry *obj)
	-{
	+ case DT_RELA:
	+ obj->rela = (const Elf_Rela *)(obj->relocbase +
	+ dynp->d_un.d_ptr);
	+ break;

	- if (obj->origin_path != NULL)
	- return (true);
	- obj->origin_path = xmalloc(PATH_MAX);
	- return (rtld_dirname_abs(obj->path, obj->origin_path) != -1);
	-}
	+ case DT_RELASZ:
	+ obj->relasize = dynp->d_un.d_val;
	+ break;

	-static bool
	-digest_dynamic2(Obj_Entry obj, const Elf_Dyn dyn_rpath,
	- const Elf_Dyn dyn_soname, const Elf_Dyn dyn_runpath)
	-{
	+ case DT_RELAENT:
	+ assert(dynp->d_un.d_val == sizeof(Elf_Rela));
	+ break;

	- if (obj->z_origin && !obj_resolve_origin(obj))
	- return (false);
	+ case DT_RELR:
	+ obj->relr = (const Elf_Relr *)(obj->relocbase +
	+ dynp->d_un.d_ptr);
	+ break;

	- if (dyn_runpath != NULL) {
	- obj->runpath = (const char *)obj->strtab + dyn_runpath->d_un.d_val;
	- obj->runpath = origin_subst(obj, obj->runpath);
	- } else if (dyn_rpath != NULL) {
	- obj->rpath = (const char *)obj->strtab + dyn_rpath->d_un.d_val;
	- obj->rpath = origin_subst(obj, obj->rpath);
	- }
	- if (dyn_soname != NULL)
	- object_add_name(obj, obj->strtab + dyn_soname->d_un.d_val);
	- return (true);
	-}
	+ case DT_RELRSZ:
	+ obj->relrsize = dynp->d_un.d_val;
	+ break;

	-static bool
	-digest_dynamic(Obj_Entry *obj, int early)
	-{
	- const Elf_Dyn *dyn_rpath;
	- const Elf_Dyn *dyn_soname;
	- const Elf_Dyn *dyn_runpath;
	+ case DT_RELRENT:
	+ assert(dynp->d_un.d_val == sizeof(Elf_Relr));
	+ break;

	- digest_dynamic1(obj, early, &dyn_rpath, &dyn_soname, &dyn_runpath);
	- return (digest_dynamic2(obj, dyn_rpath, dyn_soname, dyn_runpath));
	-}
	+ case DT_PLTREL:
	+ plttype = dynp->d_un.d_val;
	+ assert(
	+ dynp->d_un.d_val == DT_REL \|\| plttype == DT_RELA);
	+ break;

	-/*
	- * Process a shared object's program header. This is used only for the
	- * main program, when the kernel has already loaded the main program
	- * into memory before calling the dynamic linker. It creates and
	- * returns an Obj_Entry structure.
	- */
	-static Obj_Entry *
	-digest_phdr(const Elf_Phdr phdr, int phnum, caddr_t entry, const char path)
	-{
	- Obj_Entry *obj;
	- const Elf_Phdr *phlimit = phdr + phnum;
	- const Elf_Phdr *ph;
	- Elf_Addr note_start, note_end;
	- int nsegs = 0;
	+ case DT_SYMTAB:
	+ obj->symtab = (const Elf_Sym *)(obj->relocbase +
	+ dynp->d_un.d_ptr);
	+ break;

	- obj = obj_new();
	- for (ph = phdr; ph < phlimit; ph++) {
	- if (ph->p_type != PT_PHDR)
	- continue;
	+ case DT_SYMENT:
	+ assert(dynp->d_un.d_val == sizeof(Elf_Sym));
	+ break;

	- obj->phdr = phdr;
	- obj->phsize = ph->p_memsz;
	- obj->relocbase = __DECONST(char *, phdr) - ph->p_vaddr;
	- break;
	- }
	-
	- obj->stack_flags = PF_X \| PF_R \| PF_W;
	-
	- for (ph = phdr; ph < phlimit; ph++) {
	- switch (ph->p_type) {
	-
	- case PT_INTERP:
	- obj->interp = (const char *)(ph->p_vaddr + obj->relocbase);
	- break;
	-
	- case PT_LOAD:
	- if (nsegs == 0) { /* First load segment */
	- obj->vaddrbase = rtld_trunc_page(ph->p_vaddr);
	- obj->mapbase = obj->vaddrbase + obj->relocbase;
	- } else { /* Last load segment */
	- obj->mapsize = rtld_round_page(ph->p_vaddr + ph->p_memsz) -
	- obj->vaddrbase;
	- }
	- nsegs++;
	- break;
	-
	- case PT_DYNAMIC:
	- obj->dynamic = (const Elf_Dyn *)(ph->p_vaddr + obj->relocbase);
	- break;
	-
	- case PT_TLS:
	- obj->tlsindex = 1;
	- obj->tlssize = ph->p_memsz;
	- obj->tlsalign = ph->p_align;
	- obj->tlsinitsize = ph->p_filesz;
	- obj->tlsinit = (void*)(ph->p_vaddr + obj->relocbase);
	- obj->tlspoffset = ph->p_offset;
	- break;
	-
	- case PT_GNU_STACK:
	- obj->stack_flags = ph->p_flags;
	- break;
	-
	- case PT_NOTE:
	- note_start = (Elf_Addr)obj->relocbase + ph->p_vaddr;
	- note_end = note_start + ph->p_filesz;
	- digest_notes(obj, note_start, note_end);
	- break;
	- }
	- }
	- if (nsegs < 1) {
	- _rtld_error("%s: too few PT_LOAD segments", path);
	- return (NULL);
	- }
	+ case DT_STRTAB:
	+ obj->strtab = (const char *)(obj->relocbase +
	+ dynp->d_un.d_ptr);
	+ break;

	- obj->entry = entry;
	- return (obj);
	-}
	+ case DT_STRSZ:
	+ obj->strsize = dynp->d_un.d_val;
	+ break;

	-void
	-digest_notes(Obj_Entry *obj, Elf_Addr note_start, Elf_Addr note_end)
	-{
	- const Elf_Note *note;
	- const char *note_name;
	- uintptr_t p;
	+ case DT_VERNEED:
	+ obj->verneed = (const Elf_Verneed *)(obj->relocbase +
	+ dynp->d_un.d_val);
	+ break;

	- for (note = (const Elf_Note *)note_start; (Elf_Addr)note < note_end;
	- note = (const Elf_Note )((const char )(note + 1) +
	- roundup2(note->n_namesz, sizeof(Elf32_Addr)) +
	- roundup2(note->n_descsz, sizeof(Elf32_Addr)))) {
	- if (arch_digest_note(obj, note))
	- continue;
	+ case DT_VERNEEDNUM:
	+ obj->verneednum = dynp->d_un.d_val;
	+ break;
	+
	+ case DT_VERDEF:
	+ obj->verdef = (const Elf_Verdef *)(obj->relocbase +
	+ dynp->d_un.d_val);
	+ break;
	+
	+ case DT_VERDEFNUM:
	+ obj->verdefnum = dynp->d_un.d_val;
	+ break;
	+
	+ case DT_VERSYM:
	+ obj->versyms = (const Elf_Versym *)(obj->relocbase +
	+ dynp->d_un.d_val);
	+ break;
	+
	+ case DT_HASH: {
	+ hashtab = (const Elf_Hashelt *)(obj->relocbase +
	+ dynp->d_un.d_ptr);
	+ obj->nbuckets = hashtab[0];
	+ obj->nchains = hashtab[1];
	+ obj->buckets = hashtab + 2;
	+ obj->chains = obj->buckets + obj->nbuckets;
	+ obj->valid_hash_sysv = obj->nbuckets > 0 &&
	+ obj->nchains > 0 && obj->buckets != NULL;
	+ } break;
	+
	+ case DT_GNU_HASH: {
	+ hashtab = (const Elf_Hashelt *)(obj->relocbase +
	+ dynp->d_un.d_ptr);
	+ obj->nbuckets_gnu = hashtab[0];
	+ obj->symndx_gnu = hashtab[1];
	+ nmaskwords = hashtab[2];
	+ bloom_size32 = (__ELF_WORD_SIZE / 32) * nmaskwords;
	+ obj->maskwords_bm_gnu = nmaskwords - 1;
	+ obj->shift2_gnu = hashtab[3];
	+ obj->bloom_gnu = (const Elf_Addr *)(hashtab + 4);
	+ obj->buckets_gnu = hashtab + 4 + bloom_size32;
	+ obj->chain_zero_gnu = obj->buckets_gnu +
	+ obj->nbuckets_gnu - obj->symndx_gnu;
	+ /* Number of bitmask words is required to be power of 2
	+ */
	+ obj->valid_hash_gnu = powerof2(nmaskwords) &&
	+ obj->nbuckets_gnu > 0 && obj->buckets_gnu != NULL;
	+ } break;
	+
	+ case DT_NEEDED:
	+ if (!obj->rtld) {
	+ Needed_Entry *nep = NEW(Needed_Entry);
	+ nep->name = dynp->d_un.d_val;
	+ nep->obj = NULL;
	+ nep->next = NULL;
	+
	+ *needed_tail = nep;
	+ needed_tail = &nep->next;
	+ }
	+ break;
	+
	+ case DT_FILTER:
	+ if (!obj->rtld) {
	+ Needed_Entry *nep = NEW(Needed_Entry);
	+ nep->name = dynp->d_un.d_val;
	+ nep->obj = NULL;
	+ nep->next = NULL;
	+
	+ *needed_filtees_tail = nep;
	+ needed_filtees_tail = &nep->next;
	+
	+ if (obj->linkmap.l_refname == NULL)
	+ obj->linkmap.l_refname =
	+ (char *)dynp->d_un.d_val;
	+ }
	+ break;
	+
	+ case DT_AUXILIARY:
	+ if (!obj->rtld) {
	+ Needed_Entry *nep = NEW(Needed_Entry);
	+ nep->name = dynp->d_un.d_val;
	+ nep->obj = NULL;
	+ nep->next = NULL;
	+
	+ *needed_aux_filtees_tail = nep;
	+ needed_aux_filtees_tail = &nep->next;
	+ }
	+ break;
	+
	+ case DT_PLTGOT:
	+ obj->pltgot = (Elf_Addr *)(obj->relocbase +
	+ dynp->d_un.d_ptr);
	+ break;
	+
	+ case DT_TEXTREL:
	+ obj->textrel = true;
	+ break;
	+
	+ case DT_SYMBOLIC:
	+ obj->symbolic = true;
	+ break;
	+
	+ case DT_RPATH:
	+ /*
	+ * We have to wait until later to process this, because
	+ * we might not have gotten the address of the string
	+ * table yet.
	+ */
	+ *dyn_rpath = dynp;
	+ break;
	+
	+ case DT_SONAME:
	+ *dyn_soname = dynp;
	+ break;
	+
	+ case DT_RUNPATH:
	+ *dyn_runpath = dynp;
	+ break;
	+
	+ case DT_INIT:
	+ obj->init = (Elf_Addr)(obj->relocbase +
	+ dynp->d_un.d_ptr);
	+ break;
	+
	+ case DT_PREINIT_ARRAY:
	+ obj->preinit_array = (Elf_Addr)(obj->relocbase +
	+ dynp->d_un.d_ptr);
	+ break;
	+
	+ case DT_PREINIT_ARRAYSZ:
	+ obj->preinit_array_num = dynp->d_un.d_val /
	+ sizeof(Elf_Addr);
	+ break;
	+
	+ case DT_INIT_ARRAY:
	+ obj->init_array = (Elf_Addr)(obj->relocbase +
	+ dynp->d_un.d_ptr);
	+ break;
	+
	+ case DT_INIT_ARRAYSZ:
	+ obj->init_array_num = dynp->d_un.d_val /
	+ sizeof(Elf_Addr);
	+ break;
	+
	+ case DT_FINI:
	+ obj->fini = (Elf_Addr)(obj->relocbase +
	+ dynp->d_un.d_ptr);
	+ break;
	+
	+ case DT_FINI_ARRAY:
	+ obj->fini_array = (Elf_Addr)(obj->relocbase +
	+ dynp->d_un.d_ptr);
	+ break;
	+
	+ case DT_FINI_ARRAYSZ:
	+ obj->fini_array_num = dynp->d_un.d_val /
	+ sizeof(Elf_Addr);
	+ break;
	+
	+ case DT_DEBUG:
	+ if (!early)
	+ dbg("Filling in DT_DEBUG entry");
	+ (__DECONST(Elf_Dyn *, dynp))->d_un.d_ptr =
	+ (Elf_Addr)&r_debug;
	+ break;
	+
	+ case DT_FLAGS:
	+ if (dynp->d_un.d_val & DF_ORIGIN)
	+ obj->z_origin = true;
	+ if (dynp->d_un.d_val & DF_SYMBOLIC)
	+ obj->symbolic = true;
	+ if (dynp->d_un.d_val & DF_TEXTREL)
	+ obj->textrel = true;
	+ if (dynp->d_un.d_val & DF_BIND_NOW)
	+ obj->bind_now = true;
	+ if (dynp->d_un.d_val & DF_STATIC_TLS)
	+ obj->static_tls = true;
	+ break;
	+
	+ case DT_FLAGS_1:
	+ if (dynp->d_un.d_val & DF_1_NOOPEN)
	+ obj->z_noopen = true;
	+ if (dynp->d_un.d_val & DF_1_ORIGIN)
	+ obj->z_origin = true;
	+ if (dynp->d_un.d_val & DF_1_GLOBAL)
	+ obj->z_global = true;
	+ if (dynp->d_un.d_val & DF_1_BIND_NOW)
	+ obj->bind_now = true;
	+ if (dynp->d_un.d_val & DF_1_NODELETE)
	+ obj->z_nodelete = true;
	+ if (dynp->d_un.d_val & DF_1_LOADFLTR)
	+ obj->z_loadfltr = true;
	+ if (dynp->d_un.d_val & DF_1_INTERPOSE)
	+ obj->z_interpose = true;
	+ if (dynp->d_un.d_val & DF_1_NODEFLIB)
	+ obj->z_nodeflib = true;
	+ if (dynp->d_un.d_val & DF_1_PIE)
	+ obj->z_pie = true;
	+ break;
	+
	+ default:
	+ if (arch_digest_dynamic(obj, dynp))
	+ break;
	+
	+ if (!early) {
	+ dbg("Ignoring d_tag %ld = %#lx",
	+ (long)dynp->d_tag, (long)dynp->d_tag);
	+ }
	+ break;
	+ }
	+ }
	+
	+ obj->traced = false;
	+
	+ if (plttype == DT_RELA) {
	+ obj->pltrela = (const Elf_Rela *)obj->pltrel;
	+ obj->pltrel = NULL;
	+ obj->pltrelasize = obj->pltrelsize;
	+ obj->pltrelsize = 0;
	+ }
	+
	+ /* Determine size of dynsym table (equal to nchains of sysv hash) */
	+ if (obj->valid_hash_sysv)
	+ obj->dynsymcount = obj->nchains;
	+ else if (obj->valid_hash_gnu) {
	+ obj->dynsymcount = 0;
	+ for (bkt = 0; bkt < obj->nbuckets_gnu; bkt++) {
	+ if (obj->buckets_gnu[bkt] == 0)
	+ continue;
	+ hashval = &obj->chain_zero_gnu[obj->buckets_gnu[bkt]];
	+ do
	+ obj->dynsymcount++;
	+ while ((*hashval++ & 1u) == 0);
	+ }
	+ obj->dynsymcount += obj->symndx_gnu;
	+ }
	+
	+ if (obj->linkmap.l_refname != NULL)
	+ obj->linkmap.l_refname = obj->strtab +
	+ (unsigned long)obj->linkmap.l_refname;
	+}
	+
	+static bool
	+obj_resolve_origin(Obj_Entry *obj)
	+{
	+ if (obj->origin_path != NULL)
	+ return (true);
	+ obj->origin_path = xmalloc(PATH_MAX);
	+ return (rtld_dirname_abs(obj->path, obj->origin_path) != -1);
	+}
	+
	+static bool
	+digest_dynamic2(Obj_Entry obj, const Elf_Dyn dyn_rpath,
	+ const Elf_Dyn dyn_soname, const Elf_Dyn dyn_runpath)
	+{
	+ if (obj->z_origin && !obj_resolve_origin(obj))
	+ return (false);
	+
	+ if (dyn_runpath != NULL) {
	+ obj->runpath = (const char *)obj->strtab +
	+ dyn_runpath->d_un.d_val;
	+ obj->runpath = origin_subst(obj, obj->runpath);
	+ } else if (dyn_rpath != NULL) {
	+ obj->rpath = (const char *)obj->strtab + dyn_rpath->d_un.d_val;
	+ obj->rpath = origin_subst(obj, obj->rpath);
	+ }
	+ if (dyn_soname != NULL)
	+ object_add_name(obj, obj->strtab + dyn_soname->d_un.d_val);
	+ return (true);
	+}
	+
	+static bool
	+digest_dynamic(Obj_Entry *obj, int early)
	+{
	+ const Elf_Dyn *dyn_rpath;
	+ const Elf_Dyn *dyn_soname;
	+ const Elf_Dyn *dyn_runpath;
	+
	+ digest_dynamic1(obj, early, &dyn_rpath, &dyn_soname, &dyn_runpath);
	+ return (digest_dynamic2(obj, dyn_rpath, dyn_soname, dyn_runpath));
	+}
	+
	+/*
	+ * Process a shared object's program header. This is used only for the
	+ * main program, when the kernel has already loaded the main program
	+ * into memory before calling the dynamic linker. It creates and
	+ * returns an Obj_Entry structure.
	+ */
	+static Obj_Entry *
	+digest_phdr(const Elf_Phdr phdr, int phnum, caddr_t entry, const char path)
	+{
	+ Obj_Entry *obj;
	+ const Elf_Phdr *phlimit = phdr + phnum;
	+ const Elf_Phdr *ph;
	+ Elf_Addr note_start, note_end;
	+ int nsegs = 0;
	+
	+ obj = obj_new();
	+ for (ph = phdr; ph < phlimit; ph++) {
	+ if (ph->p_type != PT_PHDR)
	+ continue;
	+
	+ obj->phdr = phdr;
	+ obj->phsize = ph->p_memsz;
	+ obj->relocbase = __DECONST(char *, phdr) - ph->p_vaddr;
	+ break;
	+ }
	+
	+ obj->stack_flags = PF_X \| PF_R \| PF_W;
	+
	+ for (ph = phdr; ph < phlimit; ph++) {
	+ switch (ph->p_type) {
	+ case PT_INTERP:
	+ obj->interp = (const char *)(ph->p_vaddr +
	+ obj->relocbase);
	+ break;
	+
	+ case PT_LOAD:
	+ if (nsegs == 0) { /* First load segment */
	+ obj->vaddrbase = rtld_trunc_page(ph->p_vaddr);
	+ obj->mapbase = obj->vaddrbase + obj->relocbase;
	+ } else { /* Last load segment */
	+ obj->mapsize = rtld_round_page(
	+ ph->p_vaddr + ph->p_memsz) -
	+ obj->vaddrbase;
	+ }
	+ nsegs++;
	+ break;
	+
	+ case PT_DYNAMIC:
	+ obj->dynamic = (const Elf_Dyn *)(ph->p_vaddr +
	+ obj->relocbase);
	+ break;
	+
	+ case PT_TLS:
	+ obj->tlsindex = 1;
	+ obj->tlssize = ph->p_memsz;
	+ obj->tlsalign = ph->p_align;
	+ obj->tlsinitsize = ph->p_filesz;
	+ obj->tlsinit = (void *)(ph->p_vaddr + obj->relocbase);
	+ obj->tlspoffset = ph->p_offset;
	+ break;
	+
	+ case PT_GNU_STACK:
	+ obj->stack_flags = ph->p_flags;
	+ break;
	+
	+ case PT_NOTE:
	+ note_start = (Elf_Addr)obj->relocbase + ph->p_vaddr;
	+ note_end = note_start + ph->p_filesz;
	+ digest_notes(obj, note_start, note_end);
	+ break;
	+ }
	+ }
	+ if (nsegs < 1) {
	+ _rtld_error("%s: too few PT_LOAD segments", path);
	+ return (NULL);
	+ }
	+
	+ obj->entry = entry;
	+ return (obj);
	+}
	+
	+void
	+digest_notes(Obj_Entry *obj, Elf_Addr note_start, Elf_Addr note_end)
	+{
	+ const Elf_Note *note;
	+ const char *note_name;
	+ uintptr_t p;
	+
	+ for (note = (const Elf_Note *)note_start; (Elf_Addr)note < note_end;
	+ note = (const Elf_Note )((const char )(note + 1) +
	+ roundup2(note->n_namesz, sizeof(Elf32_Addr)) +
	+ roundup2(note->n_descsz, sizeof(Elf32_Addr)))) {
	+ if (arch_digest_note(obj, note))
	+ continue;

	if (note->n_namesz != sizeof(NOTE_FREEBSD_VENDOR) \|\|
	note->n_descsz != sizeof(int32_t))
	@@ -1711,7 +1740,7 @@
	continue;
	note_name = (const char *)(note + 1);
	if (strncmp(NOTE_FREEBSD_VENDOR, note_name,
	- sizeof(NOTE_FREEBSD_VENDOR)) != 0)
	+ sizeof(NOTE_FREEBSD_VENDOR)) != 0)
	continue;
	switch (note->n_type) {
	case NT_FREEBSD_ABI_TAG:
	@@ -1740,18 +1769,18 @@
	static Obj_Entry *
	dlcheck(void *handle)
	{
	- Obj_Entry *obj;
	+ Obj_Entry *obj;

	- TAILQ_FOREACH(obj, &obj_list, next) {
	- if (obj == (Obj_Entry *) handle)
	- break;
	- }
	+ TAILQ_FOREACH(obj, &obj_list, next) {
	+ if (obj == (Obj_Entry *)handle)
	+ break;
	+ }

	- if (obj == NULL \|\| obj->refcount == 0 \|\| obj->dl_refcount == 0) {
	- _rtld_error("Invalid shared object handle %p", handle);
	- return (NULL);
	- }
	- return (obj);
	+ if (obj == NULL \|\| obj->refcount == 0 \|\| obj->dl_refcount == 0) {
	+ _rtld_error("Invalid shared object handle %p", handle);
	+ return (NULL);
	+ }
	+ return (obj);
	}

	/*
	@@ -1761,20 +1790,20 @@
	static bool
	donelist_check(DoneList dlp, const Obj_Entry obj)
	{
	- unsigned int i;
	+ unsigned int i;

	- for (i = 0; i < dlp->num_used; i++)
	- if (dlp->objs[i] == obj)
	- return (true);
	- /*
	- * Our donelist allocation should always be sufficient. But if
	- * our threads locking isn't working properly, more shared objects
	- * could have been loaded since we allocated the list. That should
	- * never happen, but we'll handle it properly just in case it does.
	- */
	- if (dlp->num_used < dlp->num_alloc)
	- dlp->objs[dlp->num_used++] = obj;
	- return (false);
	+ for (i = 0; i < dlp->num_used; i++)
	+ if (dlp->objs[i] == obj)
	+ return (true);
	+ /*
	+ * Our donelist allocation should always be sufficient. But if
	+ * our threads locking isn't working properly, more shared objects
	+ * could have been loaded since we allocated the list. That should
	+ * never happen, but we'll handle it properly just in case it does.
	+ */
	+ if (dlp->num_used < dlp->num_alloc)
	+ dlp->objs[dlp->num_used++] = obj;
	+ return (false);
	}

	/*
	@@ -1810,7 +1839,6 @@
	return (h & 0xffffffff);
	}

	-
	/*
	* Find the library with the given name, and return its full pathname.
	* The returned string is dynamically allocated. Generates an error
	@@ -1847,10 +1875,11 @@
	(name = lm_find(refobj->path, xname)) == NULL)
	name = xname;

	- if (strchr(name, '/') != NULL) { /* Hard coded pathname */
	+ if (strchr(name, '/') != NULL) { /* Hard coded pathname */
	if (name[0] != '/' && !trust) {
	_rtld_error("Absolute pathname required "
	- "for shared object \"%s\"", name);
	+ "for shared object \"%s\"",
	+ name);
	return (NULL);
	}
	return (origin_subst(__DECONST(Obj_Entry *, refobj),
	@@ -1929,7 +1958,8 @@

	if (objgiven && refobj->path != NULL) {
	_rtld_error("Shared object \"%s\" not found, "
	- "required by \"%s\"", name, basename(refobj->path));
	+ "required by \"%s\"",
	+ name, basename(refobj->path));
	} else {
	_rtld_error("Shared object \"%s\" not found", name);
	}
	@@ -1947,80 +1977,82 @@
	const Obj_Entry *defobj_out, int flags, SymCache cache,
	RtldLockState *lockstate)
	{
	- const Elf_Sym *ref;
	- const Elf_Sym *def;
	- const Obj_Entry *defobj;
	- const Ver_Entry *ve;
	- SymLook req;
	- const char *name;
	- int res;
	-
	- /*
	- * If we have already found this symbol, get the information from
	- * the cache.
	- */
	- if (symnum >= refobj->dynsymcount)
	- return (NULL); /* Bad object */
	- if (cache != NULL && cache[symnum].sym != NULL) {
	- *defobj_out = cache[symnum].obj;
	- return (cache[symnum].sym);
	- }
	-
	- ref = refobj->symtab + symnum;
	- name = refobj->strtab + ref->st_name;
	- def = NULL;
	- defobj = NULL;
	- ve = NULL;
	-
	- /*
	- * We don't have to do a full scale lookup if the symbol is local.
	- * We know it will bind to the instance in this load module; to
	- * which we already have a pointer (ie ref). By not doing a lookup,
	- * we not only improve performance, but it also avoids unresolvable
	- * symbols when local symbols are not in the hash table. This has
	- * been seen with the ia64 toolchain.
	- */
	- if (ELF_ST_BIND(ref->st_info) != STB_LOCAL) {
	- if (ELF_ST_TYPE(ref->st_info) == STT_SECTION) {
	- _rtld_error("%s: Bogus symbol table entry %lu", refobj->path,
	- symnum);
	+ const Elf_Sym *ref;
	+ const Elf_Sym *def;
	+ const Obj_Entry *defobj;
	+ const Ver_Entry *ve;
	+ SymLook req;
	+ const char *name;
	+ int res;
	+
	+ /*
	+ * If we have already found this symbol, get the information from
	+ * the cache.
	+ */
	+ if (symnum >= refobj->dynsymcount)
	+ return (NULL); /* Bad object */
	+ if (cache != NULL && cache[symnum].sym != NULL) {
	+ *defobj_out = cache[symnum].obj;
	+ return (cache[symnum].sym);
	}
	- symlook_init(&req, name);
	- req.flags = flags;
	- ve = req.ventry = fetch_ventry(refobj, symnum);
	- req.lockstate = lockstate;
	- res = symlook_default(&req, refobj);
	- if (res == 0) {
	- def = req.sym_out;
	- defobj = req.defobj_out;
	- }
	- } else {
	- def = ref;
	- defobj = refobj;
	- }
	-
	- /*
	- * If we found no definition and the reference is weak, treat the
	- * symbol as having the value zero.
	- */
	- if (def == NULL && ELF_ST_BIND(ref->st_info) == STB_WEAK) {
	- def = &sym_zero;
	- defobj = obj_main;
	- }
	-
	- if (def != NULL) {
	- *defobj_out = defobj;
	- /* Record the information in the cache to avoid subsequent lookups. */
	- if (cache != NULL) {
	- cache[symnum].sym = def;
	- cache[symnum].obj = defobj;
	- }
	- } else {
	- if (refobj != &obj_rtld)
	- _rtld_error("%s: Undefined symbol \"%s%s%s\"", refobj->path, name,
	- ve != NULL ? "@" : "", ve != NULL ? ve->name : "");
	- }
	- return (def);
	+
	+ ref = refobj->symtab + symnum;
	+ name = refobj->strtab + ref->st_name;
	+ def = NULL;
	+ defobj = NULL;
	+ ve = NULL;
	+
	+ /*
	+ * We don't have to do a full scale lookup if the symbol is local.
	+ * We know it will bind to the instance in this load module; to
	+ * which we already have a pointer (ie ref). By not doing a lookup,
	+ * we not only improve performance, but it also avoids unresolvable
	+ * symbols when local symbols are not in the hash table. This has
	+ * been seen with the ia64 toolchain.
	+ */
	+ if (ELF_ST_BIND(ref->st_info) != STB_LOCAL) {
	+ if (ELF_ST_TYPE(ref->st_info) == STT_SECTION) {
	+ _rtld_error("%s: Bogus symbol table entry %lu",
	+ refobj->path, symnum);
	+ }
	+ symlook_init(&req, name);
	+ req.flags = flags;
	+ ve = req.ventry = fetch_ventry(refobj, symnum);
	+ req.lockstate = lockstate;
	+ res = symlook_default(&req, refobj);
	+ if (res == 0) {
	+ def = req.sym_out;
	+ defobj = req.defobj_out;
	+ }
	+ } else {
	+ def = ref;
	+ defobj = refobj;
	+ }
	+
	+ /*
	+ * If we found no definition and the reference is weak, treat the
	+ * symbol as having the value zero.
	+ */
	+ if (def == NULL && ELF_ST_BIND(ref->st_info) == STB_WEAK) {
	+ def = &sym_zero;
	+ defobj = obj_main;
	+ }
	+
	+ if (def != NULL) {
	+ *defobj_out = defobj;
	+ /* Record the information in the cache to avoid subsequent
	+ * lookups. */
	+ if (cache != NULL) {
	+ cache[symnum].sym = def;
	+ cache[symnum].obj = defobj;
	+ }
	+ } else {
	+ if (refobj != &obj_rtld)
	+ _rtld_error("%s: Undefined symbol \"%s%s%s\"",
	+ refobj->path, name, ve != NULL ? "@" : "",
	+ ve != NULL ? ve->name : "");
	+ }
	+ return (def);
	}

	/* Convert between native byte order and forced little resp. big endian. */
	@@ -2049,12 +2081,12 @@
	int fd;
	size_t flen;
	uint32_t dl;
	- uint32_t magic; /* Magic number */
	- uint32_t version; /* File version (1) */
	- uint32_t strtab; /* Offset of string table in file */
	- uint32_t dirlist; /* Offset of directory list in string table */
	- uint32_t dirlistlen; /* strlen(dirlist) */
	- bool is_le; /* Does the hints file use little endian */
	+ uint32_t magic; /* Magic number */
	+ uint32_t version; /* File version (1) */
	+ uint32_t strtab; /* Offset of string table in file */
	+ uint32_t dirlist; /* Offset of directory list in string table */
	+ uint32_t dirlistlen; /* strlen(dirlist) */
	+ bool is_le; /* Does the hints file use little endian */
	bool skip;

	/* First call, read the hints file */
	@@ -2062,8 +2094,10 @@
	/* Keep from trying again in case the hints file is bad. */
	hints = "";

	- if ((fd = open(ld_elf_hints_path, O_RDONLY \| O_CLOEXEC)) == -1) {
	- dbg("failed to open hints file \"%s\"", ld_elf_hints_path);
	+ if ((fd = open(ld_elf_hints_path, O_RDONLY \| O_CLOEXEC)) ==
	+ -1) {
	+ dbg("failed to open hints file \"%s\"",
	+ ld_elf_hints_path);
	return (NULL);
	}

	@@ -2076,15 +2110,17 @@
	if (read(fd, &hdr, sizeof hdr) != sizeof hdr) {
	dbg("failed to read %lu bytes from hints file \"%s\"",
	(u_long)sizeof hdr, ld_elf_hints_path);
	-cleanup1:
	+ cleanup1:
	close(fd);
	hdr.dirlistlen = 0;
	return (NULL);
	}
	- dbg("host byte-order: %s-endian", le32toh(1) == 1 ? "little" : "big");
	+ dbg("host byte-order: %s-endian",
	+ le32toh(1) == 1 ? "little" : "big");
	dbg("hints file byte-order: %s-endian",
	hdr.magic == htole32(ELFHINTS_MAGIC) ? "little" : "big");
	- is_le = /htole32(1) == 1 \|\| / hdr.magic == htole32(ELFHINTS_MAGIC);
	+ is_le = /htole32(1) == 1 \|\| / hdr.magic ==
	+ htole32(ELFHINTS_MAGIC);
	magic = COND_SWAP(hdr.magic);
	version = COND_SWAP(hdr.version);
	strtab = COND_SWAP(hdr.strtab);
	@@ -2100,8 +2136,8 @@
	goto cleanup1;
	}
	if (dirlistlen > UINT_MAX / 2) {
	- dbg("directory list is to long: %d > %d",
	- dirlistlen, UINT_MAX / 2);
	+ dbg("directory list is to long: %d > %d", dirlistlen,
	+ UINT_MAX / 2);
	goto cleanup1;
	}
	if (fstat(fd, &hint_stat) == -1) {
	@@ -2122,16 +2158,18 @@
	dl += dirlistlen;
	if (dl > hint_stat.st_size) {
	dbg("hints file \"%s\" is truncated (%d vs. %jd bytes)",
	- ld_elf_hints_path, dl, (uintmax_t)hint_stat.st_size);
	+ ld_elf_hints_path, dl,
	+ (uintmax_t)hint_stat.st_size);
	goto cleanup1;
	}
	p = xmalloc(dirlistlen + 1);
	- if (pread(fd, p, dirlistlen + 1,
	- strtab + dirlist) != (ssize_t)dirlistlen + 1 \|\|
	+ if (pread(fd, p, dirlistlen + 1, strtab + dirlist) !=
	+ (ssize_t)dirlistlen + 1 \|\|
	p[dirlistlen] != '\0') {
	free(p);
	- dbg("failed to read %d bytes starting at %d from hints file \"%s\"",
	- dirlistlen + 1, strtab + dirlist, ld_elf_hints_path);
	+ dbg("failed to read %d bytes starting at %d from hints file \"%s\"",
	+ dirlistlen + 1, strtab + dirlist,
	+ ld_elf_hints_path);
	goto cleanup1;
	}
	hints = p;
	@@ -2221,7 +2259,7 @@
	}
	fcount++;
	flen = strlen(hintpath->dls_name);
	- strncpy((filtered_path + fndx), hintpath->dls_name, flen);
	+ strncpy((filtered_path + fndx), hintpath->dls_name, flen);
	fndx += flen;
	}
	filtered_path[fndx] = '\0';
	@@ -2236,39 +2274,40 @@
	static void
	init_dag(Obj_Entry *root)
	{
	- const Needed_Entry *needed;
	- const Objlist_Entry *elm;
	- DoneList donelist;
	+ const Needed_Entry *needed;
	+ const Objlist_Entry *elm;
	+ DoneList donelist;

	- if (root->dag_inited)
	- return;
	- donelist_init(&donelist);
	+ if (root->dag_inited)
	+ return;
	+ donelist_init(&donelist);

	- /* Root object belongs to own DAG. */
	- objlist_push_tail(&root->dldags, root);
	- objlist_push_tail(&root->dagmembers, root);
	- donelist_check(&donelist, root);
	+ /* Root object belongs to own DAG. */
	+ objlist_push_tail(&root->dldags, root);
	+ objlist_push_tail(&root->dagmembers, root);
	+ donelist_check(&donelist, root);

	- /*
	- * Add dependencies of root object to DAG in breadth order
	- * by exploiting the fact that each new object get added
	- * to the tail of the dagmembers list.
	- */
	- STAILQ_FOREACH(elm, &root->dagmembers, link) {
	- for (needed = elm->obj->needed; needed != NULL; needed = needed->next) {
	- if (needed->obj == NULL \|\| donelist_check(&donelist, needed->obj))
	- continue;
	- objlist_push_tail(&needed->obj->dldags, root);
	- objlist_push_tail(&root->dagmembers, needed->obj);
	+ /*
	+ * Add dependencies of root object to DAG in breadth order
	+ * by exploiting the fact that each new object get added
	+ * to the tail of the dagmembers list.
	+ */
	+ STAILQ_FOREACH(elm, &root->dagmembers, link) {
	+ for (needed = elm->obj->needed; needed != NULL;
	+ needed = needed->next) {
	+ if (needed->obj == NULL \|\|
	+ donelist_check(&donelist, needed->obj))
	+ continue;
	+ objlist_push_tail(&needed->obj->dldags, root);
	+ objlist_push_tail(&root->dagmembers, needed->obj);
	+ }
	}
	- }
	- root->dag_inited = true;
	+ root->dag_inited = true;
	}

	static void
	init_marker(Obj_Entry *marker)
	{
	-
	bzero(marker, sizeof(*marker));
	marker->marker = true;
	}
	@@ -2276,7 +2315,6 @@
	Obj_Entry *
	globallist_curr(const Obj_Entry *obj)
	{
	-
	for (;;) {
	if (obj == NULL)
	return (NULL);
	@@ -2289,7 +2327,6 @@
	Obj_Entry *
	globallist_next(const Obj_Entry *obj)
	{
	-
	for (;;) {
	obj = TAILQ_NEXT(obj, next);
	if (obj == NULL)
	@@ -2303,14 +2340,12 @@
	static void
	hold_object(Obj_Entry *obj)
	{
	-
	obj->holdcount++;
	}

	static void
	unhold_object(Obj_Entry *obj)
	{
	-
	assert(obj->holdcount > 0);
	if (--obj->holdcount == 0 && obj->unholdfree)
	release_object(obj);
	@@ -2357,8 +2392,8 @@
	Elf_Addr note_start, note_end;

	obj->stack_flags = PF_X \| PF_R \| PF_W;
	- for (ph = obj->phdr; (const char )ph < (const char )obj->phdr +
	- obj->phsize; ph++) {
	+ for (ph = obj->phdr;
	+ (const char )ph < (const char )obj->phdr + obj->phsize; ph++) {
	switch (ph->p_type) {
	case PT_GNU_STACK:
	obj->stack_flags = ph->p_flags;
	@@ -2380,65 +2415,65 @@
	static void
	init_rtld(caddr_t mapbase, Elf_Auxinfo **aux_info)
	{
	- Obj_Entry objtmp; /* Temporary rtld object */
	- const Elf_Ehdr *ehdr;
	- const Elf_Dyn *dyn_rpath;
	- const Elf_Dyn *dyn_soname;
	- const Elf_Dyn *dyn_runpath;
	-
	- /*
	- * Conjure up an Obj_Entry structure for the dynamic linker.
	- *
	- * The "path" member can't be initialized yet because string constants
	- * cannot yet be accessed. Below we will set it correctly.
	- */
	- memset(&objtmp, 0, sizeof(objtmp));
	- objtmp.path = NULL;
	- objtmp.rtld = true;
	- objtmp.mapbase = mapbase;
	+ Obj_Entry objtmp; /* Temporary rtld object */
	+ const Elf_Ehdr *ehdr;
	+ const Elf_Dyn *dyn_rpath;
	+ const Elf_Dyn *dyn_soname;
	+ const Elf_Dyn *dyn_runpath;
	+
	+ /*
	+ * Conjure up an Obj_Entry structure for the dynamic linker.
	+ *
	+ * The "path" member can't be initialized yet because string constants
	+ * cannot yet be accessed. Below we will set it correctly.
	+ */
	+ memset(&objtmp, 0, sizeof(objtmp));
	+ objtmp.path = NULL;
	+ objtmp.rtld = true;
	+ objtmp.mapbase = mapbase;
	#ifdef PIC
	- objtmp.relocbase = mapbase;
	+ objtmp.relocbase = mapbase;
	#endif

	- objtmp.dynamic = rtld_dynamic(&objtmp);
	- digest_dynamic1(&objtmp, 1, &dyn_rpath, &dyn_soname, &dyn_runpath);
	- assert(objtmp.needed == NULL);
	- assert(!objtmp.textrel);
	- /*
	- * Temporarily put the dynamic linker entry into the object list, so
	- * that symbols can be found.
	- */
	- relocate_objects(&objtmp, true, &objtmp, 0, NULL);
	+ objtmp.dynamic = rtld_dynamic(&objtmp);
	+ digest_dynamic1(&objtmp, 1, &dyn_rpath, &dyn_soname, &dyn_runpath);
	+ assert(objtmp.needed == NULL);
	+ assert(!objtmp.textrel);
	+ /*
	+ * Temporarily put the dynamic linker entry into the object list, so
	+ * that symbols can be found.
	+ */
	+ relocate_objects(&objtmp, true, &objtmp, 0, NULL);

	- ehdr = (Elf_Ehdr *)mapbase;
	- objtmp.phdr = (Elf_Phdr )((char )mapbase + ehdr->e_phoff);
	- objtmp.phsize = ehdr->e_phnum * sizeof(objtmp.phdr[0]);
	+ ehdr = (Elf_Ehdr *)mapbase;
	+ objtmp.phdr = (Elf_Phdr )((char )mapbase + ehdr->e_phoff);
	+ objtmp.phsize = ehdr->e_phnum * sizeof(objtmp.phdr[0]);

	- /* Initialize the object list. */
	- TAILQ_INIT(&obj_list);
	+ /* Initialize the object list. */
	+ TAILQ_INIT(&obj_list);

	- /* Now that non-local variables can be accesses, copy out obj_rtld. */
	- memcpy(&obj_rtld, &objtmp, sizeof(obj_rtld));
	+ /* Now that non-local variables can be accesses, copy out obj_rtld. */
	+ memcpy(&obj_rtld, &objtmp, sizeof(obj_rtld));

	- /* The page size is required by the dynamic memory allocator. */
	- init_pagesizes(aux_info);
	+ /* The page size is required by the dynamic memory allocator. */
	+ init_pagesizes(aux_info);

	- if (aux_info[AT_OSRELDATE] != NULL)
	- osreldate = aux_info[AT_OSRELDATE]->a_un.a_val;
	+ if (aux_info[AT_OSRELDATE] != NULL)
	+ osreldate = aux_info[AT_OSRELDATE]->a_un.a_val;

	- digest_dynamic2(&obj_rtld, dyn_rpath, dyn_soname, dyn_runpath);
	+ digest_dynamic2(&obj_rtld, dyn_rpath, dyn_soname, dyn_runpath);

	- /* Replace the path with a dynamically allocated copy. */
	- obj_rtld.path = xstrdup(ld_path_rtld);
	+ /* Replace the path with a dynamically allocated copy. */
	+ obj_rtld.path = xstrdup(ld_path_rtld);

	- parse_rtld_phdr(&obj_rtld);
	- if (obj_enforce_relro(&obj_rtld) == -1)
	- rtld_die();
	+ parse_rtld_phdr(&obj_rtld);
	+ if (obj_enforce_relro(&obj_rtld) == -1)
	+ rtld_die();

	- r_debug.r_version = R_DEBUG_VERSION;
	- r_debug.r_brk = r_debug_state;
	- r_debug.r_state = RT_CONSISTENT;
	- r_debug.r_ldbase = obj_rtld.relocbase;
	+ r_debug.r_version = R_DEBUG_VERSION;
	+ r_debug.r_brk = r_debug_state;
	+ r_debug.r_state = RT_CONSISTENT;
	+ r_debug.r_ldbase = obj_rtld.relocbase;
	}

	/*
	@@ -2452,8 +2487,8 @@
	int mib[2];
	size_t len, size;

	- if (aux_info[AT_PAGESIZES] != NULL && aux_info[AT_PAGESIZESLEN] !=
	- NULL) {
	+ if (aux_info[AT_PAGESIZES] != NULL &&
	+ aux_info[AT_PAGESIZESLEN] != NULL) {
	size = aux_info[AT_PAGESIZESLEN]->a_un.a_val;
	pagesizes = aux_info[AT_PAGESIZES]->a_un.a_ptr;
	} else {
	@@ -2476,7 +2511,7 @@
	_rtld_error("sysctl for hw.pagesize(s) failed");
	rtld_die();
	}
	-psa_filled:
	+ psa_filled:
	pagesizes = psa;
	}
	npagesizes = size / sizeof(pagesizes[0]);
	@@ -2496,13 +2531,13 @@
	static void
	initlist_add_neededs(Needed_Entry needed, Objlist list)
	{
	- /* Recursively process the successor needed objects. */
	- if (needed->next != NULL)
	- initlist_add_neededs(needed->next, list);
	+ /* Recursively process the successor needed objects. */
	+ if (needed->next != NULL)
	+ initlist_add_neededs(needed->next, list);

	- /* Process the current needed object. */
	- if (needed->obj != NULL)
	- initlist_add_objects(needed->obj, needed->obj, list);
	+ /* Process the current needed object. */
	+ if (needed->obj != NULL)
	+ initlist_add_objects(needed->obj, needed->obj, list);
	}

	/*
	@@ -2517,57 +2552,57 @@
	static void
	initlist_add_objects(Obj_Entry obj, Obj_Entry tail, Objlist *list)
	{
	- Obj_Entry *nobj;
	-
	- if (obj->init_scanned \|\| obj->init_done)
	- return;
	- obj->init_scanned = true;
	+ Obj_Entry *nobj;

	- /* Recursively process the successor objects. */
	- nobj = globallist_next(obj);
	- if (nobj != NULL && obj != tail)
	- initlist_add_objects(nobj, tail, list);
	-
	- /* Recursively process the needed objects. */
	- if (obj->needed != NULL)
	- initlist_add_neededs(obj->needed, list);
	- if (obj->needed_filtees != NULL)
	- initlist_add_neededs(obj->needed_filtees, list);
	- if (obj->needed_aux_filtees != NULL)
	- initlist_add_neededs(obj->needed_aux_filtees, list);
	-
	- /* Add the object to the init list. */
	- objlist_push_tail(list, obj);
	-
	- /* Add the object to the global fini list in the reverse order. */
	- if ((obj->fini != (Elf_Addr)NULL \|\| obj->fini_array != (Elf_Addr)NULL)
	- && !obj->on_fini_list) {
	- objlist_push_head(&list_fini, obj);
	- obj->on_fini_list = true;
	- }
	+ if (obj->init_scanned \|\| obj->init_done)
	+ return;
	+ obj->init_scanned = true;
	+
	+ /* Recursively process the successor objects. */
	+ nobj = globallist_next(obj);
	+ if (nobj != NULL && obj != tail)
	+ initlist_add_objects(nobj, tail, list);
	+
	+ /* Recursively process the needed objects. */
	+ if (obj->needed != NULL)
	+ initlist_add_neededs(obj->needed, list);
	+ if (obj->needed_filtees != NULL)
	+ initlist_add_neededs(obj->needed_filtees, list);
	+ if (obj->needed_aux_filtees != NULL)
	+ initlist_add_neededs(obj->needed_aux_filtees, list);
	+
	+ /* Add the object to the init list. */
	+ objlist_push_tail(list, obj);
	+
	+ /* Add the object to the global fini list in the reverse order. */
	+ if ((obj->fini != (Elf_Addr)NULL \|\|
	+ obj->fini_array != (Elf_Addr)NULL) &&
	+ !obj->on_fini_list) {
	+ objlist_push_head(&list_fini, obj);
	+ obj->on_fini_list = true;
	+ }
	}

	static void
	free_needed_filtees(Needed_Entry n, RtldLockState lockstate)
	{
	- Needed_Entry needed, needed1;
	+ Needed_Entry needed, needed1;

	- for (needed = n; needed != NULL; needed = needed->next) {
	- if (needed->obj != NULL) {
	- dlclose_locked(needed->obj, lockstate);
	- needed->obj = NULL;
	+ for (needed = n; needed != NULL; needed = needed->next) {
	+ if (needed->obj != NULL) {
	+ dlclose_locked(needed->obj, lockstate);
	+ needed->obj = NULL;
	+ }
	+ }
	+ for (needed = n; needed != NULL; needed = needed1) {
	+ needed1 = needed->next;
	+ free(needed);
	}
	- }
	- for (needed = n; needed != NULL; needed = needed1) {
	- needed1 = needed->next;
	- free(needed);
	- }
	}

	static void
	unload_filtees(Obj_Entry obj, RtldLockState lockstate)
	{
	-
	free_needed_filtees(obj->needed_filtees, lockstate);
	obj->needed_filtees = NULL;
	free_needed_filtees(obj->needed_aux_filtees, lockstate);
	@@ -2579,12 +2614,13 @@
	load_filtee1(Obj_Entry obj, Needed_Entry needed, int flags,
	RtldLockState *lockstate)
	{
	-
	- for (; needed != NULL; needed = needed->next) {
	- needed->obj = dlopen_object(obj->strtab + needed->name, -1, obj,
	- flags, ((ld_loadfltr \|\| obj->z_loadfltr) ? RTLD_NOW : RTLD_LAZY) \|
	- RTLD_LOCAL, lockstate);
	- }
	+ for (; needed != NULL; needed = needed->next) {
	+ needed->obj = dlopen_object(obj->strtab + needed->name, -1, obj,
	+ flags,
	+ ((ld_loadfltr \|\| obj->z_loadfltr) ? RTLD_NOW : RTLD_LAZY) \|
	+ RTLD_LOCAL,
	+ lockstate);
	+ }
	}

	static void
	@@ -2603,15 +2639,16 @@
	static int
	process_needed(Obj_Entry obj, Needed_Entry needed, int flags)
	{
	- Obj_Entry *obj1;
	+ Obj_Entry *obj1;

	- for (; needed != NULL; needed = needed->next) {
	- obj1 = needed->obj = load_object(obj->strtab + needed->name, -1, obj,
	- flags & ~RTLD_LO_NOLOAD);
	- if (obj1 == NULL && !ld_tracing && (flags & RTLD_LO_FILTEES) == 0)
	- return (-1);
	- }
	- return (0);
	+ for (; needed != NULL; needed = needed->next) {
	+ obj1 = needed->obj = load_object(obj->strtab + needed->name, -1,
	+ obj, flags & ~RTLD_LO_NOLOAD);
	+ if (obj1 == NULL && !ld_tracing &&
	+ (flags & RTLD_LO_FILTEES) == 0)
	+ return (-1);
	+ }
	+ return (0);
	}

	/*
	@@ -2622,16 +2659,16 @@
	static int
	load_needed_objects(Obj_Entry *first, int flags)
	{
	- Obj_Entry *obj;
	+ Obj_Entry *obj;

	- for (obj = first; obj != NULL; obj = TAILQ_NEXT(obj, next)) {
	- if (obj->marker)
	- continue;
	- if (process_needed(obj, obj->needed, flags) == -1)
	- return (-1);
	- }
	- return (0);
	-}
	+ for (obj = first; obj != NULL; obj = TAILQ_NEXT(obj, next)) {
	+ if (obj->marker)
	+ continue;
	+ if (process_needed(obj, obj->needed, flags) == -1)
	+ return (-1);
	+ }
	+ return (0);
	+}

	static int
	load_preload_objects(const char *penv, bool isfd)
	@@ -2668,7 +2705,7 @@
	obj = load_object(name, fd, NULL, 0);
	if (obj == NULL) {
	free(psave);
	- return (-1); /* XXX - cleanup */
	+ return (-1); /* XXX - cleanup */
	}
	obj->z_interpose = true;
	p[len] = savech;
	@@ -2684,7 +2721,6 @@
	static const char *
	printable_path(const char *path)
	{
	-
	return (path == NULL ? "<unknown>" : path);
	}

	@@ -2700,155 +2736,155 @@
	static Obj_Entry *
	load_object(const char name, int fd_u, const Obj_Entry refobj, int flags)
	{
	- Obj_Entry *obj;
	- int fd;
	- struct stat sb;
	- char *path;
	+ Obj_Entry *obj;
	+ int fd;
	+ struct stat sb;
	+ char *path;

	- fd = -1;
	- if (name != NULL) {
	+ fd = -1;
	+ if (name != NULL) {
	+ TAILQ_FOREACH(obj, &obj_list, next) {
	+ if (obj->marker \|\| obj->doomed)
	+ continue;
	+ if (object_match_name(obj, name))
	+ return (obj);
	+ }
	+
	+ path = find_library(name, refobj, &fd);
	+ if (path == NULL)
	+ return (NULL);
	+ } else
	+ path = NULL;
	+
	+ if (fd >= 0) {
	+ /*
	+ * search_library_pathfds() opens a fresh file descriptor for
	+ * the library, so there is no need to dup().
	+ */
	+ } else if (fd_u == -1) {
	+ /*
	+ * If we didn't find a match by pathname, or the name is not
	+ * supplied, open the file and check again by device and inode.
	+ * This avoids false mismatches caused by multiple links or ".."
	+ * in pathnames.
	+ *
	+ * To avoid a race, we open the file and use fstat() rather than
	+ * using stat().
	+ */
	+ if ((fd = open(path, O_RDONLY \| O_CLOEXEC \| O_VERIFY)) == -1) {
	+ _rtld_error("Cannot open \"%s\"", path);
	+ free(path);
	+ return (NULL);
	+ }
	+ } else {
	+ fd = fcntl(fd_u, F_DUPFD_CLOEXEC, 0);
	+ if (fd == -1) {
	+ _rtld_error("Cannot dup fd");
	+ free(path);
	+ return (NULL);
	+ }
	+ }
	+ if (fstat(fd, &sb) == -1) {
	+ _rtld_error("Cannot fstat \"%s\"", printable_path(path));
	+ close(fd);
	+ free(path);
	+ return (NULL);
	+ }
	TAILQ_FOREACH(obj, &obj_list, next) {
	- if (obj->marker \|\| obj->doomed)
	- continue;
	- if (object_match_name(obj, name))
	+ if (obj->marker \|\| obj->doomed)
	+ continue;
	+ if (obj->ino == sb.st_ino && obj->dev == sb.st_dev)
	+ break;
	+ }
	+ if (obj != NULL) {
	+ if (name != NULL)
	+ object_add_name(obj, name);
	+ free(path);
	+ close(fd);
	return (obj);
	}
	+ if (flags & RTLD_LO_NOLOAD) {
	+ free(path);
	+ close(fd);
	+ return (NULL);
	+ }

	- path = find_library(name, refobj, &fd);
	- if (path == NULL)
	- return (NULL);
	- } else
	- path = NULL;
	+ /* First use of this object, so we must map it in */
	+ obj = do_load_object(fd, name, path, &sb, flags);
	+ if (obj == NULL)
	+ free(path);
	+ close(fd);
	+
	+ return (obj);
	+}
	+
	+static Obj_Entry *
	+do_load_object(int fd, const char name, char path, struct stat *sbp,
	+ int flags)
	+{
	+ Obj_Entry *obj;
	+ struct statfs fs;

	- if (fd >= 0) {
	/*
	- * search_library_pathfds() opens a fresh file descriptor for the
	- * library, so there is no need to dup().
	+ * First, make sure that environment variables haven't been
	+ * used to circumvent the noexec flag on a filesystem.
	+ * We ignore fstatfs(2) failures, since fd might reference
	+ * not a file, e.g. shmfd.
	*/
	- } else if (fd_u == -1) {
	+ if (dangerous_ld_env && fstatfs(fd, &fs) == 0 &&
	+ (fs.f_flags & MNT_NOEXEC) != 0) {
	+ _rtld_error("Cannot execute objects on %s", fs.f_mntonname);
	+ return (NULL);
	+ }
	+
	+ dbg("loading \"%s\"", printable_path(path));
	+ obj = map_object(fd, printable_path(path), sbp);
	+ if (obj == NULL)
	+ return (NULL);
	+
	/*
	- * If we didn't find a match by pathname, or the name is not
	- * supplied, open the file and check again by device and inode.
	- * This avoids false mismatches caused by multiple links or ".."
	- * in pathnames.
	- *
	- * To avoid a race, we open the file and use fstat() rather than
	- * using stat().
	+ * If DT_SONAME is present in the object, digest_dynamic2 already
	+ * added it to the object names.
	*/
	- if ((fd = open(path, O_RDONLY \| O_CLOEXEC \| O_VERIFY)) == -1) {
	- _rtld_error("Cannot open \"%s\"", path);
	- free(path);
	- return (NULL);
	+ if (name != NULL)
	+ object_add_name(obj, name);
	+ obj->path = path;
	+ if (!digest_dynamic(obj, 0))
	+ goto errp;
	+ dbg("%s valid_hash_sysv %d valid_hash_gnu %d dynsymcount %d", obj->path,
	+ obj->valid_hash_sysv, obj->valid_hash_gnu, obj->dynsymcount);
	+ if (obj->z_pie && (flags & RTLD_LO_TRACE) == 0) {
	+ dbg("refusing to load PIE executable \"%s\"", obj->path);
	+ _rtld_error("Cannot load PIE binary %s as DSO", obj->path);
	+ goto errp;
	}
	- } else {
	- fd = fcntl(fd_u, F_DUPFD_CLOEXEC, 0);
	- if (fd == -1) {
	- _rtld_error("Cannot dup fd");
	- free(path);
	- return (NULL);
	+ if (obj->z_noopen &&
	+ (flags & (RTLD_LO_DLOPEN \| RTLD_LO_TRACE)) == RTLD_LO_DLOPEN) {
	+ dbg("refusing to load non-loadable \"%s\"", obj->path);
	+ _rtld_error("Cannot dlopen non-loadable %s", obj->path);
	+ goto errp;
	}
	- }
	- if (fstat(fd, &sb) == -1) {
	- _rtld_error("Cannot fstat \"%s\"", printable_path(path));
	- close(fd);
	- free(path);
	- return (NULL);
	- }
	- TAILQ_FOREACH(obj, &obj_list, next) {
	- if (obj->marker \|\| obj->doomed)
	- continue;
	- if (obj->ino == sb.st_ino && obj->dev == sb.st_dev)
	- break;
	- }
	- if (obj != NULL) {
	- if (name != NULL)
	- object_add_name(obj, name);
	- free(path);
	- close(fd);
	- return (obj);
	- }
	- if (flags & RTLD_LO_NOLOAD) {
	- free(path);
	- close(fd);
	- return (NULL);
	- }

	- /* First use of this object, so we must map it in */
	- obj = do_load_object(fd, name, path, &sb, flags);
	- if (obj == NULL)
	- free(path);
	- close(fd);
	+ obj->dlopened = (flags & RTLD_LO_DLOPEN) != 0;
	+ TAILQ_INSERT_TAIL(&obj_list, obj, next);
	+ obj_count++;
	+ obj_loads++;
	+ linkmap_add(obj); /* for GDB & dlinfo() */
	+ max_stack_flags \|= obj->stack_flags;

	- return (obj);
	-}
	+ dbg(" %p .. %p: %s", obj->mapbase, obj->mapbase + obj->mapsize - 1,
	+ obj->path);
	+ if (obj->textrel)
	+ dbg(" WARNING: %s has impure text", obj->path);
	+ LD_UTRACE(UTRACE_LOAD_OBJECT, obj, obj->mapbase, obj->mapsize, 0,
	+ obj->path);

	-static Obj_Entry *
	-do_load_object(int fd, const char name, char path, struct stat *sbp,
	- int flags)
	-{
	- Obj_Entry *obj;
	- struct statfs fs;
	-
	- /*
	- * First, make sure that environment variables haven't been
	- * used to circumvent the noexec flag on a filesystem.
	- * We ignore fstatfs(2) failures, since fd might reference
	- * not a file, e.g. shmfd.
	- */
	- if (dangerous_ld_env && fstatfs(fd, &fs) == 0 &&
	- (fs.f_flags & MNT_NOEXEC) != 0) {
	- _rtld_error("Cannot execute objects on %s", fs.f_mntonname);
	- return (NULL);
	- }
	-
	- dbg("loading \"%s\"", printable_path(path));
	- obj = map_object(fd, printable_path(path), sbp);
	- if (obj == NULL)
	- return (NULL);
	-
	- /*
	- * If DT_SONAME is present in the object, digest_dynamic2 already
	- * added it to the object names.
	- */
	- if (name != NULL)
	- object_add_name(obj, name);
	- obj->path = path;
	- if (!digest_dynamic(obj, 0))
	- goto errp;
	- dbg("%s valid_hash_sysv %d valid_hash_gnu %d dynsymcount %d", obj->path,
	- obj->valid_hash_sysv, obj->valid_hash_gnu, obj->dynsymcount);
	- if (obj->z_pie && (flags & RTLD_LO_TRACE) == 0) {
	- dbg("refusing to load PIE executable \"%s\"", obj->path);
	- _rtld_error("Cannot load PIE binary %s as DSO", obj->path);
	- goto errp;
	- }
	- if (obj->z_noopen && (flags & (RTLD_LO_DLOPEN \| RTLD_LO_TRACE)) ==
	- RTLD_LO_DLOPEN) {
	- dbg("refusing to load non-loadable \"%s\"", obj->path);
	- _rtld_error("Cannot dlopen non-loadable %s", obj->path);
	- goto errp;
	- }
	-
	- obj->dlopened = (flags & RTLD_LO_DLOPEN) != 0;
	- TAILQ_INSERT_TAIL(&obj_list, obj, next);
	- obj_count++;
	- obj_loads++;
	- linkmap_add(obj); /* for GDB & dlinfo() */
	- max_stack_flags \|= obj->stack_flags;
	-
	- dbg(" %p .. %p: %s", obj->mapbase,
	- obj->mapbase + obj->mapsize - 1, obj->path);
	- if (obj->textrel)
	- dbg(" WARNING: %s has impure text", obj->path);
	- LD_UTRACE(UTRACE_LOAD_OBJECT, obj, obj->mapbase, obj->mapsize, 0,
	- obj->path);
	-
	- return (obj);
	+ return (obj);

	errp:
	- munmap(obj->mapbase, obj->mapsize);
	- obj_free(obj);
	- return (NULL);
	+ munmap(obj->mapbase, obj->mapsize);
	+ obj_free(obj);
	+ return (NULL);
	}

	static int
	@@ -2881,8 +2917,9 @@
	case PT_LOAD:
	if (seg0 == NULL \|\| seg0->p_vaddr > phdr->p_vaddr)
	seg0 = phdr;
	- if (segn == NULL \|\| segn->p_vaddr + segn->p_memsz <
	- phdr->p_vaddr + phdr->p_memsz)
	+ if (segn == NULL \|\|
	+ segn->p_vaddr + segn->p_memsz <
	+ phdr->p_vaddr + phdr->p_memsz)
	segn = phdr;
	break;
	}
	@@ -2915,7 +2952,7 @@
	TAILQ_INSERT_TAIL(&obj_list, obj, next);
	obj_count++;
	obj_loads++;
	- linkmap_add(obj); /* for GDB & dlinfo() */
	+ linkmap_add(obj); /* for GDB & dlinfo() */
	max_stack_flags \|= obj->stack_flags;

	LD_UTRACE(UTRACE_LOAD_OBJECT, obj, obj->mapbase, 0, 0, obj->path);
	@@ -2925,38 +2962,38 @@
	Obj_Entry *
	obj_from_addr(const void *addr)
	{
	- Obj_Entry *obj;
	+ Obj_Entry *obj;

	- TAILQ_FOREACH(obj, &obj_list, next) {
	- if (obj->marker)
	- continue;
	- if (addr < (void *) obj->mapbase)
	- continue;
	- if (addr < (void *)(obj->mapbase + obj->mapsize))
	- return obj;
	- }
	- return (NULL);
	+ TAILQ_FOREACH(obj, &obj_list, next) {
	+ if (obj->marker)
	+ continue;
	+ if (addr < (void *)obj->mapbase)
	+ continue;
	+ if (addr < (void *)(obj->mapbase + obj->mapsize))
	+ return obj;
	+ }
	+ return (NULL);
	}

	static void
	preinit_main(void)
	{
	- Elf_Addr *preinit_addr;
	- int index;
	+ Elf_Addr *preinit_addr;
	+ int index;

	- preinit_addr = (Elf_Addr *)obj_main->preinit_array;
	- if (preinit_addr == NULL)
	- return;
	+ preinit_addr = (Elf_Addr *)obj_main->preinit_array;
	+ if (preinit_addr == NULL)
	+ return;

	- for (index = 0; index < obj_main->preinit_array_num; index++) {
	- if (preinit_addr[index] != 0 && preinit_addr[index] != 1) {
	- dbg("calling preinit function for %s at %p", obj_main->path,
	- (void *)preinit_addr[index]);
	- LD_UTRACE(UTRACE_INIT_CALL, obj_main, (void *)preinit_addr[index],
	- 0, 0, obj_main->path);
	- call_init_pointer(obj_main, preinit_addr[index]);
	+ for (index = 0; index < obj_main->preinit_array_num; index++) {
	+ if (preinit_addr[index] != 0 && preinit_addr[index] != 1) {
	+ dbg("calling preinit function for %s at %p",
	+ obj_main->path, (void *)preinit_addr[index]);
	+ LD_UTRACE(UTRACE_INIT_CALL, obj_main,
	+ (void *)preinit_addr[index], 0, 0, obj_main->path);
	+ call_init_pointer(obj_main, preinit_addr[index]);
	+ }
	}
	- }
	}

	/*
	@@ -2969,71 +3006,82 @@
	static void
	objlist_call_fini(Objlist list, Obj_Entry root, RtldLockState *lockstate)
	{
	- Objlist_Entry *elm;
	- struct dlerror_save *saved_msg;
	- Elf_Addr *fini_addr;
	- int index;
	+ Objlist_Entry *elm;
	+ struct dlerror_save *saved_msg;
	+ Elf_Addr *fini_addr;
	+ int index;

	- assert(root == NULL \|\| root->refcount == 1);
	+ assert(root == NULL \|\| root->refcount == 1);

	- if (root != NULL)
	- root->doomed = true;
	+ if (root != NULL)
	+ root->doomed = true;

	- /*
	- * Preserve the current error message since a fini function might
	- * call into the dynamic linker and overwrite it.
	- */
	- saved_msg = errmsg_save();
	- do {
	- STAILQ_FOREACH(elm, list, link) {
	- if (root != NULL && (elm->obj->refcount != 1 \|\|
	- objlist_find(&root->dagmembers, elm->obj) == NULL))
	- continue;
	- /* Remove object from fini list to prevent recursive invocation. */
	- STAILQ_REMOVE(list, elm, Struct_Objlist_Entry, link);
	- /* Ensure that new references cannot be acquired. */
	- elm->obj->doomed = true;
	-
	- hold_object(elm->obj);
	- lock_release(rtld_bind_lock, lockstate);
	- /*
	- * It is legal to have both DT_FINI and DT_FINI_ARRAY defined.
	- * When this happens, DT_FINI_ARRAY is processed first.
	- */
	- fini_addr = (Elf_Addr *)elm->obj->fini_array;
	- if (fini_addr != NULL && elm->obj->fini_array_num > 0) {
	- for (index = elm->obj->fini_array_num - 1; index >= 0;
	- index--) {
	- if (fini_addr[index] != 0 && fini_addr[index] != 1) {
	- dbg("calling fini function for %s at %p",
	- elm->obj->path, (void *)fini_addr[index]);
	- LD_UTRACE(UTRACE_FINI_CALL, elm->obj,
	- (void *)fini_addr[index], 0, 0, elm->obj->path);
	- call_initfini_pointer(elm->obj, fini_addr[index]);
	- }
	+ /*
	+ * Preserve the current error message since a fini function might
	+ * call into the dynamic linker and overwrite it.
	+ */
	+ saved_msg = errmsg_save();
	+ do {
	+ STAILQ_FOREACH(elm, list, link) {
	+ if (root != NULL &&
	+ (elm->obj->refcount != 1 \|\|
	+ objlist_find(&root->dagmembers, elm->obj) ==
	+ NULL))
	+ continue;
	+ /* Remove object from fini list to prevent recursive
	+ * invocation. */
	+ STAILQ_REMOVE(list, elm, Struct_Objlist_Entry, link);
	+ /* Ensure that new references cannot be acquired. */
	+ elm->obj->doomed = true;
	+
	+ hold_object(elm->obj);
	+ lock_release(rtld_bind_lock, lockstate);
	+ /*
	+ * It is legal to have both DT_FINI and DT_FINI_ARRAY
	+ * defined. When this happens, DT_FINI_ARRAY is
	+ * processed first.
	+ */
	+ fini_addr = (Elf_Addr *)elm->obj->fini_array;
	+ if (fini_addr != NULL && elm->obj->fini_array_num > 0) {
	+ for (index = elm->obj->fini_array_num - 1;
	+ index >= 0; index--) {
	+ if (fini_addr[index] != 0 &&
	+ fini_addr[index] != 1) {
	+ dbg("calling fini function for %s at %p",
	+ elm->obj->path,
	+ (void *)fini_addr[index]);
	+ LD_UTRACE(UTRACE_FINI_CALL,
	+ elm->obj,
	+ (void *)fini_addr[index], 0,
	+ 0, elm->obj->path);
	+ call_initfini_pointer(elm->obj,
	+ fini_addr[index]);
	+ }
	+ }
	+ }
	+ if (elm->obj->fini != (Elf_Addr)NULL) {
	+ dbg("calling fini function for %s at %p",
	+ elm->obj->path, (void *)elm->obj->fini);
	+ LD_UTRACE(UTRACE_FINI_CALL, elm->obj,
	+ (void *)elm->obj->fini, 0, 0,
	+ elm->obj->path);
	+ call_initfini_pointer(elm->obj, elm->obj->fini);
	+ }
	+ wlock_acquire(rtld_bind_lock, lockstate);
	+ unhold_object(elm->obj);
	+ /* No need to free anything if process is going down. */
	+ if (root != NULL)
	+ free(elm);
	+ /*
	+ * We must restart the list traversal after every fini
	+ * call because a dlclose() call from the fini function
	+ * or from another thread might have modified the
	+ * reference counts.
	+ */
	+ break;
	}
	- }
	- if (elm->obj->fini != (Elf_Addr)NULL) {
	- dbg("calling fini function for %s at %p", elm->obj->path,
	- (void *)elm->obj->fini);
	- LD_UTRACE(UTRACE_FINI_CALL, elm->obj, (void *)elm->obj->fini,
	- 0, 0, elm->obj->path);
	- call_initfini_pointer(elm->obj, elm->obj->fini);
	- }
	- wlock_acquire(rtld_bind_lock, lockstate);
	- unhold_object(elm->obj);
	- /* No need to free anything if process is going down. */
	- if (root != NULL)
	- free(elm);
	- /*
	- * We must restart the list traversal after every fini call
	- * because a dlclose() call from the fini function or from
	- * another thread might have modified the reference counts.
	- */
	- break;
	- }
	- } while (elm != NULL);
	- errmsg_restore(saved_msg);
	+ } while (elm != NULL);
	+ errmsg_restore(saved_msg);
	}

	/*
	@@ -3044,126 +3092,131 @@
	static void
	objlist_call_init(Objlist list, RtldLockState lockstate)
	{
	- Objlist_Entry *elm;
	- Obj_Entry *obj;
	- struct dlerror_save *saved_msg;
	- Elf_Addr *init_addr;
	- void (reg)(void ()(void));
	- int index;
	-
	- /*
	- * Clean init_scanned flag so that objects can be rechecked and
	- * possibly initialized earlier if any of vectors called below
	- * cause the change by using dlopen.
	- */
	- TAILQ_FOREACH(obj, &obj_list, next) {
	- if (obj->marker)
	- continue;
	- obj->init_scanned = false;
	- }
	-
	- /*
	- * Preserve the current error message since an init function might
	- * call into the dynamic linker and overwrite it.
	- */
	- saved_msg = errmsg_save();
	- STAILQ_FOREACH(elm, list, link) {
	- if (elm->obj->init_done) /* Initialized early. */
	- continue;
	+ Objlist_Entry *elm;
	+ Obj_Entry *obj;
	+ struct dlerror_save *saved_msg;
	+ Elf_Addr *init_addr;
	+ void (reg)(void ()(void));
	+ int index;
	+
	/*
	- * Race: other thread might try to use this object before current
	- * one completes the initialization. Not much can be done here
	- * without better locking.
	+ * Clean init_scanned flag so that objects can be rechecked and
	+ * possibly initialized earlier if any of vectors called below
	+ * cause the change by using dlopen.
	*/
	- elm->obj->init_done = true;
	- hold_object(elm->obj);
	- reg = NULL;
	- if (elm->obj == obj_main && obj_main->crt_no_init) {
	- reg = (void ()(void ()(void)))get_program_var_addr(
	- "__libc_atexit", lockstate);
	- }
	- lock_release(rtld_bind_lock, lockstate);
	- if (reg != NULL) {
	- reg(rtld_exit);
	- rtld_exit_ptr = rtld_nop_exit;
	- }
	-
	- /*
	- * It is legal to have both DT_INIT and DT_INIT_ARRAY defined.
	- * When this happens, DT_INIT is processed first.
	- */
	- if (elm->obj->init != (Elf_Addr)NULL) {
	- dbg("calling init function for %s at %p", elm->obj->path,
	- (void *)elm->obj->init);
	- LD_UTRACE(UTRACE_INIT_CALL, elm->obj, (void *)elm->obj->init,
	- 0, 0, elm->obj->path);
	- call_init_pointer(elm->obj, elm->obj->init);
	- }
	- init_addr = (Elf_Addr *)elm->obj->init_array;
	- if (init_addr != NULL) {
	- for (index = 0; index < elm->obj->init_array_num; index++) {
	- if (init_addr[index] != 0 && init_addr[index] != 1) {
	- dbg("calling init function for %s at %p", elm->obj->path,
	- (void *)init_addr[index]);
	- LD_UTRACE(UTRACE_INIT_CALL, elm->obj,
	- (void *)init_addr[index], 0, 0, elm->obj->path);
	- call_init_pointer(elm->obj, init_addr[index]);
	+ TAILQ_FOREACH(obj, &obj_list, next) {
	+ if (obj->marker)
	+ continue;
	+ obj->init_scanned = false;
	+ }
	+
	+ /*
	+ * Preserve the current error message since an init function might
	+ * call into the dynamic linker and overwrite it.
	+ */
	+ saved_msg = errmsg_save();
	+ STAILQ_FOREACH(elm, list, link) {
	+ if (elm->obj->init_done) /* Initialized early. */
	+ continue;
	+ /*
	+ * Race: other thread might try to use this object before
	+ * current one completes the initialization. Not much can be
	+ * done here without better locking.
	+ */
	+ elm->obj->init_done = true;
	+ hold_object(elm->obj);
	+ reg = NULL;
	+ if (elm->obj == obj_main && obj_main->crt_no_init) {
	+ reg = (void ()(void ()(void)))
	+ get_program_var_addr("__libc_atexit", lockstate);
	+ }
	+ lock_release(rtld_bind_lock, lockstate);
	+ if (reg != NULL) {
	+ reg(rtld_exit);
	+ rtld_exit_ptr = rtld_nop_exit;
	+ }
	+
	+ /*
	+ * It is legal to have both DT_INIT and DT_INIT_ARRAY defined.
	+ * When this happens, DT_INIT is processed first.
	+ */
	+ if (elm->obj->init != (Elf_Addr)NULL) {
	+ dbg("calling init function for %s at %p",
	+ elm->obj->path, (void *)elm->obj->init);
	+ LD_UTRACE(UTRACE_INIT_CALL, elm->obj,
	+ (void *)elm->obj->init, 0, 0, elm->obj->path);
	+ call_init_pointer(elm->obj, elm->obj->init);
	+ }
	+ init_addr = (Elf_Addr *)elm->obj->init_array;
	+ if (init_addr != NULL) {
	+ for (index = 0; index < elm->obj->init_array_num;
	+ index++) {
	+ if (init_addr[index] != 0 &&
	+ init_addr[index] != 1) {
	+ dbg("calling init function for %s at %p",
	+ elm->obj->path,
	+ (void *)init_addr[index]);
	+ LD_UTRACE(UTRACE_INIT_CALL, elm->obj,
	+ (void *)init_addr[index], 0, 0,
	+ elm->obj->path);
	+ call_init_pointer(elm->obj,
	+ init_addr[index]);
	+ }
	+ }
	}
	- }
	+ wlock_acquire(rtld_bind_lock, lockstate);
	+ unhold_object(elm->obj);
	}
	- wlock_acquire(rtld_bind_lock, lockstate);
	- unhold_object(elm->obj);
	- }
	- errmsg_restore(saved_msg);
	+ errmsg_restore(saved_msg);
	}

	static void
	objlist_clear(Objlist *list)
	{
	- Objlist_Entry *elm;
	+ Objlist_Entry *elm;

	- while (!STAILQ_EMPTY(list)) {
	- elm = STAILQ_FIRST(list);
	- STAILQ_REMOVE_HEAD(list, link);
	- free(elm);
	- }
	+ while (!STAILQ_EMPTY(list)) {
	+ elm = STAILQ_FIRST(list);
	+ STAILQ_REMOVE_HEAD(list, link);
	+ free(elm);
	+ }
	}

	static Objlist_Entry *
	objlist_find(Objlist list, const Obj_Entry obj)
	{
	- Objlist_Entry *elm;
	+ Objlist_Entry *elm;

	- STAILQ_FOREACH(elm, list, link)
	- if (elm->obj == obj)
	- return elm;
	- return (NULL);
	+ STAILQ_FOREACH(elm, list, link)
	+ if (elm->obj == obj)
	+ return elm;
	+ return (NULL);
	}

	static void
	objlist_init(Objlist *list)
	{
	- STAILQ_INIT(list);
	+ STAILQ_INIT(list);
	}

	static void
	objlist_push_head(Objlist list, Obj_Entry obj)
	{
	- Objlist_Entry *elm;
	+ Objlist_Entry *elm;

	- elm = NEW(Objlist_Entry);
	- elm->obj = obj;
	- STAILQ_INSERT_HEAD(list, elm, link);
	+ elm = NEW(Objlist_Entry);
	+ elm->obj = obj;
	+ STAILQ_INSERT_HEAD(list, elm, link);
	}

	static void
	objlist_push_tail(Objlist list, Obj_Entry obj)
	{
	- Objlist_Entry *elm;
	+ Objlist_Entry *elm;

	- elm = NEW(Objlist_Entry);
	- elm->obj = obj;
	- STAILQ_INSERT_TAIL(list, elm, link);
	+ elm = NEW(Objlist_Entry);
	+ elm->obj = obj;
	+ STAILQ_INSERT_TAIL(list, elm, link);
	}

	static void
	@@ -3186,12 +3239,12 @@
	static void
	objlist_remove(Objlist list, Obj_Entry obj)
	{
	- Objlist_Entry *elm;
	+ Objlist_Entry *elm;

	- if ((elm = objlist_find(list, obj)) != NULL) {
	- STAILQ_REMOVE(list, elm, Struct_Objlist_Entry, link);
	- free(elm);
	- }
	+ if ((elm = objlist_find(list, obj)) != NULL) {
	+ STAILQ_REMOVE(list, elm, Struct_Objlist_Entry, link);
	+ free(elm);
	+ }
	}

	/*
	@@ -3232,8 +3285,7 @@
	size_t l, sz;
	int prot;

	- for (l = obj->phsize / sizeof(*ph), ph = obj->phdr; l > 0;
	- l--, ph++) {
	+ for (l = obj->phsize / sizeof(*ph), ph = obj->phdr; l > 0; l--, ph++) {
	if (ph->p_type != PT_LOAD \|\| (ph->p_flags & PF_W) != 0)
	continue;
	base = obj->relocbase + rtld_trunc_page(ph->p_vaddr);
	@@ -3260,17 +3312,17 @@

	relrlim = (const Elf_Relr )((const char )obj->relr + obj->relrsize);
	for (relr = obj->relr; relr < relrlim; relr++) {
	- Elf_Relr entry = *relr;
	+ Elf_Relr entry = *relr;

	- if ((entry & 1) == 0) {
	- where = (Elf_Addr *)(obj->relocbase + entry);
	- *where++ += (Elf_Addr)obj->relocbase;
	- } else {
	- for (long i = 0; (entry >>= 1) != 0; i++)
	- if ((entry & 1) != 0)
	- where[i] += (Elf_Addr)obj->relocbase;
	- where += CHAR_BIT * sizeof(Elf_Relr) - 1;
	- }
	+ if ((entry & 1) == 0) {
	+ where = (Elf_Addr *)(obj->relocbase + entry);
	+ *where++ += (Elf_Addr)obj->relocbase;
	+ } else {
	+ for (long i = 0; (entry >>= 1) != 0; i++)
	+ if ((entry & 1) != 0)
	+ where[i] += (Elf_Addr)obj->relocbase;
	+ where += CHAR_BIT * sizeof(Elf_Relr) - 1;
	+ }
	}
	}

	@@ -3279,10 +3331,9 @@
	* Returns 0 on success, or -1 on failure.
	*/
	static int
	-relocate_object(Obj_Entry obj, bool bind_now, Obj_Entry rtldobj,
	- int flags, RtldLockState *lockstate)
	+relocate_object(Obj_Entry obj, bool bind_now, Obj_Entry rtldobj, int flags,
	+ RtldLockState *lockstate)
	{
	-
	if (obj->relocated)
	return (0);
	obj->relocated = true;
	@@ -3313,8 +3364,8 @@
	if (reloc_plt(obj, flags, lockstate) == -1)
	return (-1);
	/* Relocate the jump slots if we are doing immediate binding. */
	- if ((obj->bind_now \|\| bind_now) && reloc_jmpslots(obj, flags,
	- lockstate) == -1)
	+ if ((obj->bind_now \|\| bind_now) &&
	+ reloc_jmpslots(obj, flags, lockstate) == -1)
	return (-1);

	if (obj != rtldobj && !obj->mainprog && obj_enforce_relro(obj) == -1)
	@@ -3338,14 +3389,13 @@
	* or -1 on failure.
	*/
	static int
	-relocate_objects(Obj_Entry first, bool bind_now, Obj_Entry rtldobj,
	- int flags, RtldLockState *lockstate)
	+relocate_objects(Obj_Entry first, bool bind_now, Obj_Entry rtldobj, int flags,
	+ RtldLockState *lockstate)
	{
	Obj_Entry *obj;
	int error;

	- for (error = 0, obj = first; obj != NULL;
	- obj = TAILQ_NEXT(obj, next)) {
	+ for (error = 0, obj = first; obj != NULL; obj = TAILQ_NEXT(obj, next)) {
	if (obj->marker)
	continue;
	error = relocate_object(obj, bind_now, rtldobj, flags,
	@@ -3371,7 +3421,6 @@
	resolve_object_ifunc(Obj_Entry *obj, bool bind_now, int flags,
	RtldLockState *lockstate)
	{
	-
	if (obj->ifuncs_resolved)
	return (0);
	obj->ifuncs_resolved = true;
	@@ -3381,12 +3430,13 @@
	return (0);
	if (obj_disable_relro(obj) == -1 \|\|
	(obj->irelative && reloc_iresolve(obj, lockstate) == -1) \|\|
	- (obj->irelative_nonplt && reloc_iresolve_nonplt(obj,
	- lockstate) == -1) \|\|
	+ (obj->irelative_nonplt &&
	+ reloc_iresolve_nonplt(obj, lockstate) == -1) \|\|
	((obj->bind_now \|\| bind_now) && obj->gnu_ifunc &&
	- reloc_gnu_ifunc(obj, flags, lockstate) == -1) \|\|
	- (obj->non_plt_gnu_ifunc && reloc_non_plt(obj, &obj_rtld,
	- flags \| SYMLOOK_IFUNC, lockstate) == -1) \|\|
	+ reloc_gnu_ifunc(obj, flags, lockstate) == -1) \|\|
	+ (obj->non_plt_gnu_ifunc &&
	+ reloc_non_plt(obj, &obj_rtld, flags \| SYMLOOK_IFUNC,
	+ lockstate) == -1) \|\|
	obj_enforce_relro(obj) == -1)
	return (-1);
	return (0);
	@@ -3403,8 +3453,7 @@
	obj = elm->obj;
	if (obj->marker)
	continue;
	- if (resolve_object_ifunc(obj, bind_now, flags,
	- lockstate) == -1)
	+ if (resolve_object_ifunc(obj, bind_now, flags, lockstate) == -1)
	return (-1);
	}
	return (0);
	@@ -3417,15 +3466,15 @@
	static void
	rtld_exit(void)
	{
	- RtldLockState lockstate;
	+ RtldLockState lockstate;

	- wlock_acquire(rtld_bind_lock, &lockstate);
	- dbg("rtld_exit()");
	- objlist_call_fini(&list_fini, NULL, &lockstate);
	- /* No need to remove the items from the list, since we are exiting. */
	- if (!libmap_disable)
	- lm_fini();
	- lock_release(rtld_bind_lock, &lockstate);
	+ wlock_acquire(rtld_bind_lock, &lockstate);
	+ dbg("rtld_exit()");
	+ objlist_call_fini(&list_fini, NULL, &lockstate);
	+ /* No need to remove the items from the list, since we are exiting. */
	+ if (!libmap_disable)
	+ lm_fini();
	+ lock_release(rtld_bind_lock, &lockstate);
	}

	static void
	@@ -3441,99 +3490,98 @@
	path_enumerate(const char *path, path_enum_proc callback,
	const char refobj_path, void arg)
	{
	- const char *trans;
	- if (path == NULL)
	- return (NULL);
	-
	- path += strspn(path, ":;");
	- while (*path != '\0') {
	- size_t len;
	- char *res;
	+ const char *trans;
	+ if (path == NULL)
	+ return (NULL);

	- len = strcspn(path, ":;");
	- trans = lm_findn(refobj_path, path, len);
	- if (trans)
	- res = callback(trans, strlen(trans), arg);
	- else
	- res = callback(path, len, arg);
	+ path += strspn(path, ":;");
	+ while (*path != '\0') {
	+ size_t len;
	+ char *res;
	+
	+ len = strcspn(path, ":;");
	+ trans = lm_findn(refobj_path, path, len);
	+ if (trans)
	+ res = callback(trans, strlen(trans), arg);
	+ else
	+ res = callback(path, len, arg);

	- if (res != NULL)
	- return (res);
	+ if (res != NULL)
	+ return (res);

	- path += len;
	- path += strspn(path, ":;");
	- }
	+ path += len;
	+ path += strspn(path, ":;");
	+ }

	- return (NULL);
	+ return (NULL);
	}

	struct try_library_args {
	- const char *name;
	- size_t namelen;
	- char *buffer;
	- size_t buflen;
	- int fd;
	+ const char *name;
	+ size_t namelen;
	+ char *buffer;
	+ size_t buflen;
	+ int fd;
	};

	static void *
	try_library_path(const char dir, size_t dirlen, void param)
	{
	- struct try_library_args *arg;
	- int fd;
	+ struct try_library_args *arg;
	+ int fd;

	- arg = param;
	- if (*dir == '/' \|\| trust) {
	- char *pathname;
	+ arg = param;
	+ if (*dir == '/' \|\| trust) {
	+ char *pathname;

	- if (dirlen + 1 + arg->namelen + 1 > arg->buflen)
	- return (NULL);
	+ if (dirlen + 1 + arg->namelen + 1 > arg->buflen)
	+ return (NULL);

	- pathname = arg->buffer;
	- strncpy(pathname, dir, dirlen);
	- pathname[dirlen] = '/';
	- strcpy(pathname + dirlen + 1, arg->name);
	+ pathname = arg->buffer;
	+ strncpy(pathname, dir, dirlen);
	+ pathname[dirlen] = '/';
	+ strcpy(pathname + dirlen + 1, arg->name);

	- dbg(" Trying \"%s\"", pathname);
	- fd = open(pathname, O_RDONLY \| O_CLOEXEC \| O_VERIFY);
	- if (fd >= 0) {
	- dbg(" Opened \"%s\", fd %d", pathname, fd);
	- pathname = xmalloc(dirlen + 1 + arg->namelen + 1);
	- strcpy(pathname, arg->buffer);
	- arg->fd = fd;
	- return (pathname);
	- } else {
	- dbg(" Failed to open \"%s\": %s",
	- pathname, rtld_strerror(errno));
	+ dbg(" Trying \"%s\"", pathname);
	+ fd = open(pathname, O_RDONLY \| O_CLOEXEC \| O_VERIFY);
	+ if (fd >= 0) {
	+ dbg(" Opened \"%s\", fd %d", pathname, fd);
	+ pathname = xmalloc(dirlen + 1 + arg->namelen + 1);
	+ strcpy(pathname, arg->buffer);
	+ arg->fd = fd;
	+ return (pathname);
	+ } else {
	+ dbg(" Failed to open \"%s\": %s", pathname,
	+ rtld_strerror(errno));
	+ }
	}
	- }
	- return (NULL);
	+ return (NULL);
	}

	static char *
	-search_library_path(const char name, const char path,
	- const char refobj_path, int fdp)
	+search_library_path(const char name, const char path, const char *refobj_path,
	+ int *fdp)
	{
	- char *p;
	- struct try_library_args arg;
	+ char *p;
	+ struct try_library_args arg;

	- if (path == NULL)
	- return (NULL);
	+ if (path == NULL)
	+ return (NULL);

	- arg.name = name;
	- arg.namelen = strlen(name);
	- arg.buffer = xmalloc(PATH_MAX);
	- arg.buflen = PATH_MAX;
	- arg.fd = -1;
	+ arg.name = name;
	+ arg.namelen = strlen(name);
	+ arg.buffer = xmalloc(PATH_MAX);
	+ arg.buflen = PATH_MAX;
	+ arg.fd = -1;

	- p = path_enumerate(path, try_library_path, refobj_path, &arg);
	- *fdp = arg.fd;
	+ p = path_enumerate(path, try_library_path, refobj_path, &arg);
	+ *fdp = arg.fd;

	- free(arg.buffer);
	+ free(arg.buffer);

	- return (p);
	+ return (p);
	}

	-
	/*
	* Finds the library with the given name using the directory descriptors
	* listed in the LD_LIBRARY_PATH_FDS environment variable.
	@@ -3576,7 +3624,7 @@
	dirfd = parse_integer(fdstr);
	if (dirfd < 0) {
	_rtld_error("failed to parse directory FD: '%s'",
	- fdstr);
	+ fdstr);
	break;
	}
	fd = __sys_openat(dirfd, name, O_RDONLY \| O_CLOEXEC \| O_VERIFY);
	@@ -3584,9 +3632,10 @@
	*fdp = fd;
	len = strlen(fdstr) + strlen(name) + 3;
	found = xmalloc(len);
	- if (rtld_snprintf(found, len, "#%d/%s", dirfd, name) < 0) {
	- _rtld_error("error generating '%d/%s'",
	- dirfd, name);
	+ if (rtld_snprintf(found, len, "#%d/%s", dirfd, name) <
	+ 0) {
	+ _rtld_error("error generating '%d/%s'", dirfd,
	+ name);
	rtld_die();
	}
	dbg("open('%s') => %d", found, fd);
	@@ -3598,7 +3647,6 @@
	return (found);
	}

	-
	int
	dlclose(void *handle)
	{
	@@ -3614,35 +3662,35 @@
	static int
	dlclose_locked(void handle, RtldLockState lockstate)
	{
	- Obj_Entry *root;
	+ Obj_Entry *root;

	- root = dlcheck(handle);
	- if (root == NULL)
	- return (-1);
	- LD_UTRACE(UTRACE_DLCLOSE_START, handle, NULL, 0, root->dl_refcount,
	- root->path);
	+ root = dlcheck(handle);
	+ if (root == NULL)
	+ return (-1);
	+ LD_UTRACE(UTRACE_DLCLOSE_START, handle, NULL, 0, root->dl_refcount,
	+ root->path);

	- /* Unreference the object and its dependencies. */
	- root->dl_refcount--;
	+ /* Unreference the object and its dependencies. */
	+ root->dl_refcount--;

	- if (root->refcount == 1) {
	- /*
	- * The object will be no longer referenced, so we must unload it.
	- * First, call the fini functions.
	- */
	- objlist_call_fini(&list_fini, root, lockstate);
	+ if (root->refcount == 1) {
	+ /*
	+ * The object will be no longer referenced, so we must unload
	+ * it. First, call the fini functions.
	+ */
	+ objlist_call_fini(&list_fini, root, lockstate);

	- unref_dag(root);
	+ unref_dag(root);

	- /* Finish cleaning up the newly-unreferenced objects. */
	- GDB_STATE(RT_DELETE,&root->linkmap);
	- unload_object(root, lockstate);
	- GDB_STATE(RT_CONSISTENT,NULL);
	- } else
	- unref_dag(root);
	+ /* Finish cleaning up the newly-unreferenced objects. */
	+ GDB_STATE(RT_DELETE, &root->linkmap);
	+ unload_object(root, lockstate);
	+ GDB_STATE(RT_CONSISTENT, NULL);
	+ } else
	+ unref_dag(root);

	- LD_UTRACE(UTRACE_DLCLOSE_STOP, handle, NULL, 0, 0, NULL);
	- return (0);
	+ LD_UTRACE(UTRACE_DLCLOSE_STOP, handle, NULL, 0, 0, NULL);
	+ return (0);
	}

	char *
	@@ -3658,71 +3706,68 @@
	* This function is deprecated and has no effect.
	*/
	void
	-dllockinit(void *context,
	- void (_lock_create)(void *context) __unused,
	+dllockinit(void context, void (_lock_create)(void context)__unused,
	void (_rlock_acquire)(void lock) __unused,
	- void (_wlock_acquire)(void lock) __unused,
	+ void (_wlock_acquire)(void lock) __unused,
	void (_lock_release)(void lock) __unused,
	void (_lock_destroy)(void lock) __unused,
	void (context_destroy)(void context))
	{
	- static void *cur_context;
	- static void (cur_context_destroy)(void );
	+ static void *cur_context;
	+ static void (cur_context_destroy)(void );

	- /* Just destroy the context from the previous call, if necessary. */
	- if (cur_context_destroy != NULL)
	- cur_context_destroy(cur_context);
	- cur_context = context;
	- cur_context_destroy = context_destroy;
	+ /* Just destroy the context from the previous call, if necessary. */
	+ if (cur_context_destroy != NULL)
	+ cur_context_destroy(cur_context);
	+ cur_context = context;
	+ cur_context_destroy = context_destroy;
	}

	void *
	dlopen(const char *name, int mode)
	{
	-
	return (rtld_dlopen(name, -1, mode));
	}

	void *
	fdlopen(int fd, int mode)
	{
	-
	return (rtld_dlopen(NULL, fd, mode));
	}

	static void *
	rtld_dlopen(const char *name, int fd, int mode)
	{
	- RtldLockState lockstate;
	- int lo_flags;
	-
	- LD_UTRACE(UTRACE_DLOPEN_START, NULL, NULL, 0, mode, name);
	- ld_tracing = (mode & RTLD_TRACE) == 0 ? NULL : "1";
	- if (ld_tracing != NULL) {
	- rlock_acquire(rtld_bind_lock, &lockstate);
	- if (sigsetjmp(lockstate.env, 0) != 0)
	- lock_upgrade(rtld_bind_lock, &lockstate);
	- environ = __DECONST(char *, get_program_var_addr("environ", &lockstate));
	- lock_release(rtld_bind_lock, &lockstate);
	- }
	- lo_flags = RTLD_LO_DLOPEN;
	- if (mode & RTLD_NODELETE)
	- lo_flags \|= RTLD_LO_NODELETE;
	- if (mode & RTLD_NOLOAD)
	- lo_flags \|= RTLD_LO_NOLOAD;
	- if (mode & RTLD_DEEPBIND)
	- lo_flags \|= RTLD_LO_DEEPBIND;
	- if (ld_tracing != NULL)
	- lo_flags \|= RTLD_LO_TRACE \| RTLD_LO_IGNSTLS;
	+ RtldLockState lockstate;
	+ int lo_flags;
	+
	+ LD_UTRACE(UTRACE_DLOPEN_START, NULL, NULL, 0, mode, name);
	+ ld_tracing = (mode & RTLD_TRACE) == 0 ? NULL : "1";
	+ if (ld_tracing != NULL) {
	+ rlock_acquire(rtld_bind_lock, &lockstate);
	+ if (sigsetjmp(lockstate.env, 0) != 0)
	+ lock_upgrade(rtld_bind_lock, &lockstate);
	+ environ = __DECONST(char **,
	+ *get_program_var_addr("environ", &lockstate));
	+ lock_release(rtld_bind_lock, &lockstate);
	+ }
	+ lo_flags = RTLD_LO_DLOPEN;
	+ if (mode & RTLD_NODELETE)
	+ lo_flags \|= RTLD_LO_NODELETE;
	+ if (mode & RTLD_NOLOAD)
	+ lo_flags \|= RTLD_LO_NOLOAD;
	+ if (mode & RTLD_DEEPBIND)
	+ lo_flags \|= RTLD_LO_DEEPBIND;
	+ if (ld_tracing != NULL)
	+ lo_flags \|= RTLD_LO_TRACE \| RTLD_LO_IGNSTLS;

	- return (dlopen_object(name, fd, obj_main, lo_flags,
	- mode & (RTLD_MODEMASK \| RTLD_GLOBAL), NULL));
	+ return (dlopen_object(name, fd, obj_main, lo_flags,
	+ mode & (RTLD_MODEMASK \| RTLD_GLOBAL), NULL));
	}

	static void
	dlopen_cleanup(Obj_Entry obj, RtldLockState lockstate)
	{
	-
	obj->dl_refcount--;
	unref_dag(obj);
	if (obj->refcount == 0)
	@@ -3733,284 +3778,302 @@
	dlopen_object(const char name, int fd, Obj_Entry refobj, int lo_flags,
	int mode, RtldLockState *lockstate)
	{
	- Obj_Entry *obj;
	- Objlist initlist;
	- RtldLockState mlockstate;
	- int result;
	-
	- dbg("dlopen_object name \"%s\" fd %d refobj \"%s\" lo_flags %#x mode %#x",
	- name != NULL ? name : "<null>", fd, refobj == NULL ? "<null>" :
	- refobj->path, lo_flags, mode);
	- objlist_init(&initlist);
	-
	- if (lockstate == NULL && !(lo_flags & RTLD_LO_EARLY)) {
	- wlock_acquire(rtld_bind_lock, &mlockstate);
	- lockstate = &mlockstate;
	- }
	- GDB_STATE(RT_ADD,NULL);
	-
	- obj = NULL;
	- if (name == NULL && fd == -1) {
	- obj = obj_main;
	- obj->refcount++;
	- } else {
	- obj = load_object(name, fd, refobj, lo_flags);
	- }
	-
	- if (obj) {
	- obj->dl_refcount++;
	- if (mode & RTLD_GLOBAL && objlist_find(&list_global, obj) == NULL)
	- objlist_push_tail(&list_global, obj);
	-
	- if (!obj->init_done) {
	- /* We loaded something new and have to init something. */
	- if ((lo_flags & RTLD_LO_DEEPBIND) != 0)
	- obj->deepbind = true;
	- result = 0;
	- if ((lo_flags & (RTLD_LO_EARLY \| RTLD_LO_IGNSTLS)) == 0 &&
	- obj->static_tls && !allocate_tls_offset(obj)) {
	- _rtld_error("%s: No space available "
	- "for static Thread Local Storage", obj->path);
	- result = -1;
	- }
	- if (result != -1)
	- result = load_needed_objects(obj, lo_flags & (RTLD_LO_DLOPEN \|
	- RTLD_LO_EARLY \| RTLD_LO_IGNSTLS \| RTLD_LO_TRACE));
	- init_dag(obj);
	- ref_dag(obj);
	- if (result != -1)
	- result = rtld_verify_versions(&obj->dagmembers);
	- if (result != -1 && ld_tracing)
	- goto trace;
	- if (result == -1 \|\| relocate_object_dag(obj,
	- (mode & RTLD_MODEMASK) == RTLD_NOW, &obj_rtld,
	- (lo_flags & RTLD_LO_EARLY) ? SYMLOOK_EARLY : 0,
	- lockstate) == -1) {
	- dlopen_cleanup(obj, lockstate);
	- obj = NULL;
	- } else if (lo_flags & RTLD_LO_EARLY) {
	- /*
	- * Do not call the init functions for early loaded
	- * filtees. The image is still not initialized enough
	- * for them to work.
	- *
	- * Our object is found by the global object list and
	- * will be ordered among all init calls done right
	- * before transferring control to main.
	- */
	- } else {
	- /* Make list of init functions to call. */
	- initlist_add_objects(obj, obj, &initlist);
	- }
	- /*
	- * Process all no_delete or global objects here, given
	- * them own DAGs to prevent their dependencies from being
	- * unloaded. This has to be done after we have loaded all
	- * of the dependencies, so that we do not miss any.
	- */
	- if (obj != NULL)
	- process_z(obj);
	+ Obj_Entry *obj;
	+ Objlist initlist;
	+ RtldLockState mlockstate;
	+ int result;
	+
	+ dbg(
	+ "dlopen_object name \"%s\" fd %d refobj \"%s\" lo_flags %#x mode %#x",
	+ name != NULL ? name : "<null>", fd,
	+ refobj == NULL ? "<null>" : refobj->path, lo_flags, mode);
	+ objlist_init(&initlist);
	+
	+ if (lockstate == NULL && !(lo_flags & RTLD_LO_EARLY)) {
	+ wlock_acquire(rtld_bind_lock, &mlockstate);
	+ lockstate = &mlockstate;
	+ }
	+ GDB_STATE(RT_ADD, NULL);
	+
	+ obj = NULL;
	+ if (name == NULL && fd == -1) {
	+ obj = obj_main;
	+ obj->refcount++;
	} else {
	- /*
	- * Bump the reference counts for objects on this DAG. If
	- * this is the first dlopen() call for the object that was
	- * already loaded as a dependency, initialize the dag
	- * starting at it.
	- */
	- init_dag(obj);
	- ref_dag(obj);
	-
	- if ((lo_flags & RTLD_LO_TRACE) != 0)
	- goto trace;
	- }
	- if (obj != NULL && ((lo_flags & RTLD_LO_NODELETE) != 0 \|\|
	- obj->z_nodelete) && !obj->ref_nodel) {
	- dbg("obj %s nodelete", obj->path);
	- ref_dag(obj);
	- obj->z_nodelete = obj->ref_nodel = true;
	- }
	- }
	-
	- LD_UTRACE(UTRACE_DLOPEN_STOP, obj, NULL, 0, obj ? obj->dl_refcount : 0,
	- name);
	- GDB_STATE(RT_CONSISTENT,obj ? &obj->linkmap : NULL);
	-
	- if ((lo_flags & RTLD_LO_EARLY) == 0) {
	- map_stacks_exec(lockstate);
	- if (obj != NULL)
	- distribute_static_tls(&initlist, lockstate);
	- }
	+ obj = load_object(name, fd, refobj, lo_flags);
	+ }
	+
	+ if (obj) {
	+ obj->dl_refcount++;
	+ if (mode & RTLD_GLOBAL &&
	+ objlist_find(&list_global, obj) == NULL)
	+ objlist_push_tail(&list_global, obj);
	+
	+ if (!obj->init_done) {
	+ /* We loaded something new and have to init something.
	+ */
	+ if ((lo_flags & RTLD_LO_DEEPBIND) != 0)
	+ obj->deepbind = true;
	+ result = 0;
	+ if ((lo_flags & (RTLD_LO_EARLY \| RTLD_LO_IGNSTLS)) ==
	+ 0 &&
	+ obj->static_tls && !allocate_tls_offset(obj)) {
	+ _rtld_error("%s: No space available "
	+ "for static Thread Local Storage",
	+ obj->path);
	+ result = -1;
	+ }
	+ if (result != -1)
	+ result = load_needed_objects(obj,
	+ lo_flags &
	+ (RTLD_LO_DLOPEN \| RTLD_LO_EARLY \|
	+ RTLD_LO_IGNSTLS \| RTLD_LO_TRACE));
	+ init_dag(obj);
	+ ref_dag(obj);
	+ if (result != -1)
	+ result = rtld_verify_versions(&obj->dagmembers);
	+ if (result != -1 && ld_tracing)
	+ goto trace;
	+ if (result == -1 \|\|
	+ relocate_object_dag(obj,
	+ (mode & RTLD_MODEMASK) == RTLD_NOW, &obj_rtld,
	+ (lo_flags & RTLD_LO_EARLY) ? SYMLOOK_EARLY : 0,
	+ lockstate) == -1) {
	+ dlopen_cleanup(obj, lockstate);
	+ obj = NULL;
	+ } else if (lo_flags & RTLD_LO_EARLY) {
	+ /*
	+ * Do not call the init functions for early
	+ * loaded filtees. The image is still not
	+ * initialized enough for them to work.
	+ *
	+ * Our object is found by the global object list
	+ * and will be ordered among all init calls done
	+ * right before transferring control to main.
	+ */
	+ } else {
	+ /* Make list of init functions to call. */
	+ initlist_add_objects(obj, obj, &initlist);
	+ }
	+ /*
	+ * Process all no_delete or global objects here, given
	+ * them own DAGs to prevent their dependencies from
	+ * being unloaded. This has to be done after we have
	+ * loaded all of the dependencies, so that we do not
	+ * miss any.
	+ */
	+ if (obj != NULL)
	+ process_z(obj);
	+ } else {
	+ /*
	+ * Bump the reference counts for objects on this DAG. If
	+ * this is the first dlopen() call for the object that
	+ * was already loaded as a dependency, initialize the
	+ * dag starting at it.
	+ */
	+ init_dag(obj);
	+ ref_dag(obj);

	- if (initlist_objects_ifunc(&initlist, (mode & RTLD_MODEMASK) == RTLD_NOW,
	- (lo_flags & RTLD_LO_EARLY) ? SYMLOOK_EARLY : 0,
	- lockstate) == -1) {
	+ if ((lo_flags & RTLD_LO_TRACE) != 0)
	+ goto trace;
	+ }
	+ if (obj != NULL &&
	+ ((lo_flags & RTLD_LO_NODELETE) != 0 \|\| obj->z_nodelete) &&
	+ !obj->ref_nodel) {
	+ dbg("obj %s nodelete", obj->path);
	+ ref_dag(obj);
	+ obj->z_nodelete = obj->ref_nodel = true;
	+ }
	+ }
	+
	+ LD_UTRACE(UTRACE_DLOPEN_STOP, obj, NULL, 0, obj ? obj->dl_refcount : 0,
	+ name);
	+ GDB_STATE(RT_CONSISTENT, obj ? &obj->linkmap : NULL);
	+
	+ if ((lo_flags & RTLD_LO_EARLY) == 0) {
	+ map_stacks_exec(lockstate);
	+ if (obj != NULL)
	+ distribute_static_tls(&initlist, lockstate);
	+ }
	+
	+ if (initlist_objects_ifunc(&initlist,
	+ (mode & RTLD_MODEMASK) == RTLD_NOW,
	+ (lo_flags & RTLD_LO_EARLY) ? SYMLOOK_EARLY : 0,
	+ lockstate) == -1) {
	+ objlist_clear(&initlist);
	+ dlopen_cleanup(obj, lockstate);
	+ if (lockstate == &mlockstate)
	+ lock_release(rtld_bind_lock, lockstate);
	+ return (NULL);
	+ }
	+
	+ if (!(lo_flags & RTLD_LO_EARLY)) {
	+ /* Call the init functions. */
	+ objlist_call_init(&initlist, lockstate);
	+ }
	objlist_clear(&initlist);
	- dlopen_cleanup(obj, lockstate);
	if (lockstate == &mlockstate)
	- lock_release(rtld_bind_lock, lockstate);
	- return (NULL);
	- }
	-
	- if (!(lo_flags & RTLD_LO_EARLY)) {
	- /* Call the init functions. */
	- objlist_call_init(&initlist, lockstate);
	- }
	- objlist_clear(&initlist);
	- if (lockstate == &mlockstate)
	- lock_release(rtld_bind_lock, lockstate);
	- return (obj);
	+ lock_release(rtld_bind_lock, lockstate);
	+ return (obj);
	trace:
	- trace_loaded_objects(obj, false);
	- if (lockstate == &mlockstate)
	- lock_release(rtld_bind_lock, lockstate);
	- exit(0);
	+ trace_loaded_objects(obj, false);
	+ if (lockstate == &mlockstate)
	+ lock_release(rtld_bind_lock, lockstate);
	+ exit(0);
	}

	static void *
	do_dlsym(void handle, const char name, void retaddr, const Ver_Entry ve,
	int flags)
	{
	- DoneList donelist;
	- const Obj_Entry obj, defobj;
	- const Elf_Sym *def;
	- SymLook req;
	- RtldLockState lockstate;
	- tls_index ti;
	- void *sym;
	- int res;
	-
	- def = NULL;
	- defobj = NULL;
	- symlook_init(&req, name);
	- req.ventry = ve;
	- req.flags = flags \| SYMLOOK_IN_PLT;
	- req.lockstate = &lockstate;
	-
	- LD_UTRACE(UTRACE_DLSYM_START, handle, NULL, 0, 0, name);
	- rlock_acquire(rtld_bind_lock, &lockstate);
	- if (sigsetjmp(lockstate.env, 0) != 0)
	- lock_upgrade(rtld_bind_lock, &lockstate);
	- if (handle == NULL \|\| handle == RTLD_NEXT \|\|
	- handle == RTLD_DEFAULT \|\| handle == RTLD_SELF) {
	-
	- if ((obj = obj_from_addr(retaddr)) == NULL) {
	- _rtld_error("Cannot determine caller's shared object");
	- lock_release(rtld_bind_lock, &lockstate);
	- LD_UTRACE(UTRACE_DLSYM_STOP, handle, NULL, 0, 0, name);
	- return (NULL);
	- }
	- if (handle == NULL) { /* Just the caller's shared object. */
	- res = symlook_obj(&req, obj);
	- if (res == 0) {
	- def = req.sym_out;
	- defobj = req.defobj_out;
	- }
	- } else if (handle == RTLD_NEXT \|\| /* Objects after caller's */
	- handle == RTLD_SELF) { /* ... caller included */
	- if (handle == RTLD_NEXT)
	- obj = globallist_next(obj);
	- for (; obj != NULL; obj = TAILQ_NEXT(obj, next)) {
	- if (obj->marker)
	- continue;
	- res = symlook_obj(&req, obj);
	- if (res == 0) {
	- if (def == NULL \|\| (ld_dynamic_weak &&
	- ELF_ST_BIND(req.sym_out->st_info) != STB_WEAK)) {
	- def = req.sym_out;
	- defobj = req.defobj_out;
	- if (!ld_dynamic_weak \|\|
	- ELF_ST_BIND(def->st_info) != STB_WEAK)
	- break;
	- }
	+ DoneList donelist;
	+ const Obj_Entry obj, defobj;
	+ const Elf_Sym *def;
	+ SymLook req;
	+ RtldLockState lockstate;
	+ tls_index ti;
	+ void *sym;
	+ int res;
	+
	+ def = NULL;
	+ defobj = NULL;
	+ symlook_init(&req, name);
	+ req.ventry = ve;
	+ req.flags = flags \| SYMLOOK_IN_PLT;
	+ req.lockstate = &lockstate;
	+
	+ LD_UTRACE(UTRACE_DLSYM_START, handle, NULL, 0, 0, name);
	+ rlock_acquire(rtld_bind_lock, &lockstate);
	+ if (sigsetjmp(lockstate.env, 0) != 0)
	+ lock_upgrade(rtld_bind_lock, &lockstate);
	+ if (handle == NULL \|\| handle == RTLD_NEXT \|\| handle == RTLD_DEFAULT \|\|
	+ handle == RTLD_SELF) {
	+ if ((obj = obj_from_addr(retaddr)) == NULL) {
	+ _rtld_error("Cannot determine caller's shared object");
	+ lock_release(rtld_bind_lock, &lockstate);
	+ LD_UTRACE(UTRACE_DLSYM_STOP, handle, NULL, 0, 0, name);
	+ return (NULL);
	}
	- }
	- /*
	- * Search the dynamic linker itself, and possibly resolve the
	- * symbol from there. This is how the application links to
	- * dynamic linker services such as dlopen.
	- * Note that we ignore ld_dynamic_weak == false case,
	- * always overriding weak symbols by rtld definitions.
	- */
	- if (def == NULL \|\| ELF_ST_BIND(def->st_info) == STB_WEAK) {
	- res = symlook_obj(&req, &obj_rtld);
	- if (res == 0) {
	- def = req.sym_out;
	- defobj = req.defobj_out;
	+ if (handle == NULL) { /* Just the caller's shared object. */
	+ res = symlook_obj(&req, obj);
	+ if (res == 0) {
	+ def = req.sym_out;
	+ defobj = req.defobj_out;
	+ }
	+ } else if (handle == RTLD_NEXT \|\| /* Objects after caller's */
	+ handle == RTLD_SELF) { /* ... caller included */
	+ if (handle == RTLD_NEXT)
	+ obj = globallist_next(obj);
	+ for (; obj != NULL; obj = TAILQ_NEXT(obj, next)) {
	+ if (obj->marker)
	+ continue;
	+ res = symlook_obj(&req, obj);
	+ if (res == 0) {
	+ if (def == NULL \|\|
	+ (ld_dynamic_weak &&
	+ ELF_ST_BIND(
	+ req.sym_out->st_info) !=
	+ STB_WEAK)) {
	+ def = req.sym_out;
	+ defobj = req.defobj_out;
	+ if (!ld_dynamic_weak \|\|
	+ ELF_ST_BIND(def->st_info) !=
	+ STB_WEAK)
	+ break;
	+ }
	+ }
	+ }
	+ /*
	+ * Search the dynamic linker itself, and possibly
	+ * resolve the symbol from there. This is how the
	+ * application links to dynamic linker services such as
	+ * dlopen. Note that we ignore ld_dynamic_weak == false
	+ * case, always overriding weak symbols by rtld
	+ * definitions.
	+ */
	+ if (def == NULL \|\|
	+ ELF_ST_BIND(def->st_info) == STB_WEAK) {
	+ res = symlook_obj(&req, &obj_rtld);
	+ if (res == 0) {
	+ def = req.sym_out;
	+ defobj = req.defobj_out;
	+ }
	+ }
	+ } else {
	+ assert(handle == RTLD_DEFAULT);
	+ res = symlook_default(&req, obj);
	+ if (res == 0) {
	+ defobj = req.defobj_out;
	+ def = req.sym_out;
	+ }
	}
	- }
	} else {
	- assert(handle == RTLD_DEFAULT);
	- res = symlook_default(&req, obj);
	- if (res == 0) {
	- defobj = req.defobj_out;
	- def = req.sym_out;
	- }
	- }
	- } else {
	- if ((obj = dlcheck(handle)) == NULL) {
	- lock_release(rtld_bind_lock, &lockstate);
	- LD_UTRACE(UTRACE_DLSYM_STOP, handle, NULL, 0, 0, name);
	- return (NULL);
	- }
	+ if ((obj = dlcheck(handle)) == NULL) {
	+ lock_release(rtld_bind_lock, &lockstate);
	+ LD_UTRACE(UTRACE_DLSYM_STOP, handle, NULL, 0, 0, name);
	+ return (NULL);
	+ }

	- donelist_init(&donelist);
	- if (obj->mainprog) {
	- /* Handle obtained by dlopen(NULL, ...) implies global scope. */
	- res = symlook_global(&req, &donelist);
	- if (res == 0) {
	- def = req.sym_out;
	- defobj = req.defobj_out;
	- }
	- /*
	- * Search the dynamic linker itself, and possibly resolve the
	- * symbol from there. This is how the application links to
	- * dynamic linker services such as dlopen.
	- */
	- if (def == NULL \|\| ELF_ST_BIND(def->st_info) == STB_WEAK) {
	- res = symlook_obj(&req, &obj_rtld);
	- if (res == 0) {
	- def = req.sym_out;
	- defobj = req.defobj_out;
	+ donelist_init(&donelist);
	+ if (obj->mainprog) {
	+ /* Handle obtained by dlopen(NULL, ...) implies global
	+ * scope. */
	+ res = symlook_global(&req, &donelist);
	+ if (res == 0) {
	+ def = req.sym_out;
	+ defobj = req.defobj_out;
	+ }
	+ /*
	+ * Search the dynamic linker itself, and possibly
	+ * resolve the symbol from there. This is how the
	+ * application links to dynamic linker services such as
	+ * dlopen.
	+ */
	+ if (def == NULL \|\|
	+ ELF_ST_BIND(def->st_info) == STB_WEAK) {
	+ res = symlook_obj(&req, &obj_rtld);
	+ if (res == 0) {
	+ def = req.sym_out;
	+ defobj = req.defobj_out;
	+ }
	+ }
	+ } else {
	+ /* Search the whole DAG rooted at the given object. */
	+ res = symlook_list(&req, &obj->dagmembers, &donelist);
	+ if (res == 0) {
	+ def = req.sym_out;
	+ defobj = req.defobj_out;
	+ }
	}
	- }
	}
	- else {
	- /* Search the whole DAG rooted at the given object. */
	- res = symlook_list(&req, &obj->dagmembers, &donelist);
	- if (res == 0) {
	- def = req.sym_out;
	- defobj = req.defobj_out;
	- }
	- }
	- }

	- if (def != NULL) {
	- lock_release(rtld_bind_lock, &lockstate);
	+ if (def != NULL) {
	+ lock_release(rtld_bind_lock, &lockstate);

	- /*
	- * The value required by the caller is derived from the value
	- * of the symbol. this is simply the relocated value of the
	- * symbol.
	- */
	- if (ELF_ST_TYPE(def->st_info) == STT_FUNC)
	- sym = make_function_pointer(def, defobj);
	- else if (ELF_ST_TYPE(def->st_info) == STT_GNU_IFUNC)
	- sym = rtld_resolve_ifunc(defobj, def);
	- else if (ELF_ST_TYPE(def->st_info) == STT_TLS) {
	- ti.ti_module = defobj->tlsindex;
	- ti.ti_offset = def->st_value;
	- sym = __tls_get_addr(&ti);
	- } else
	- sym = defobj->relocbase + def->st_value;
	- LD_UTRACE(UTRACE_DLSYM_STOP, handle, sym, 0, 0, name);
	- return (sym);
	- }
	+ /*
	+ * The value required by the caller is derived from the value
	+ * of the symbol. this is simply the relocated value of the
	+ * symbol.
	+ */
	+ if (ELF_ST_TYPE(def->st_info) == STT_FUNC)
	+ sym = make_function_pointer(def, defobj);
	+ else if (ELF_ST_TYPE(def->st_info) == STT_GNU_IFUNC)
	+ sym = rtld_resolve_ifunc(defobj, def);
	+ else if (ELF_ST_TYPE(def->st_info) == STT_TLS) {
	+ ti.ti_module = defobj->tlsindex;
	+ ti.ti_offset = def->st_value;
	+ sym = __tls_get_addr(&ti);
	+ } else
	+ sym = defobj->relocbase + def->st_value;
	+ LD_UTRACE(UTRACE_DLSYM_STOP, handle, sym, 0, 0, name);
	+ return (sym);
	+ }

	- _rtld_error("Undefined symbol \"%s%s%s\"", name, ve != NULL ? "@" : "",
	- ve != NULL ? ve->name : "");
	- lock_release(rtld_bind_lock, &lockstate);
	- LD_UTRACE(UTRACE_DLSYM_STOP, handle, NULL, 0, 0, name);
	- return (NULL);
	+ _rtld_error("Undefined symbol \"%s%s%s\"", name, ve != NULL ? "@" : "",
	+ ve != NULL ? ve->name : "");
	+ lock_release(rtld_bind_lock, &lockstate);
	+ LD_UTRACE(UTRACE_DLSYM_STOP, handle, NULL, 0, 0, name);
	+ return (NULL);
	}

	void *
	@@ -4041,7 +4104,7 @@
	ventry.name = version;
	ventry.file = NULL;
	ventry.hash = elf_hash(version);
	- ventry.flags= 0;
	+ ventry.flags = 0;
	return (do_dlsym(handle, name, __builtin_return_address(0), &ventry,
	SYMLOOK_DLSYM));
	}
	@@ -4049,122 +4112,122 @@
	int
	_rtld_addr_phdr(const void addr, struct dl_phdr_info phdr_info)
	{
	- const Obj_Entry *obj;
	- RtldLockState lockstate;
	+ const Obj_Entry *obj;
	+ RtldLockState lockstate;

	- rlock_acquire(rtld_bind_lock, &lockstate);
	- obj = obj_from_addr(addr);
	- if (obj == NULL) {
	- _rtld_error("No shared object contains address");
	+ rlock_acquire(rtld_bind_lock, &lockstate);
	+ obj = obj_from_addr(addr);
	+ if (obj == NULL) {
	+ _rtld_error("No shared object contains address");
	+ lock_release(rtld_bind_lock, &lockstate);
	+ return (0);
	+ }
	+ rtld_fill_dl_phdr_info(obj, phdr_info);
	lock_release(rtld_bind_lock, &lockstate);
	- return (0);
	- }
	- rtld_fill_dl_phdr_info(obj, phdr_info);
	- lock_release(rtld_bind_lock, &lockstate);
	- return (1);
	+ return (1);
	}

	int
	dladdr(const void addr, Dl_info info)
	{
	- const Obj_Entry *obj;
	- const Elf_Sym *def;
	- void *symbol_addr;
	- unsigned long symoffset;
	- RtldLockState lockstate;
	+ const Obj_Entry *obj;
	+ const Elf_Sym *def;
	+ void *symbol_addr;
	+ unsigned long symoffset;
	+ RtldLockState lockstate;
	+
	+ rlock_acquire(rtld_bind_lock, &lockstate);
	+ obj = obj_from_addr(addr);
	+ if (obj == NULL) {
	+ _rtld_error("No shared object contains address");
	+ lock_release(rtld_bind_lock, &lockstate);
	+ return (0);
	+ }
	+ info->dli_fname = obj->path;
	+ info->dli_fbase = obj->mapbase;
	+ info->dli_saddr = (void *)0;
	+ info->dli_sname = NULL;
	+
	+ /*
	+ * Walk the symbol list looking for the symbol whose address is
	+ * closest to the address sent in.
	+ */
	+ for (symoffset = 0; symoffset < obj->dynsymcount; symoffset++) {
	+ def = obj->symtab + symoffset;

	- rlock_acquire(rtld_bind_lock, &lockstate);
	- obj = obj_from_addr(addr);
	- if (obj == NULL) {
	- _rtld_error("No shared object contains address");
	+ /*
	+ * For skip the symbol if st_shndx is either SHN_UNDEF or
	+ * SHN_COMMON.
	+ */
	+ if (def->st_shndx == SHN_UNDEF \|\| def->st_shndx == SHN_COMMON)
	+ continue;
	+
	+ /*
	+ * If the symbol is greater than the specified address, or if it
	+ * is further away from addr than the current nearest symbol,
	+ * then reject it.
	+ */
	+ symbol_addr = obj->relocbase + def->st_value;
	+ if (symbol_addr > addr \|\| symbol_addr < info->dli_saddr)
	+ continue;
	+
	+ /* Update our idea of the nearest symbol. */
	+ info->dli_sname = obj->strtab + def->st_name;
	+ info->dli_saddr = symbol_addr;
	+
	+ /* Exact match? */
	+ if (info->dli_saddr == addr)
	+ break;
	+ }
	lock_release(rtld_bind_lock, &lockstate);
	- return (0);
	- }
	- info->dli_fname = obj->path;
	- info->dli_fbase = obj->mapbase;
	- info->dli_saddr = (void *)0;
	- info->dli_sname = NULL;
	-
	- /*
	- * Walk the symbol list looking for the symbol whose address is
	- * closest to the address sent in.
	- */
	- for (symoffset = 0; symoffset < obj->dynsymcount; symoffset++) {
	- def = obj->symtab + symoffset;
	-
	- /*
	- * For skip the symbol if st_shndx is either SHN_UNDEF or
	- * SHN_COMMON.
	- */
	- if (def->st_shndx == SHN_UNDEF \|\| def->st_shndx == SHN_COMMON)
	- continue;
	-
	- /*
	- * If the symbol is greater than the specified address, or if it
	- * is further away from addr than the current nearest symbol,
	- * then reject it.
	- */
	- symbol_addr = obj->relocbase + def->st_value;
	- if (symbol_addr > addr \|\| symbol_addr < info->dli_saddr)
	- continue;
	-
	- /* Update our idea of the nearest symbol. */
	- info->dli_sname = obj->strtab + def->st_name;
	- info->dli_saddr = symbol_addr;
	-
	- /* Exact match? */
	- if (info->dli_saddr == addr)
	- break;
	- }
	- lock_release(rtld_bind_lock, &lockstate);
	- return (1);
	+ return (1);
	}

	int
	dlinfo(void handle, int request, void p)
	{
	- const Obj_Entry *obj;
	- RtldLockState lockstate;
	- int error;
	+ const Obj_Entry *obj;
	+ RtldLockState lockstate;
	+ int error;

	- rlock_acquire(rtld_bind_lock, &lockstate);
	+ rlock_acquire(rtld_bind_lock, &lockstate);

	- if (handle == NULL \|\| handle == RTLD_SELF) {
	- void *retaddr;
	+ if (handle == NULL \|\| handle == RTLD_SELF) {
	+ void *retaddr;

	- retaddr = __builtin_return_address(0); /* __GNUC__ only */
	- if ((obj = obj_from_addr(retaddr)) == NULL)
	- _rtld_error("Cannot determine caller's shared object");
	- } else
	- obj = dlcheck(handle);
	+ retaddr = __builtin_return_address(0); /* __GNUC__ only */
	+ if ((obj = obj_from_addr(retaddr)) == NULL)
	+ _rtld_error("Cannot determine caller's shared object");
	+ } else
	+ obj = dlcheck(handle);

	- if (obj == NULL) {
	- lock_release(rtld_bind_lock, &lockstate);
	- return (-1);
	- }
	+ if (obj == NULL) {
	+ lock_release(rtld_bind_lock, &lockstate);
	+ return (-1);
	+ }

	- error = 0;
	- switch (request) {
	- case RTLD_DI_LINKMAP:
	- ((struct link_map const *)p) = &obj->linkmap;
	- break;
	- case RTLD_DI_ORIGIN:
	- error = rtld_dirname(obj->path, p);
	- break;
	+ error = 0;
	+ switch (request) {
	+ case RTLD_DI_LINKMAP:
	+ ((struct link_map const *)p) = &obj->linkmap;
	+ break;
	+ case RTLD_DI_ORIGIN:
	+ error = rtld_dirname(obj->path, p);
	+ break;

	- case RTLD_DI_SERINFOSIZE:
	- case RTLD_DI_SERINFO:
	- error = do_search_info(obj, request, (struct dl_serinfo *)p);
	- break;
	+ case RTLD_DI_SERINFOSIZE:
	+ case RTLD_DI_SERINFO:
	+ error = do_search_info(obj, request, (struct dl_serinfo *)p);
	+ break;

	- default:
	- _rtld_error("Invalid request %d passed to dlinfo()", request);
	- error = -1;
	- }
	+ default:
	+ _rtld_error("Invalid request %d passed to dlinfo()", request);
	+ error = -1;
	+ }

	- lock_release(rtld_bind_lock, &lockstate);
	+ lock_release(rtld_bind_lock, &lockstate);

	- return (error);
	+ return (error);
	}

	static void
	@@ -4251,131 +4314,136 @@
	static void *
	fill_search_info(const char dir, size_t dirlen, void param)
	{
	- struct fill_search_info_args *arg;
	+ struct fill_search_info_args *arg;

	- arg = param;
	+ arg = param;

	- if (arg->request == RTLD_DI_SERINFOSIZE) {
	- arg->serinfo->dls_cnt ++;
	- arg->serinfo->dls_size += sizeof(struct dl_serpath) + dirlen + 1;
	- } else {
	- struct dl_serpath *s_entry;
	+ if (arg->request == RTLD_DI_SERINFOSIZE) {
	+ arg->serinfo->dls_cnt++;
	+ arg->serinfo->dls_size += sizeof(struct dl_serpath) + dirlen +
	+ 1;
	+ } else {
	+ struct dl_serpath *s_entry;

	- s_entry = arg->serpath;
	- s_entry->dls_name = arg->strspace;
	- s_entry->dls_flags = arg->flags;
	+ s_entry = arg->serpath;
	+ s_entry->dls_name = arg->strspace;
	+ s_entry->dls_flags = arg->flags;

	- strncpy(arg->strspace, dir, dirlen);
	- arg->strspace[dirlen] = '\0';
	+ strncpy(arg->strspace, dir, dirlen);
	+ arg->strspace[dirlen] = '\0';

	- arg->strspace += dirlen + 1;
	- arg->serpath++;
	- }
	+ arg->strspace += dirlen + 1;
	+ arg->serpath++;
	+ }

	- return (NULL);
	+ return (NULL);
	}

	static int
	do_search_info(const Obj_Entry obj, int request, struct dl_serinfo info)
	{
	- struct dl_serinfo _info;
	- struct fill_search_info_args args;
	-
	- args.request = RTLD_DI_SERINFOSIZE;
	- args.serinfo = &_info;
	+ struct dl_serinfo _info;
	+ struct fill_search_info_args args;

	- _info.dls_size = __offsetof(struct dl_serinfo, dls_serpath);
	- _info.dls_cnt = 0;
	+ args.request = RTLD_DI_SERINFOSIZE;
	+ args.serinfo = &_info;

	- path_enumerate(obj->rpath, fill_search_info, NULL, &args);
	- path_enumerate(ld_library_path, fill_search_info, NULL, &args);
	- path_enumerate(obj->runpath, fill_search_info, NULL, &args);
	- path_enumerate(gethints(obj->z_nodeflib), fill_search_info, NULL, &args);
	- if (!obj->z_nodeflib)
	- path_enumerate(ld_standard_library_path, fill_search_info, NULL, &args);
	+ _info.dls_size = __offsetof(struct dl_serinfo, dls_serpath);
	+ _info.dls_cnt = 0;

	+ path_enumerate(obj->rpath, fill_search_info, NULL, &args);
	+ path_enumerate(ld_library_path, fill_search_info, NULL, &args);
	+ path_enumerate(obj->runpath, fill_search_info, NULL, &args);
	+ path_enumerate(gethints(obj->z_nodeflib), fill_search_info, NULL,
	+ &args);
	+ if (!obj->z_nodeflib)
	+ path_enumerate(ld_standard_library_path, fill_search_info, NULL,
	+ &args);

	- if (request == RTLD_DI_SERINFOSIZE) {
	- info->dls_size = _info.dls_size;
	- info->dls_cnt = _info.dls_cnt;
	- return (0);
	- }
	+ if (request == RTLD_DI_SERINFOSIZE) {
	+ info->dls_size = _info.dls_size;
	+ info->dls_cnt = _info.dls_cnt;
	+ return (0);
	+ }

	- if (info->dls_cnt != _info.dls_cnt \|\| info->dls_size != _info.dls_size) {
	- _rtld_error("Uninitialized Dl_serinfo struct passed to dlinfo()");
	- return (-1);
	- }
	+ if (info->dls_cnt != _info.dls_cnt \|\|
	+ info->dls_size != _info.dls_size) {
	+ _rtld_error(
	+ "Uninitialized Dl_serinfo struct passed to dlinfo()");
	+ return (-1);
	+ }

	- args.request = RTLD_DI_SERINFO;
	- args.serinfo = info;
	- args.serpath = &info->dls_serpath[0];
	- args.strspace = (char *)&info->dls_serpath[_info.dls_cnt];
	+ args.request = RTLD_DI_SERINFO;
	+ args.serinfo = info;
	+ args.serpath = &info->dls_serpath[0];
	+ args.strspace = (char *)&info->dls_serpath[_info.dls_cnt];

	- args.flags = LA_SER_RUNPATH;
	- if (path_enumerate(obj->rpath, fill_search_info, NULL, &args) != NULL)
	- return (-1);
	+ args.flags = LA_SER_RUNPATH;
	+ if (path_enumerate(obj->rpath, fill_search_info, NULL, &args) != NULL)
	+ return (-1);

	- args.flags = LA_SER_LIBPATH;
	- if (path_enumerate(ld_library_path, fill_search_info, NULL, &args) != NULL)
	- return (-1);
	+ args.flags = LA_SER_LIBPATH;
	+ if (path_enumerate(ld_library_path, fill_search_info, NULL, &args) !=
	+ NULL)
	+ return (-1);

	- args.flags = LA_SER_RUNPATH;
	- if (path_enumerate(obj->runpath, fill_search_info, NULL, &args) != NULL)
	- return (-1);
	+ args.flags = LA_SER_RUNPATH;
	+ if (path_enumerate(obj->runpath, fill_search_info, NULL, &args) != NULL)
	+ return (-1);

	- args.flags = LA_SER_CONFIG;
	- if (path_enumerate(gethints(obj->z_nodeflib), fill_search_info, NULL, &args)
	- != NULL)
	- return (-1);
	+ args.flags = LA_SER_CONFIG;
	+ if (path_enumerate(gethints(obj->z_nodeflib), fill_search_info, NULL,
	+ &args) != NULL)
	+ return (-1);

	- args.flags = LA_SER_DEFAULT;
	- if (!obj->z_nodeflib && path_enumerate(ld_standard_library_path,
	- fill_search_info, NULL, &args) != NULL)
	- return (-1);
	- return (0);
	+ args.flags = LA_SER_DEFAULT;
	+ if (!obj->z_nodeflib &&
	+ path_enumerate(ld_standard_library_path, fill_search_info, NULL,
	+ &args) != NULL)
	+ return (-1);
	+ return (0);
	}

	static int
	rtld_dirname(const char path, char bname)
	{
	- const char *endp;
	+ const char *endp;

	- /* Empty or NULL string gets treated as "." */
	- if (path == NULL \|\| *path == '\0') {
	- bname[0] = '.';
	- bname[1] = '\0';
	- return (0);
	- }
	+ /* Empty or NULL string gets treated as "." */
	+ if (path == NULL \|\| *path == '\0') {
	+ bname[0] = '.';
	+ bname[1] = '\0';
	+ return (0);
	+ }

	- /* Strip trailing slashes */
	- endp = path + strlen(path) - 1;
	- while (endp > path && *endp == '/')
	- endp--;
	+ /* Strip trailing slashes */
	+ endp = path + strlen(path) - 1;
	+ while (endp > path && *endp == '/')
	+ endp--;

	- /* Find the start of the dir */
	- while (endp > path && *endp != '/')
	- endp--;
	+ /* Find the start of the dir */
	+ while (endp > path && *endp != '/')
	+ endp--;

	- /* Either the dir is "/" or there are no slashes */
	- if (endp == path) {
	- bname[0] = *endp == '/' ? '/' : '.';
	- bname[1] = '\0';
	- return (0);
	- } else {
	- do {
	- endp--;
	- } while (endp > path && *endp == '/');
	- }
	+ /* Either the dir is "/" or there are no slashes */
	+ if (endp == path) {
	+ bname[0] = *endp == '/' ? '/' : '.';
	+ bname[1] = '\0';
	+ return (0);
	+ } else {
	+ do {
	+ endp--;
	+ } while (endp > path && *endp == '/');
	+ }

	- if (endp - path + 2 > PATH_MAX)
	- {
	- _rtld_error("Filename is too long: %s", path);
	- return(-1);
	- }
	+ if (endp - path + 2 > PATH_MAX) {
	+ _rtld_error("Filename is too long: %s", path);
	+ return (-1);
	+ }

	- strncpy(bname, path, endp - path + 1);
	- bname[endp - path + 1] = '\0';
	- return (0);
	+ strncpy(bname, path, endp - path + 1);
	+ bname[endp - path + 1] = '\0';
	+ return (0);
	}

	static int
	@@ -4421,7 +4489,7 @@
	*/
	for (prev = r_debug.r_map;
	prev->l_next != NULL && prev->l_next != &obj_rtld.linkmap;
	- prev = prev->l_next)
	+ prev = prev->l_next)
	;

	/* Link in the new entry. */
	@@ -4462,16 +4530,16 @@
	* +0 RetAddr
	*/
	void
	-r_debug_state(struct r_debug* rd __unused, struct link_map *m __unused)
	+r_debug_state(struct r_debug rd __unused, struct link_map m __unused)
	{
	- /*
	- * The following is a hack to force the compiler to emit calls to
	- * this function, even when optimizing. If the function is empty,
	- * the compiler is not obliged to emit any code for calls to it,
	- * even when marked __noinline. However, gdb depends on those
	- * calls being made.
	- */
	- __compiler_membar();
	+ /*
	+ * The following is a hack to force the compiler to emit calls to
	+ * this function, even when optimizing. If the function is empty,
	+ * the compiler is not obliged to emit any code for calls to it,
	+ * even when marked __noinline. However, gdb depends on those
	+ * calls being made.
	+ */
	+ __compiler_membar();
	}

	/*
	@@ -4482,7 +4550,6 @@
	void
	_r_debug_postinit(struct link_map *m __unused)
	{
	-
	/* See r_debug_state(). */
	__compiler_membar();
	}
	@@ -4490,7 +4557,6 @@
	static void
	release_object(Obj_Entry *obj)
	{
	-
	if (obj->holdcount > 0) {
	obj->unholdfree = true;
	return;
	@@ -4507,22 +4573,23 @@
	static const void **
	get_program_var_addr(const char name, RtldLockState lockstate)
	{
	- SymLook req;
	- DoneList donelist;
	+ SymLook req;
	+ DoneList donelist;

	- symlook_init(&req, name);
	- req.lockstate = lockstate;
	- donelist_init(&donelist);
	- if (symlook_global(&req, &donelist) != 0)
	- return (NULL);
	- if (ELF_ST_TYPE(req.sym_out->st_info) == STT_FUNC)
	- return ((const void **)make_function_pointer(req.sym_out,
	- req.defobj_out));
	- else if (ELF_ST_TYPE(req.sym_out->st_info) == STT_GNU_IFUNC)
	- return ((const void **)rtld_resolve_ifunc(req.defobj_out, req.sym_out));
	- else
	- return ((const void **)(req.defobj_out->relocbase +
	- req.sym_out->st_value));
	+ symlook_init(&req, name);
	+ req.lockstate = lockstate;
	+ donelist_init(&donelist);
	+ if (symlook_global(&req, &donelist) != 0)
	+ return (NULL);
	+ if (ELF_ST_TYPE(req.sym_out->st_info) == STT_FUNC)
	+ return ((const void **)make_function_pointer(req.sym_out,
	+ req.defobj_out));
	+ else if (ELF_ST_TYPE(req.sym_out->st_info) == STT_GNU_IFUNC)
	+ return ((const void **)rtld_resolve_ifunc(req.defobj_out,
	+ req.sym_out));
	+ else
	+ return ((const void **)(req.defobj_out->relocbase +
	+ req.sym_out->st_value));
	}

	/*
	@@ -4533,12 +4600,12 @@
	static void
	set_program_var(const char name, const void value)
	{
	- const void **addr;
	+ const void **addr;

	- if ((addr = get_program_var_addr(name, NULL)) != NULL) {
	- dbg("\"%s\": *%p <-- %p", name, addr, value);
	- *addr = value;
	- }
	+ if ((addr = get_program_var_addr(name, NULL)) != NULL) {
	+ dbg("\"%s\": *%p <-- %p", name, addr, value);
	+ *addr = value;
	+ }
	}

	/*
	@@ -4548,39 +4615,39 @@
	static int
	symlook_global(SymLook req, DoneList donelist)
	{
	- SymLook req1;
	- const Objlist_Entry *elm;
	- int res;
	+ SymLook req1;
	+ const Objlist_Entry *elm;
	+ int res;

	- symlook_init_from_req(&req1, req);
	+ symlook_init_from_req(&req1, req);

	- /* Search all objects loaded at program start up. */
	- if (req->defobj_out == NULL \|\| (ld_dynamic_weak &&
	- ELF_ST_BIND(req->sym_out->st_info) == STB_WEAK)) {
	- res = symlook_list(&req1, &list_main, donelist);
	- if (res == 0 && (!ld_dynamic_weak \|\| req->defobj_out == NULL \|\|
	- ELF_ST_BIND(req1.sym_out->st_info) != STB_WEAK)) {
	- req->sym_out = req1.sym_out;
	- req->defobj_out = req1.defobj_out;
	- assert(req->defobj_out != NULL);
	+ /* Search all objects loaded at program start up. */
	+ if (req->defobj_out == NULL \|\| (ld_dynamic_weak &&
	+ ELF_ST_BIND(req->sym_out->st_info) == STB_WEAK)) {
	+ res = symlook_list(&req1, &list_main, donelist);
	+ if (res == 0 && (!ld_dynamic_weak \|\| req->defobj_out == NULL \|\|
	+ ELF_ST_BIND(req1.sym_out->st_info) != STB_WEAK)) {
	+ req->sym_out = req1.sym_out;
	+ req->defobj_out = req1.defobj_out;
	+ assert(req->defobj_out != NULL);
	+ }
	}
	- }

	- /* Search all DAGs whose roots are RTLD_GLOBAL objects. */
	- STAILQ_FOREACH(elm, &list_global, link) {
	- if (req->defobj_out != NULL && (!ld_dynamic_weak \|\|
	- ELF_ST_BIND(req->sym_out->st_info) != STB_WEAK))
	- break;
	- res = symlook_list(&req1, &elm->obj->dagmembers, donelist);
	- if (res == 0 && (req->defobj_out == NULL \|\|
	- ELF_ST_BIND(req1.sym_out->st_info) != STB_WEAK)) {
	- req->sym_out = req1.sym_out;
	- req->defobj_out = req1.defobj_out;
	- assert(req->defobj_out != NULL);
	+ /* Search all DAGs whose roots are RTLD_GLOBAL objects. */
	+ STAILQ_FOREACH(elm, &list_global, link) {
	+ if (req->defobj_out != NULL && (!ld_dynamic_weak \|\|
	+ ELF_ST_BIND(req->sym_out->st_info) != STB_WEAK))
	+ break;
	+ res = symlook_list(&req1, &elm->obj->dagmembers, donelist);
	+ if (res == 0 && (req->defobj_out == NULL \|\|
	+ ELF_ST_BIND(req1.sym_out->st_info) != STB_WEAK)) {
	+ req->sym_out = req1.sym_out;
	+ req->defobj_out = req1.defobj_out;
	+ assert(req->defobj_out != NULL);
	+ }
	}
	- }

	- return (req->sym_out != NULL ? 0 : ESRCH);
	+ return (req->sym_out != NULL ? 0 : ESRCH);
	}

	/*
	@@ -4592,97 +4659,98 @@
	static int
	symlook_default(SymLook req, const Obj_Entry refobj)
	{
	- DoneList donelist;
	- const Objlist_Entry *elm;
	- SymLook req1;
	- int res;
	-
	- donelist_init(&donelist);
	- symlook_init_from_req(&req1, req);
	-
	- /*
	- * Look first in the referencing object if linked symbolically,
	- * and similarly handle protected symbols.
	- */
	- res = symlook_obj(&req1, refobj);
	- if (res == 0 && (refobj->symbolic \|\|
	- ELF_ST_VISIBILITY(req1.sym_out->st_other) == STV_PROTECTED)) {
	- req->sym_out = req1.sym_out;
	- req->defobj_out = req1.defobj_out;
	- assert(req->defobj_out != NULL);
	- }
	- if (refobj->symbolic \|\| req->defobj_out != NULL)
	- donelist_check(&donelist, refobj);
	-
	- if (!refobj->deepbind)
	- symlook_global(req, &donelist);
	-
	- /* Search all dlopened DAGs containing the referencing object. */
	- STAILQ_FOREACH(elm, &refobj->dldags, link) {
	- if (req->sym_out != NULL && (!ld_dynamic_weak \|\|
	- ELF_ST_BIND(req->sym_out->st_info) != STB_WEAK))
	- break;
	- res = symlook_list(&req1, &elm->obj->dagmembers, &donelist);
	- if (res == 0 && (req->sym_out == NULL \|\|
	- ELF_ST_BIND(req1.sym_out->st_info) != STB_WEAK)) {
	- req->sym_out = req1.sym_out;
	- req->defobj_out = req1.defobj_out;
	- assert(req->defobj_out != NULL);
	- }
	- }
	-
	- if (refobj->deepbind)
	- symlook_global(req, &donelist);
	-
	- /*
	- * Search the dynamic linker itself, and possibly resolve the
	- * symbol from there. This is how the application links to
	- * dynamic linker services such as dlopen.
	- */
	- if (req->sym_out == NULL \|\|
	- ELF_ST_BIND(req->sym_out->st_info) == STB_WEAK) {
	- res = symlook_obj(&req1, &obj_rtld);
	- if (res == 0) {
	- req->sym_out = req1.sym_out;
	- req->defobj_out = req1.defobj_out;
	- assert(req->defobj_out != NULL);
	- }
	- }
	-
	- return (req->sym_out != NULL ? 0 : ESRCH);
	+ DoneList donelist;
	+ const Objlist_Entry *elm;
	+ SymLook req1;
	+ int res;
	+
	+ donelist_init(&donelist);
	+ symlook_init_from_req(&req1, req);
	+
	+ /*
	+ * Look first in the referencing object if linked symbolically,
	+ * and similarly handle protected symbols.
	+ */
	+ res = symlook_obj(&req1, refobj);
	+ if (res == 0 && (refobj->symbolic \|\|
	+ ELF_ST_VISIBILITY(req1.sym_out->st_other) == STV_PROTECTED)) {
	+ req->sym_out = req1.sym_out;
	+ req->defobj_out = req1.defobj_out;
	+ assert(req->defobj_out != NULL);
	+ }
	+ if (refobj->symbolic \|\| req->defobj_out != NULL)
	+ donelist_check(&donelist, refobj);
	+
	+ if (!refobj->deepbind)
	+ symlook_global(req, &donelist);
	+
	+ /* Search all dlopened DAGs containing the referencing object. */
	+ STAILQ_FOREACH(elm, &refobj->dldags, link) {
	+ if (req->sym_out != NULL && (!ld_dynamic_weak \|\|
	+ ELF_ST_BIND(req->sym_out->st_info) != STB_WEAK))
	+ break;
	+ res = symlook_list(&req1, &elm->obj->dagmembers, &donelist);
	+ if (res == 0 && (req->sym_out == NULL \|\|
	+ ELF_ST_BIND(req1.sym_out->st_info) != STB_WEAK)) {
	+ req->sym_out = req1.sym_out;
	+ req->defobj_out = req1.defobj_out;
	+ assert(req->defobj_out != NULL);
	+ }
	+ }
	+
	+ if (refobj->deepbind)
	+ symlook_global(req, &donelist);
	+
	+ /*
	+ * Search the dynamic linker itself, and possibly resolve the
	+ * symbol from there. This is how the application links to
	+ * dynamic linker services such as dlopen.
	+ */
	+ if (req->sym_out == NULL \|\|
	+ ELF_ST_BIND(req->sym_out->st_info) == STB_WEAK) {
	+ res = symlook_obj(&req1, &obj_rtld);
	+ if (res == 0) {
	+ req->sym_out = req1.sym_out;
	+ req->defobj_out = req1.defobj_out;
	+ assert(req->defobj_out != NULL);
	+ }
	+ }
	+
	+ return (req->sym_out != NULL ? 0 : ESRCH);
	}

	static int
	symlook_list(SymLook req, const Objlist objlist, DoneList *dlp)
	{
	- const Elf_Sym *def;
	- const Obj_Entry *defobj;
	- const Objlist_Entry *elm;
	- SymLook req1;
	- int res;
	-
	- def = NULL;
	- defobj = NULL;
	- STAILQ_FOREACH(elm, objlist, link) {
	- if (donelist_check(dlp, elm->obj))
	- continue;
	- symlook_init_from_req(&req1, req);
	- if ((res = symlook_obj(&req1, elm->obj)) == 0) {
	- if (def == NULL \|\| (ld_dynamic_weak &&
	- ELF_ST_BIND(req1.sym_out->st_info) != STB_WEAK)) {
	- def = req1.sym_out;
	- defobj = req1.defobj_out;
	- if (!ld_dynamic_weak \|\| ELF_ST_BIND(def->st_info) != STB_WEAK)
	- break;
	- }
	- }
	- }
	- if (def != NULL) {
	- req->sym_out = def;
	- req->defobj_out = defobj;
	- return (0);
	- }
	- return (ESRCH);
	+ const Elf_Sym *def;
	+ const Obj_Entry *defobj;
	+ const Objlist_Entry *elm;
	+ SymLook req1;
	+ int res;
	+
	+ def = NULL;
	+ defobj = NULL;
	+ STAILQ_FOREACH(elm, objlist, link) {
	+ if (donelist_check(dlp, elm->obj))
	+ continue;
	+ symlook_init_from_req(&req1, req);
	+ if ((res = symlook_obj(&req1, elm->obj)) == 0) {
	+ if (def == NULL \|\| (ld_dynamic_weak &&
	+ ELF_ST_BIND(req1.sym_out->st_info) != STB_WEAK)) {
	+ def = req1.sym_out;
	+ defobj = req1.defobj_out;
	+ if (!ld_dynamic_weak \|\|
	+ ELF_ST_BIND(def->st_info) != STB_WEAK)
	+ break;
	+ }
	+ }
	+ }
	+ if (def != NULL) {
	+ req->sym_out = def;
	+ req->defobj_out = defobj;
	+ return (0);
	+ }
	+ return (ESRCH);
	}

	/*
	@@ -4694,33 +4762,34 @@
	static int
	symlook_needed(SymLook req, const Needed_Entry needed, DoneList *dlp)
	{
	- const Elf_Sym *def;
	- const Needed_Entry *n;
	- const Obj_Entry *defobj;
	- SymLook req1;
	- int res;
	-
	- def = NULL;
	- defobj = NULL;
	- symlook_init_from_req(&req1, req);
	- for (n = needed; n != NULL; n = n->next) {
	- if (n->obj == NULL \|\|
	- (res = symlook_list(&req1, &n->obj->dagmembers, dlp)) != 0)
	- continue;
	- if (def == NULL \|\| (ld_dynamic_weak &&
	- ELF_ST_BIND(req1.sym_out->st_info) != STB_WEAK)) {
	- def = req1.sym_out;
	- defobj = req1.defobj_out;
	- if (!ld_dynamic_weak \|\| ELF_ST_BIND(def->st_info) != STB_WEAK)
	- break;
	+ const Elf_Sym *def;
	+ const Needed_Entry *n;
	+ const Obj_Entry *defobj;
	+ SymLook req1;
	+ int res;
	+
	+ def = NULL;
	+ defobj = NULL;
	+ symlook_init_from_req(&req1, req);
	+ for (n = needed; n != NULL; n = n->next) {
	+ if (n->obj == NULL \|\| (res = symlook_list(&req1,
	+ &n->obj->dagmembers, dlp)) != 0)
	+ continue;
	+ if (def == NULL \|\| (ld_dynamic_weak &&
	+ ELF_ST_BIND(req1.sym_out->st_info) != STB_WEAK)) {
	+ def = req1.sym_out;
	+ defobj = req1.defobj_out;
	+ if (!ld_dynamic_weak \|\|
	+ ELF_ST_BIND(def->st_info) != STB_WEAK)
	+ break;
	+ }
	}
	- }
	- if (def != NULL) {
	- req->sym_out = def;
	- req->defobj_out = defobj;
	- return (0);
	- }
	- return (ESRCH);
	+ if (def != NULL) {
	+ req->sym_out = def;
	+ req->defobj_out = defobj;
	+ return (0);
	+ }
	+ return (ESRCH);
	}

	static int
	@@ -4749,41 +4818,41 @@
	int
	symlook_obj(SymLook req, const Obj_Entry obj)
	{
	- SymLook req1;
	- int res, mres;
	-
	- /*
	- * If there is at least one valid hash at this point, we prefer to
	- * use the faster GNU version if available.
	- */
	- if (obj->valid_hash_gnu)
	- mres = symlook_obj1_gnu(req, obj);
	- else if (obj->valid_hash_sysv)
	- mres = symlook_obj1_sysv(req, obj);
	- else
	- return (EINVAL);
	-
	- if (mres == 0) {
	- if (obj->needed_filtees != NULL) {
	- res = symlook_obj_load_filtees(req, &req1, obj,
	- obj->needed_filtees);
	- if (res == 0) {
	- req->sym_out = req1.sym_out;
	- req->defobj_out = req1.defobj_out;
	- }
	- return (res);
	- }
	- if (obj->needed_aux_filtees != NULL) {
	- res = symlook_obj_load_filtees(req, &req1, obj,
	- obj->needed_aux_filtees);
	- if (res == 0) {
	- req->sym_out = req1.sym_out;
	- req->defobj_out = req1.defobj_out;
	- return (res);
	- }
	+ SymLook req1;
	+ int res, mres;
	+
	+ /*
	+ * If there is at least one valid hash at this point, we prefer to
	+ * use the faster GNU version if available.
	+ */
	+ if (obj->valid_hash_gnu)
	+ mres = symlook_obj1_gnu(req, obj);
	+ else if (obj->valid_hash_sysv)
	+ mres = symlook_obj1_sysv(req, obj);
	+ else
	+ return (EINVAL);
	+
	+ if (mres == 0) {
	+ if (obj->needed_filtees != NULL) {
	+ res = symlook_obj_load_filtees(req, &req1, obj,
	+ obj->needed_filtees);
	+ if (res == 0) {
	+ req->sym_out = req1.sym_out;
	+ req->defobj_out = req1.defobj_out;
	+ }
	+ return (res);
	+ }
	+ if (obj->needed_aux_filtees != NULL) {
	+ res = symlook_obj_load_filtees(req, &req1, obj,
	+ obj->needed_aux_filtees);
	+ if (res == 0) {
	+ req->sym_out = req1.sym_out;
	+ req->defobj_out = req1.defobj_out;
	+ return (res);
	+ }
	+ }
	}
	- }
	- return (mres);
	+ return (mres);
	}

	/* Symbol match routine common to both hash functions */
	@@ -4846,10 +4915,9 @@
	verndx == VER_NDX_GIVEN) {
	result->sym_out = symp;
	return (true);
	- }
	- else if (verndx >= VER_NDX_GIVEN) {
	- if ((obj->versyms[symnum] & VER_NDX_HIDDEN)
	- == 0) {
	+ } else if (verndx >= VER_NDX_GIVEN) {
	+ if ((obj->versyms[symnum] & VER_NDX_HIDDEN) ==
	+ 0) {
	if (result->vsymp == NULL)
	result->vsymp = symp;
	result->vcount++;
	@@ -4862,9 +4930,10 @@
	}
	if (obj->versyms == NULL) {
	if (object_match_name(obj, req->ventry->name)) {
	- _rtld_error("%s: object %s should provide version %s "
	- "for symbol %s", obj_rtld.path, obj->path,
	- req->ventry->name, obj->strtab + symnum);
	+ _rtld_error(
	+ "%s: object %s should provide version %s for symbol %s",
	+ obj_rtld.path, obj->path, req->ventry->name,
	+ obj->strtab + symnum);
	return (false);
	}
	} else {
	@@ -4913,7 +4982,7 @@
	for (symnum = obj->buckets[req->hash % obj->nbuckets];
	symnum != STN_UNDEF; symnum = obj->chains[symnum]) {
	if (symnum >= obj->nchains)
	- return (ESRCH); /* Bad object */
	+ return (ESRCH); /* Bad object */

	if (matched_symbol(req, obj, &matchres, symnum)) {
	req->sym_out = matchres.sym_out;
	@@ -5046,8 +5115,8 @@
	rtld_putstr(path);
	break;
	case 'x':
	- rtld_printf("%p", obj != NULL ?
	- obj->mapbase : NULL);
	+ rtld_printf("%p",
	+ obj != NULL ? obj->mapbase : NULL);
	break;
	}
	break;
	@@ -5104,8 +5173,8 @@

	Name_Entry *fname = STAILQ_FIRST(&obj->names);
	name = fname == NULL ? "<unknown>" : fname->name;
	- trace_print_obj(obj, name, obj->path, main_local,
	- NULL, fmt2);
	+ trace_print_obj(obj, name, obj->path, main_local, NULL,
	+ fmt2);
	}
	}
	}
	@@ -5134,8 +5203,8 @@
	next = TAILQ_NEXT(obj, next);
	if (obj->marker \|\| obj->refcount != 0)
	continue;
	- LD_UTRACE(UTRACE_UNLOAD_OBJECT, obj, obj->mapbase,
	- obj->mapsize, 0, obj->path);
	+ LD_UTRACE(UTRACE_UNLOAD_OBJECT, obj, obj->mapbase, obj->mapsize,
	+ 0, obj->path);
	dbg("unloading \"%s\"", obj->path);
	/*
	* Unlink the object now to prevent new references from
	@@ -5162,39 +5231,39 @@
	static void
	unlink_object(Obj_Entry *root)
	{
	- Objlist_Entry *elm;
	+ Objlist_Entry *elm;

	- if (root->refcount == 0) {
	- /* Remove the object from the RTLD_GLOBAL list. */
	- objlist_remove(&list_global, root);
	+ if (root->refcount == 0) {
	+ /* Remove the object from the RTLD_GLOBAL list. */
	+ objlist_remove(&list_global, root);

	- /* Remove the object from all objects' DAG lists. */
	- STAILQ_FOREACH(elm, &root->dagmembers, link) {
	- objlist_remove(&elm->obj->dldags, root);
	- if (elm->obj != root)
	- unlink_object(elm->obj);
	+ /* Remove the object from all objects' DAG lists. */
	+ STAILQ_FOREACH(elm, &root->dagmembers, link) {
	+ objlist_remove(&elm->obj->dldags, root);
	+ if (elm->obj != root)
	+ unlink_object(elm->obj);
	+ }
	}
	- }
	}

	static void
	ref_dag(Obj_Entry *root)
	{
	- Objlist_Entry *elm;
	+ Objlist_Entry *elm;

	- assert(root->dag_inited);
	- STAILQ_FOREACH(elm, &root->dagmembers, link)
	- elm->obj->refcount++;
	+ assert(root->dag_inited);
	+ STAILQ_FOREACH(elm, &root->dagmembers, link)
	+ elm->obj->refcount++;
	}

	static void
	unref_dag(Obj_Entry *root)
	{
	- Objlist_Entry *elm;
	+ Objlist_Entry *elm;

	- assert(root->dag_inited);
	- STAILQ_FOREACH(elm, &root->dagmembers, link)
	- elm->obj->refcount--;
	+ assert(root->dag_inited);
	+ STAILQ_FOREACH(elm, &root->dagmembers, link)
	+ elm->obj->refcount--;
	}

	/*
	@@ -5245,8 +5314,7 @@

	dtv = *dtvp;
	/* Check dtv generation in case new modules have arrived */
	- if (__predict_true(dtv[0] == tls_dtv_generation &&
	- dtv[index + 1] != 0))
	+ if (__predict_true(dtv[0] == tls_dtv_generation && dtv[index + 1] != 0))
	return ((void *)(dtv[index + 1] + offset));
	return (tls_get_addr_slow(dtvp, index, offset, false));
	}
	@@ -5259,18 +5327,18 @@
	static void *
	get_tls_block_ptr(void *tcb, size_t tcbsize)
	{
	- size_t extra_size, post_size, pre_size, tls_block_size;
	- size_t tls_init_align;
	+ size_t extra_size, post_size, pre_size, tls_block_size;
	+ size_t tls_init_align;

	- tls_init_align = MAX(obj_main->tlsalign, 1);
	+ tls_init_align = MAX(obj_main->tlsalign, 1);

	- /* Compute fragments sizes. */
	- extra_size = tcbsize - TLS_TCB_SIZE;
	- post_size = calculate_tls_post_size(tls_init_align);
	- tls_block_size = tcbsize + post_size;
	- pre_size = roundup2(tls_block_size, tls_init_align) - tls_block_size;
	+ /* Compute fragments sizes. */
	+ extra_size = tcbsize - TLS_TCB_SIZE;
	+ post_size = calculate_tls_post_size(tls_init_align);
	+ tls_block_size = tcbsize + post_size;
	+ pre_size = roundup2(tls_block_size, tls_init_align) - tls_block_size;

	- return ((char *)tcb - pre_size - extra_size);
	+ return ((char *)tcb - pre_size - extra_size);
	}

	/*
	@@ -5286,103 +5354,109 @@
	void *
	allocate_tls(Obj_Entry objs, void oldtcb, size_t tcbsize, size_t tcbalign)
	{
	- Obj_Entry *obj;
	- char *tls_block;
	- Elf_Addr dtv, *tcb;
	- Elf_Addr addr;
	- Elf_Addr i;
	- size_t extra_size, maxalign, post_size, pre_size, tls_block_size;
	- size_t tls_init_align, tls_init_offset;
	-
	- if (oldtcb != NULL && tcbsize == TLS_TCB_SIZE)
	- return (oldtcb);
	-
	- assert(tcbsize >= TLS_TCB_SIZE);
	- maxalign = MAX(tcbalign, tls_static_max_align);
	- tls_init_align = MAX(obj_main->tlsalign, 1);
	-
	- /* Compute fragmets sizes. */
	- extra_size = tcbsize - TLS_TCB_SIZE;
	- post_size = calculate_tls_post_size(tls_init_align);
	- tls_block_size = tcbsize + post_size;
	- pre_size = roundup2(tls_block_size, tls_init_align) - tls_block_size;
	- tls_block_size += pre_size + tls_static_space - TLS_TCB_SIZE - post_size;
	-
	- /* Allocate whole TLS block */
	- tls_block = xmalloc_aligned(tls_block_size, maxalign, 0);
	- tcb = (Elf_Addr **)(tls_block + pre_size + extra_size);
	-
	- if (oldtcb != NULL) {
	- memcpy(tls_block, get_tls_block_ptr(oldtcb, tcbsize),
	- tls_static_space);
	- free(get_tls_block_ptr(oldtcb, tcbsize));
	-
	- /* Adjust the DTV. */
	- dtv = tcb[0];
	- for (i = 0; i < dtv[1]; i++) {
	- if (dtv[i+2] >= (Elf_Addr)oldtcb &&
	- dtv[i+2] < (Elf_Addr)oldtcb + tls_static_space) {
	- dtv[i+2] = dtv[i+2] - (Elf_Addr)oldtcb + (Elf_Addr)tcb;
	- }
	- }
	- } else {
	- dtv = xcalloc(tls_max_index + 2, sizeof(Elf_Addr));
	- tcb[0] = dtv;
	- dtv[0] = tls_dtv_generation;
	- dtv[1] = tls_max_index;
	+ Obj_Entry *obj;
	+ char *tls_block;
	+ Elf_Addr dtv, *tcb;
	+ Elf_Addr addr;
	+ Elf_Addr i;
	+ size_t extra_size, maxalign, post_size, pre_size, tls_block_size;
	+ size_t tls_init_align, tls_init_offset;
	+
	+ if (oldtcb != NULL && tcbsize == TLS_TCB_SIZE)
	+ return (oldtcb);
	+
	+ assert(tcbsize >= TLS_TCB_SIZE);
	+ maxalign = MAX(tcbalign, tls_static_max_align);
	+ tls_init_align = MAX(obj_main->tlsalign, 1);
	+
	+ /* Compute fragments sizes. */
	+ extra_size = tcbsize - TLS_TCB_SIZE;
	+ post_size = calculate_tls_post_size(tls_init_align);
	+ tls_block_size = tcbsize + post_size;
	+ pre_size = roundup2(tls_block_size, tls_init_align) - tls_block_size;
	+ tls_block_size += pre_size + tls_static_space - TLS_TCB_SIZE -
	+ post_size;
	+
	+ /* Allocate whole TLS block */
	+ tls_block = xmalloc_aligned(tls_block_size, maxalign, 0);
	+ tcb = (Elf_Addr **)(tls_block + pre_size + extra_size);
	+
	+ if (oldtcb != NULL) {
	+ memcpy(tls_block, get_tls_block_ptr(oldtcb, tcbsize),
	+ tls_static_space);
	+ free(get_tls_block_ptr(oldtcb, tcbsize));
	+
	+ /* Adjust the DTV. */
	+ dtv = tcb[0];
	+ for (i = 0; i < dtv[1]; i++) {
	+ if (dtv[i + 2] >= (Elf_Addr)oldtcb &&
	+ dtv[i + 2] < (Elf_Addr)oldtcb + tls_static_space) {
	+ dtv[i + 2] = dtv[i + 2] - (Elf_Addr)oldtcb +
	+ (Elf_Addr)tcb;
	+ }
	+ }
	+ } else {
	+ dtv = xcalloc(tls_max_index + 2, sizeof(Elf_Addr));
	+ tcb[0] = dtv;
	+ dtv[0] = tls_dtv_generation;
	+ dtv[1] = tls_max_index;
	+
	+ for (obj = globallist_curr(objs); obj != NULL;
	+ obj = globallist_next(obj)) {
	+ if (obj->tlsoffset == 0)
	+ continue;
	+ tls_init_offset = obj->tlspoffset & (obj->tlsalign - 1);
	+ addr = (Elf_Addr)tcb + obj->tlsoffset;
	+ if (tls_init_offset > 0)
	+ memset((void *)addr, 0, tls_init_offset);
	+ if (obj->tlsinitsize > 0) {
	+ memcpy((void *)(addr + tls_init_offset),
	+ obj->tlsinit, obj->tlsinitsize);
	+ }
	+ if (obj->tlssize > obj->tlsinitsize) {
	+ memset((void *)(addr + tls_init_offset +
	+ obj->tlsinitsize),
	+ 0,
	+ obj->tlssize - obj->tlsinitsize -
	+ tls_init_offset);
	+ }
	+ dtv[obj->tlsindex + 1] = addr;
	+ }
	+ }

	- for (obj = globallist_curr(objs); obj != NULL;
	- obj = globallist_next(obj)) {
	- if (obj->tlsoffset == 0)
	- continue;
	- tls_init_offset = obj->tlspoffset & (obj->tlsalign - 1);
	- addr = (Elf_Addr)tcb + obj->tlsoffset;
	- if (tls_init_offset > 0)
	- memset((void *)addr, 0, tls_init_offset);
	- if (obj->tlsinitsize > 0) {
	- memcpy((void *)(addr + tls_init_offset), obj->tlsinit,
	- obj->tlsinitsize);
	- }
	- if (obj->tlssize > obj->tlsinitsize) {
	- memset((void *)(addr + tls_init_offset + obj->tlsinitsize),
	- 0, obj->tlssize - obj->tlsinitsize - tls_init_offset);
	- }
	- dtv[obj->tlsindex + 1] = addr;
	- }
	- }
	-
	- return (tcb);
	+ return (tcb);
	}

	void
	free_tls(void *tcb, size_t tcbsize, size_t tcbalign __unused)
	{
	- Elf_Addr *dtv;
	- Elf_Addr tlsstart, tlsend;
	- size_t post_size;
	- size_t dtvsize, i, tls_init_align __unused;
	+ Elf_Addr *dtv;
	+ Elf_Addr tlsstart, tlsend;
	+ size_t post_size;
	+ size_t dtvsize, i, tls_init_align __unused;

	- assert(tcbsize >= TLS_TCB_SIZE);
	- tls_init_align = MAX(obj_main->tlsalign, 1);
	+ assert(tcbsize >= TLS_TCB_SIZE);
	+ tls_init_align = MAX(obj_main->tlsalign, 1);

	- /* Compute fragments sizes. */
	- post_size = calculate_tls_post_size(tls_init_align);
	+ /* Compute fragments sizes. */
	+ post_size = calculate_tls_post_size(tls_init_align);

	- tlsstart = (Elf_Addr)tcb + TLS_TCB_SIZE + post_size;
	- tlsend = (Elf_Addr)tcb + tls_static_space;
	+ tlsstart = (Elf_Addr)tcb + TLS_TCB_SIZE + post_size;
	+ tlsend = (Elf_Addr)tcb + tls_static_space;

	- dtv = (Elf_Addr *)tcb;
	- dtvsize = dtv[1];
	- for (i = 0; i < dtvsize; i++) {
	- if (dtv[i+2] && (dtv[i+2] < tlsstart \|\| dtv[i+2] >= tlsend)) {
	- free((void*)dtv[i+2]);
	+ dtv = (Elf_Addr *)tcb;
	+ dtvsize = dtv[1];
	+ for (i = 0; i < dtvsize; i++) {
	+ if (dtv[i + 2] != 0 && (dtv[i + 2] < tlsstart \|\|
	+ dtv[i + 2] >= tlsend)) {
	+ free((void *)dtv[i + 2]);
	+ }
	}
	- }
	- free(dtv);
	- free(get_tls_block_ptr(tcb, tcbsize));
	+ free(dtv);
	+ free(get_tls_block_ptr(tcb, tcbsize));
	}

	-#endif /* TLS_VARIANT_I */
	+#endif /* TLS_VARIANT_I */

	#ifdef TLS_VARIANT_II

	@@ -5392,107 +5466,108 @@
	void *
	allocate_tls(Obj_Entry objs, void oldtls, size_t tcbsize, size_t tcbalign)
	{
	- Obj_Entry *obj;
	- size_t size, ralign;
	- char *tls;
	- Elf_Addr dtv, olddtv;
	- Elf_Addr segbase, oldsegbase, addr;
	- size_t i;
	-
	- ralign = tcbalign;
	- if (tls_static_max_align > ralign)
	- ralign = tls_static_max_align;
	- size = roundup(tls_static_space, ralign) + roundup(tcbsize, ralign);
	-
	- assert(tcbsize >= 2*sizeof(Elf_Addr));
	- tls = xmalloc_aligned(size, ralign, 0 /* XXX */);
	- dtv = xcalloc(tls_max_index + 2, sizeof(Elf_Addr));
	+ Obj_Entry *obj;
	+ size_t size, ralign;
	+ char *tls;
	+ Elf_Addr dtv, olddtv;
	+ Elf_Addr segbase, oldsegbase, addr;
	+ size_t i;
	+
	+ ralign = tcbalign;
	+ if (tls_static_max_align > ralign)
	+ ralign = tls_static_max_align;
	+ size = roundup(tls_static_space, ralign) + roundup(tcbsize, ralign);
	+
	+ assert(tcbsize >= 2 * sizeof(Elf_Addr));
	+ tls = xmalloc_aligned(size, ralign, 0 /* XXX */);
	+ dtv = xcalloc(tls_max_index + 2, sizeof(Elf_Addr));

	- segbase = (Elf_Addr)(tls + roundup(tls_static_space, ralign));
	- ((Elf_Addr *)segbase)[0] = segbase;
	- ((Elf_Addr *)segbase)[1] = (Elf_Addr) dtv;
	+ segbase = (Elf_Addr)(tls + roundup(tls_static_space, ralign));
	+ ((Elf_Addr *)segbase)[0] = segbase;
	+ ((Elf_Addr *)segbase)[1] = (Elf_Addr)dtv;

	- dtv[0] = tls_dtv_generation;
	- dtv[1] = tls_max_index;
	+ dtv[0] = tls_dtv_generation;
	+ dtv[1] = tls_max_index;

	- if (oldtls) {
	- /*
	- * Copy the static TLS block over whole.
	- */
	- oldsegbase = (Elf_Addr) oldtls;
	- memcpy((void *)(segbase - tls_static_space),
	- (const void *)(oldsegbase - tls_static_space),
	- tls_static_space);
	+ if (oldtls != NULL) {
	+ /*
	+ * Copy the static TLS block over whole.
	+ */
	+ oldsegbase = (Elf_Addr)oldtls;
	+ memcpy((void *)(segbase - tls_static_space),
	+ (const void *)(oldsegbase - tls_static_space),
	+ tls_static_space);

	- /*
	- * If any dynamic TLS blocks have been created tls_get_addr(),
	- * move them over.
	- */
	- olddtv = ((Elf_Addr **)oldsegbase)[1];
	- for (i = 0; i < olddtv[1]; i++) {
	- if (olddtv[i + 2] < oldsegbase - size \|\|
	- olddtv[i + 2] > oldsegbase) {
	- dtv[i + 2] = olddtv[i + 2];
	- olddtv[i + 2] = 0;
	- }
	- }
	+ /*
	+ * If any dynamic TLS blocks have been created tls_get_addr(),
	+ * move them over.
	+ */
	+ olddtv = ((Elf_Addr **)oldsegbase)[1];
	+ for (i = 0; i < olddtv[1]; i++) {
	+ if (olddtv[i + 2] < oldsegbase - size \|\|
	+ olddtv[i + 2] > oldsegbase) {
	+ dtv[i + 2] = olddtv[i + 2];
	+ olddtv[i + 2] = 0;
	+ }
	+ }

	- /*
	- * We assume that this block was the one we created with
	- * allocate_initial_tls().
	- */
	- free_tls(oldtls, 2 * sizeof(Elf_Addr), sizeof(Elf_Addr));
	- } else {
	- for (obj = objs; obj != NULL; obj = TAILQ_NEXT(obj, next)) {
	- if (obj->marker \|\| obj->tlsoffset == 0)
	- continue;
	- addr = segbase - obj->tlsoffset;
	- memset((void *)(addr + obj->tlsinitsize),
	- 0, obj->tlssize - obj->tlsinitsize);
	- if (obj->tlsinit) {
	- memcpy((void *)addr, obj->tlsinit, obj->tlsinitsize);
	- obj->static_tls_copied = true;
	+ /*
	+ * We assume that this block was the one we created with
	+ * allocate_initial_tls().
	+ */
	+ free_tls(oldtls, 2 * sizeof(Elf_Addr), sizeof(Elf_Addr));
	+ } else {
	+ for (obj = objs; obj != NULL; obj = TAILQ_NEXT(obj, next)) {
	+ if (obj->marker \|\| obj->tlsoffset == 0)
	+ continue;
	+ addr = segbase - obj->tlsoffset;
	+ memset((void *)(addr + obj->tlsinitsize), 0,
	+ obj->tlssize - obj->tlsinitsize);
	+ if (obj->tlsinit) {
	+ memcpy((void *)addr, obj->tlsinit,
	+ obj->tlsinitsize);
	+ obj->static_tls_copied = true;
	+ }
	+ dtv[obj->tlsindex + 1] = addr;
	}
	- dtv[obj->tlsindex + 1] = addr;
	}
	- }

	- return ((void *)segbase);
	+ return ((void *)segbase);
	}

	void
	-free_tls(void *tls, size_t tcbsize __unused, size_t tcbalign)
	+free_tls(void *tls, size_t tcbsize __unused, size_t tcbalign)
	{
	- Elf_Addr* dtv;
	- size_t size, ralign;
	- int dtvsize, i;
	- Elf_Addr tlsstart, tlsend;
	+ Elf_Addr *dtv;
	+ size_t size, ralign;
	+ int dtvsize, i;
	+ Elf_Addr tlsstart, tlsend;

	- /*
	- * Figure out the size of the initial TLS block so that we can
	- * find stuff which ___tls_get_addr() allocated dynamically.
	- */
	- ralign = tcbalign;
	- if (tls_static_max_align > ralign)
	- ralign = tls_static_max_align;
	- size = roundup(tls_static_space, ralign);
	-
	- dtv = ((Elf_Addr **)tls)[1];
	- dtvsize = dtv[1];
	- tlsend = (Elf_Addr)tls;
	- tlsstart = tlsend - size;
	- for (i = 0; i < dtvsize; i++) {
	- if (dtv[i + 2] != 0 && (dtv[i + 2] < tlsstart \|\|
	- dtv[i + 2] > tlsend)) {
	- free((void *)dtv[i + 2]);
	+ /*
	+ * Figure out the size of the initial TLS block so that we can
	+ * find stuff which ___tls_get_addr() allocated dynamically.
	+ */
	+ ralign = tcbalign;
	+ if (tls_static_max_align > ralign)
	+ ralign = tls_static_max_align;
	+ size = roundup(tls_static_space, ralign);
	+
	+ dtv = ((Elf_Addr **)tls)[1];
	+ dtvsize = dtv[1];
	+ tlsend = (Elf_Addr)tls;
	+ tlsstart = tlsend - size;
	+ for (i = 0; i < dtvsize; i++) {
	+ if (dtv[i + 2] != 0 && (dtv[i + 2] < tlsstart \|\|
	+ dtv[i + 2] > tlsend)) {
	+ free((void *)dtv[i + 2]);
	+ }
	}
	- }

	- free((void *)tlsstart);
	- free((void *)dtv);
	+ free((void *)tlsstart);
	+ free((void *)dtv);
	}

	-#endif /* TLS_VARIANT_II */
	+#endif /* TLS_VARIANT_II */

	/*
	* Allocate TLS block for module with given index.
	@@ -5534,343 +5609,351 @@
	bool
	allocate_tls_offset(Obj_Entry *obj)
	{
	- size_t off;
	+ size_t off;

	- if (obj->tls_dynamic)
	- return (false);
	+ if (obj->tls_dynamic)
	+ return (false);

	- if (obj->tls_static)
	- return (true);
	+ if (obj->tls_static)
	+ return (true);

	- if (obj->tlssize == 0) {
	- obj->tls_static = true;
	- return (true);
	- }
	+ if (obj->tlssize == 0) {
	+ obj->tls_static = true;
	+ return (true);
	+ }

	- if (tls_last_offset == 0)
	- off = calculate_first_tls_offset(obj->tlssize, obj->tlsalign,
	- obj->tlspoffset);
	- else
	- off = calculate_tls_offset(tls_last_offset, tls_last_size,
	- obj->tlssize, obj->tlsalign, obj->tlspoffset);
	+ if (tls_last_offset == 0)
	+ off = calculate_first_tls_offset(obj->tlssize, obj->tlsalign,
	+ obj->tlspoffset);
	+ else
	+ off = calculate_tls_offset(tls_last_offset, tls_last_size,
	+ obj->tlssize, obj->tlsalign, obj->tlspoffset);

	- obj->tlsoffset = off;
	+ obj->tlsoffset = off;
	#ifdef TLS_VARIANT_I
	- off += obj->tlssize;
	+ off += obj->tlssize;
	#endif

	- /*
	- * If we have already fixed the size of the static TLS block, we
	- * must stay within that size. When allocating the static TLS, we
	- * leave a small amount of space spare to be used for dynamically
	- * loading modules which use static TLS.
	- */
	- if (tls_static_space != 0) {
	- if (off > tls_static_space)
	- return (false);
	- } else if (obj->tlsalign > tls_static_max_align) {
	- tls_static_max_align = obj->tlsalign;
	- }
	+ /*
	+ * If we have already fixed the size of the static TLS block, we
	+ * must stay within that size. When allocating the static TLS, we
	+ * leave a small amount of space spare to be used for dynamically
	+ * loading modules which use static TLS.
	+ */
	+ if (tls_static_space != 0) {
	+ if (off > tls_static_space)
	+ return (false);
	+ } else if (obj->tlsalign > tls_static_max_align) {
	+ tls_static_max_align = obj->tlsalign;
	+ }

	- tls_last_offset = off;
	- tls_last_size = obj->tlssize;
	- obj->tls_static = true;
	+ tls_last_offset = off;
	+ tls_last_size = obj->tlssize;
	+ obj->tls_static = true;

	- return (true);
	+ return (true);
	}

	void
	free_tls_offset(Obj_Entry *obj)
	{
	+ /*
	+ * If we were the last thing to allocate out of the static TLS
	+ * block, we give our space back to the 'allocator'. This is a
	+ * simplistic workaround to allow libGL.so.1 to be loaded and
	+ * unloaded multiple times.
	+ */
	+ size_t off = obj->tlsoffset;

	- /*
	- * If we were the last thing to allocate out of the static TLS
	- * block, we give our space back to the 'allocator'. This is a
	- * simplistic workaround to allow libGL.so.1 to be loaded and
	- * unloaded multiple times.
	- */
	- size_t off = obj->tlsoffset;
	#ifdef TLS_VARIANT_I
	- off += obj->tlssize;
	+ off += obj->tlssize;
	#endif
	- if (off == tls_last_offset) {
	- tls_last_offset -= obj->tlssize;
	- tls_last_size = 0;
	- }
	+ if (off == tls_last_offset) {
	+ tls_last_offset -= obj->tlssize;
	+ tls_last_size = 0;
	+ }
	}

	void *
	_rtld_allocate_tls(void *oldtls, size_t tcbsize, size_t tcbalign)
	{
	- void *ret;
	- RtldLockState lockstate;
	+ void *ret;
	+ RtldLockState lockstate;

	- wlock_acquire(rtld_bind_lock, &lockstate);
	- ret = allocate_tls(globallist_curr(TAILQ_FIRST(&obj_list)), oldtls,
	- tcbsize, tcbalign);
	- lock_release(rtld_bind_lock, &lockstate);
	- return (ret);
	+ wlock_acquire(rtld_bind_lock, &lockstate);
	+ ret = allocate_tls(globallist_curr(TAILQ_FIRST(&obj_list)), oldtls,
	+ tcbsize, tcbalign);
	+ lock_release(rtld_bind_lock, &lockstate);
	+ return (ret);
	}

	void
	_rtld_free_tls(void *tcb, size_t tcbsize, size_t tcbalign)
	{
	- RtldLockState lockstate;
	+ RtldLockState lockstate;

	- wlock_acquire(rtld_bind_lock, &lockstate);
	- free_tls(tcb, tcbsize, tcbalign);
	- lock_release(rtld_bind_lock, &lockstate);
	+ wlock_acquire(rtld_bind_lock, &lockstate);
	+ free_tls(tcb, tcbsize, tcbalign);
	+ lock_release(rtld_bind_lock, &lockstate);
	}

	static void
	object_add_name(Obj_Entry obj, const char name)
	{
	- Name_Entry *entry;
	- size_t len;
	+ Name_Entry *entry;
	+ size_t len;

	- len = strlen(name);
	- entry = malloc(sizeof(Name_Entry) + len);
	+ len = strlen(name);
	+ entry = malloc(sizeof(Name_Entry) + len);

	- if (entry != NULL) {
	- strcpy(entry->name, name);
	- STAILQ_INSERT_TAIL(&obj->names, entry, link);
	- }
	+ if (entry != NULL) {
	+ strcpy(entry->name, name);
	+ STAILQ_INSERT_TAIL(&obj->names, entry, link);
	+ }
	}

	static int
	object_match_name(const Obj_Entry obj, const char name)
	{
	- Name_Entry *entry;
	+ Name_Entry *entry;

	- STAILQ_FOREACH(entry, &obj->names, link) {
	- if (strcmp(name, entry->name) == 0)
	- return (1);
	- }
	- return (0);
	+ STAILQ_FOREACH(entry, &obj->names, link) {
	+ if (strcmp(name, entry->name) == 0)
	+ return (1);
	+ }
	+ return (0);
	}

	static Obj_Entry *
	locate_dependency(const Obj_Entry obj, const char name)
	{
	- const Objlist_Entry *entry;
	- const Needed_Entry *needed;
	+ const Objlist_Entry *entry;
	+ const Needed_Entry *needed;

	- STAILQ_FOREACH(entry, &list_main, link) {
	- if (object_match_name(entry->obj, name))
	- return (entry->obj);
	- }
	+ STAILQ_FOREACH(entry, &list_main, link) {
	+ if (object_match_name(entry->obj, name))
	+ return (entry->obj);
	+ }

	- for (needed = obj->needed; needed != NULL; needed = needed->next) {
	- if (strcmp(obj->strtab + needed->name, name) == 0 \|\|
	- (needed->obj != NULL && object_match_name(needed->obj, name))) {
	- /*
	- * If there is DT_NEEDED for the name we are looking for,
	- * we are all set. Note that object might not be found if
	- * dependency was not loaded yet, so the function can
	- * return NULL here. This is expected and handled
	- * properly by the caller.
	- */
	- return (needed->obj);
	+ for (needed = obj->needed; needed != NULL; needed = needed->next) {
	+ if (strcmp(obj->strtab + needed->name, name) == 0 \|\|
	+ (needed->obj != NULL && object_match_name(needed->obj,
	+ name))) {
	+ /*
	+ * If there is DT_NEEDED for the name we are looking
	+ * for, we are all set. Note that object might not be
	+ * found if dependency was not loaded yet, so the
	+ * function can return NULL here. This is expected and
	+ * handled properly by the caller.
	+ */
	+ return (needed->obj);
	+ }
	}
	- }
	- _rtld_error("%s: Unexpected inconsistency: dependency %s not found",
	- obj->path, name);
	- rtld_die();
	+ _rtld_error("%s: Unexpected inconsistency: dependency %s not found",
	+ obj->path, name);
	+ rtld_die();
	}

	static int
	check_object_provided_version(Obj_Entry refobj, const Obj_Entry depobj,
	const Elf_Vernaux *vna)
	{
	- const Elf_Verdef *vd;
	- const char *vername;
	+ const Elf_Verdef *vd;
	+ const char *vername;

	- vername = refobj->strtab + vna->vna_name;
	- vd = depobj->verdef;
	- if (vd == NULL) {
	- _rtld_error("%s: version %s required by %s not defined",
	- depobj->path, vername, refobj->path);
	- return (-1);
	- }
	- for (;;) {
	- if (vd->vd_version != VER_DEF_CURRENT) {
	- _rtld_error("%s: Unsupported version %d of Elf_Verdef entry",
	- depobj->path, vd->vd_version);
	- return (-1);
	- }
	- if (vna->vna_hash == vd->vd_hash) {
	- const Elf_Verdaux aux = (const Elf_Verdaux )
	- ((const char *)vd + vd->vd_aux);
	- if (strcmp(vername, depobj->strtab + aux->vda_name) == 0)
	- return (0);
	+ vername = refobj->strtab + vna->vna_name;
	+ vd = depobj->verdef;
	+ if (vd == NULL) {
	+ _rtld_error("%s: version %s required by %s not defined",
	+ depobj->path, vername, refobj->path);
	+ return (-1);
	}
	- if (vd->vd_next == 0)
	- break;
	- vd = (const Elf_Verdef )((const char )vd + vd->vd_next);
	- }
	- if (vna->vna_flags & VER_FLG_WEAK)
	- return (0);
	- _rtld_error("%s: version %s required by %s not found",
	- depobj->path, vername, refobj->path);
	- return (-1);
	+ for (;;) {
	+ if (vd->vd_version != VER_DEF_CURRENT) {
	+ _rtld_error(
	+ "%s: Unsupported version %d of Elf_Verdef entry",
	+ depobj->path, vd->vd_version);
	+ return (-1);
	+ }
	+ if (vna->vna_hash == vd->vd_hash) {
	+ const Elf_Verdaux *aux =
	+ (const Elf_Verdaux )((const char )vd +
	+ vd->vd_aux);
	+ if (strcmp(vername, depobj->strtab + aux->vda_name) ==
	+ 0)
	+ return (0);
	+ }
	+ if (vd->vd_next == 0)
	+ break;
	+ vd = (const Elf_Verdef )((const char )vd + vd->vd_next);
	+ }
	+ if (vna->vna_flags & VER_FLG_WEAK)
	+ return (0);
	+ _rtld_error("%s: version %s required by %s not found", depobj->path,
	+ vername, refobj->path);
	+ return (-1);
	}

	static int
	rtld_verify_object_versions(Obj_Entry *obj)
	{
	- const Elf_Verneed *vn;
	- const Elf_Verdef *vd;
	- const Elf_Verdaux *vda;
	- const Elf_Vernaux *vna;
	- const Obj_Entry *depobj;
	- int maxvernum, vernum;
	+ const Elf_Verneed *vn;
	+ const Elf_Verdef *vd;
	+ const Elf_Verdaux *vda;
	+ const Elf_Vernaux *vna;
	+ const Obj_Entry *depobj;
	+ int maxvernum, vernum;

	- if (obj->ver_checked)
	- return (0);
	- obj->ver_checked = true;
	-
	- maxvernum = 0;
	- /*
	- * Walk over defined and required version records and figure out
	- * max index used by any of them. Do very basic sanity checking
	- * while there.
	- */
	- vn = obj->verneed;
	- while (vn != NULL) {
	- if (vn->vn_version != VER_NEED_CURRENT) {
	- _rtld_error("%s: Unsupported version %d of Elf_Verneed entry",
	- obj->path, vn->vn_version);
	- return (-1);
	- }
	- vna = (const Elf_Vernaux )((const char )vn + vn->vn_aux);
	- for (;;) {
	- vernum = VER_NEED_IDX(vna->vna_other);
	- if (vernum > maxvernum)
	- maxvernum = vernum;
	- if (vna->vna_next == 0)
	- break;
	- vna = (const Elf_Vernaux )((const char )vna + vna->vna_next);
	- }
	- if (vn->vn_next == 0)
	- break;
	- vn = (const Elf_Verneed )((const char )vn + vn->vn_next);
	- }
	-
	- vd = obj->verdef;
	- while (vd != NULL) {
	- if (vd->vd_version != VER_DEF_CURRENT) {
	- _rtld_error("%s: Unsupported version %d of Elf_Verdef entry",
	- obj->path, vd->vd_version);
	- return (-1);
	- }
	- vernum = VER_DEF_IDX(vd->vd_ndx);
	- if (vernum > maxvernum)
	- maxvernum = vernum;
	- if (vd->vd_next == 0)
	- break;
	- vd = (const Elf_Verdef )((const char )vd + vd->vd_next);
	- }
	-
	- if (maxvernum == 0)
	- return (0);
	+ if (obj->ver_checked)
	+ return (0);
	+ obj->ver_checked = true;

	- /*
	- * Store version information in array indexable by version index.
	- * Verify that object version requirements are satisfied along the
	- * way.
	- */
	- obj->vernum = maxvernum + 1;
	- obj->vertab = xcalloc(obj->vernum, sizeof(Ver_Entry));
	-
	- vd = obj->verdef;
	- while (vd != NULL) {
	- if ((vd->vd_flags & VER_FLG_BASE) == 0) {
	- vernum = VER_DEF_IDX(vd->vd_ndx);
	- assert(vernum <= maxvernum);
	- vda = (const Elf_Verdaux )((const char )vd + vd->vd_aux);
	- obj->vertab[vernum].hash = vd->vd_hash;
	- obj->vertab[vernum].name = obj->strtab + vda->vda_name;
	- obj->vertab[vernum].file = NULL;
	- obj->vertab[vernum].flags = 0;
	- }
	- if (vd->vd_next == 0)
	- break;
	- vd = (const Elf_Verdef )((const char )vd + vd->vd_next);
	- }
	-
	- vn = obj->verneed;
	- while (vn != NULL) {
	- depobj = locate_dependency(obj, obj->strtab + vn->vn_file);
	- if (depobj == NULL)
	- return (-1);
	- vna = (const Elf_Vernaux )((const char )vn + vn->vn_aux);
	- for (;;) {
	- if (check_object_provided_version(obj, depobj, vna))
	- return (-1);
	- vernum = VER_NEED_IDX(vna->vna_other);
	- assert(vernum <= maxvernum);
	- obj->vertab[vernum].hash = vna->vna_hash;
	- obj->vertab[vernum].name = obj->strtab + vna->vna_name;
	- obj->vertab[vernum].file = obj->strtab + vn->vn_file;
	- obj->vertab[vernum].flags = (vna->vna_other & VER_NEED_HIDDEN) ?
	- VER_INFO_HIDDEN : 0;
	- if (vna->vna_next == 0)
	- break;
	- vna = (const Elf_Vernaux )((const char )vna + vna->vna_next);
	- }
	- if (vn->vn_next == 0)
	- break;
	- vn = (const Elf_Verneed )((const char )vn + vn->vn_next);
	- }
	- return (0);
	+ maxvernum = 0;
	+ /*
	+ * Walk over defined and required version records and figure out
	+ * max index used by any of them. Do very basic sanity checking
	+ * while there.
	+ */
	+ vn = obj->verneed;
	+ while (vn != NULL) {
	+ if (vn->vn_version != VER_NEED_CURRENT) {
	+ _rtld_error(
	+ "%s: Unsupported version %d of Elf_Verneed entry",
	+ obj->path, vn->vn_version);
	+ return (-1);
	+ }
	+ vna = (const Elf_Vernaux )((const char )vn + vn->vn_aux);
	+ for (;;) {
	+ vernum = VER_NEED_IDX(vna->vna_other);
	+ if (vernum > maxvernum)
	+ maxvernum = vernum;
	+ if (vna->vna_next == 0)
	+ break;
	+ vna = (const Elf_Vernaux )((const char )vna +
	+ vna->vna_next);
	+ }
	+ if (vn->vn_next == 0)
	+ break;
	+ vn = (const Elf_Verneed )((const char )vn + vn->vn_next);
	+ }
	+
	+ vd = obj->verdef;
	+ while (vd != NULL) {
	+ if (vd->vd_version != VER_DEF_CURRENT) {
	+ _rtld_error(
	+ "%s: Unsupported version %d of Elf_Verdef entry",
	+ obj->path, vd->vd_version);
	+ return (-1);
	+ }
	+ vernum = VER_DEF_IDX(vd->vd_ndx);
	+ if (vernum > maxvernum)
	+ maxvernum = vernum;
	+ if (vd->vd_next == 0)
	+ break;
	+ vd = (const Elf_Verdef )((const char )vd + vd->vd_next);
	+ }
	+
	+ if (maxvernum == 0)
	+ return (0);
	+
	+ /*
	+ * Store version information in array indexable by version index.
	+ * Verify that object version requirements are satisfied along the
	+ * way.
	+ */
	+ obj->vernum = maxvernum + 1;
	+ obj->vertab = xcalloc(obj->vernum, sizeof(Ver_Entry));
	+
	+ vd = obj->verdef;
	+ while (vd != NULL) {
	+ if ((vd->vd_flags & VER_FLG_BASE) == 0) {
	+ vernum = VER_DEF_IDX(vd->vd_ndx);
	+ assert(vernum <= maxvernum);
	+ vda = (const Elf_Verdaux )((const char )vd +
	+ vd->vd_aux);
	+ obj->vertab[vernum].hash = vd->vd_hash;
	+ obj->vertab[vernum].name = obj->strtab + vda->vda_name;
	+ obj->vertab[vernum].file = NULL;
	+ obj->vertab[vernum].flags = 0;
	+ }
	+ if (vd->vd_next == 0)
	+ break;
	+ vd = (const Elf_Verdef )((const char )vd + vd->vd_next);
	+ }
	+
	+ vn = obj->verneed;
	+ while (vn != NULL) {
	+ depobj = locate_dependency(obj, obj->strtab + vn->vn_file);
	+ if (depobj == NULL)
	+ return (-1);
	+ vna = (const Elf_Vernaux )((const char )vn + vn->vn_aux);
	+ for (;;) {
	+ if (check_object_provided_version(obj, depobj, vna))
	+ return (-1);
	+ vernum = VER_NEED_IDX(vna->vna_other);
	+ assert(vernum <= maxvernum);
	+ obj->vertab[vernum].hash = vna->vna_hash;
	+ obj->vertab[vernum].name = obj->strtab + vna->vna_name;
	+ obj->vertab[vernum].file = obj->strtab + vn->vn_file;
	+ obj->vertab[vernum].flags = (vna->vna_other &
	+ VER_NEED_HIDDEN) != 0 ? VER_INFO_HIDDEN : 0;
	+ if (vna->vna_next == 0)
	+ break;
	+ vna = (const Elf_Vernaux )((const char )vna +
	+ vna->vna_next);
	+ }
	+ if (vn->vn_next == 0)
	+ break;
	+ vn = (const Elf_Verneed )((const char )vn + vn->vn_next);
	+ }
	+ return (0);
	}

	static int
	rtld_verify_versions(const Objlist *objlist)
	{
	- Objlist_Entry *entry;
	- int rc;
	+ Objlist_Entry *entry;
	+ int rc;

	- rc = 0;
	- STAILQ_FOREACH(entry, objlist, link) {
	- /*
	- * Skip dummy objects or objects that have their version requirements
	- * already checked.
	- */
	- if (entry->obj->strtab == NULL \|\| entry->obj->vertab != NULL)
	- continue;
	- if (rtld_verify_object_versions(entry->obj) == -1) {
	- rc = -1;
	- if (ld_tracing == NULL)
	- break;
	+ rc = 0;
	+ STAILQ_FOREACH(entry, objlist, link) {
	+ /*
	+ * Skip dummy objects or objects that have their version
	+ * requirements already checked.
	+ */
	+ if (entry->obj->strtab == NULL \|\| entry->obj->vertab != NULL)
	+ continue;
	+ if (rtld_verify_object_versions(entry->obj) == -1) {
	+ rc = -1;
	+ if (ld_tracing == NULL)
	+ break;
	+ }
	}
	- }
	- if (rc == 0 \|\| ld_tracing != NULL)
	- rc = rtld_verify_object_versions(&obj_rtld);
	- return (rc);
	+ if (rc == 0 \|\| ld_tracing != NULL)
	+ rc = rtld_verify_object_versions(&obj_rtld);
	+ return (rc);
	}

	const Ver_Entry *
	fetch_ventry(const Obj_Entry *obj, unsigned long symnum)
	{
	- Elf_Versym vernum;
	+ Elf_Versym vernum;

	- if (obj->vertab) {
	- vernum = VER_NDX(obj->versyms[symnum]);
	- if (vernum >= obj->vernum) {
	- _rtld_error("%s: symbol %s has wrong verneed value %d",
	- obj->path, obj->strtab + symnum, vernum);
	- } else if (obj->vertab[vernum].hash != 0) {
	- return (&obj->vertab[vernum]);
	+ if (obj->vertab) {
	+ vernum = VER_NDX(obj->versyms[symnum]);
	+ if (vernum >= obj->vernum) {
	+ _rtld_error("%s: symbol %s has wrong verneed value %d",
	+ obj->path, obj->strtab + symnum, vernum);
	+ } else if (obj->vertab[vernum].hash != 0) {
	+ return (&obj->vertab[vernum]);
	+ }
	}
	- }
	- return (NULL);
	+ return (NULL);
	}

	int
	_rtld_get_stack_prot(void)
	{
	-
	return (stack_prot);
	}

	@@ -5902,22 +5985,20 @@
	caddr_t relro_page;
	size_t relro_size;

	- for (ph = obj->phdr; (const char )ph < (const char )obj->phdr +
	+ for (ph = obj->phdr; (const char )ph < (const char )obj->phdr +
	obj->phsize; ph++) {
	- switch (ph->p_type) {
	- case PT_GNU_RELRO:
	- relro_page = obj->relocbase +
	- rtld_trunc_page(ph->p_vaddr);
	- relro_size =
	- rtld_round_page(ph->p_vaddr + ph->p_memsz) -
	- rtld_trunc_page(ph->p_vaddr);
	- if (mprotect(relro_page, relro_size, prot) == -1) {
	- _rtld_error("%s: Cannot set relro protection to %#x: %s",
	- obj->path, prot, rtld_strerror(errno));
	- return (-1);
	- }
	- break;
	+ if (ph->p_type != PT_GNU_RELRO)
	+ continue;
	+ relro_page = obj->relocbase + rtld_trunc_page(ph->p_vaddr);
	+ relro_size = rtld_round_page(ph->p_vaddr + ph->p_memsz) -
	+ rtld_trunc_page(ph->p_vaddr);
	+ if (mprotect(relro_page, relro_size, prot) == -1) {
	+ _rtld_error(
	+ "%s: Cannot set relro protection to %#x: %s",
	+ obj->path, prot, rtld_strerror(errno));
	+ return (-1);
	}
	+ break;
	}
	return (0);
	}
	@@ -5925,14 +6006,12 @@
	static int
	obj_disable_relro(Obj_Entry *obj)
	{
	-
	return (obj_remap_relro(obj, PROT_READ \| PROT_WRITE));
	}

	static int
	obj_enforce_relro(Obj_Entry *obj)
	{
	-
	return (obj_remap_relro(obj, PROT_READ));
	}

	@@ -5943,8 +6022,9 @@

	if ((max_stack_flags & PF_X) == 0 \|\| (stack_prot & PROT_EXEC) != 0)
	return;
	- thr_map_stacks_exec = (void (*)(void))(uintptr_t)
	- get_program_var_addr("__pthread_map_stacks_exec", lockstate);
	+ thr_map_stacks_exec = (void (*)(void))(
	+ uintptr_t)get_program_var_addr("__pthread_map_stacks_exec",
	+ lockstate);
	if (thr_map_stacks_exec != NULL) {
	stack_prot \|= PROT_EXEC;
	thr_map_stacks_exec();
	@@ -5958,8 +6038,9 @@
	Obj_Entry *obj;
	void (distrib)(size_t, void , size_t, size_t);

	- distrib = (void ()(size_t, void , size_t, size_t))(uintptr_t)
	- get_program_var_addr("__pthread_distribute_static_tls", lockstate);
	+ distrib = (void ()(size_t, void , size_t, size_t))(
	+ uintptr_t)get_program_var_addr("__pthread_distribute_static_tls",
	+ lockstate);
	if (distrib == NULL)
	return;
	STAILQ_FOREACH(elm, list, link) {
	@@ -5977,7 +6058,6 @@
	void
	symlook_init(SymLook dst, const char name)
	{
	-
	bzero(dst, sizeof(*dst));
	dst->name = name;
	dst->hash = elf_hash(name);
	@@ -5987,7 +6067,6 @@
	static void
	symlook_init_from_req(SymLook dst, const SymLook src)
	{
	-
	dst->name = src->name;
	dst->hash = src->hash;
	dst->hash_gnu = src->hash_gnu;
	@@ -5999,8 +6078,7 @@
	}

	static int
	-open_binary_fd(const char *argv0, bool search_in_path,
	- const char **binpath_res)
	+open_binary_fd(const char argv0, bool search_in_path, const char *binpath_res)
	{
	char binpath, pathenv, pe, res1;
	const char *res;
	@@ -6064,7 +6142,7 @@
	* Parse a set of command-line arguments.
	*/
	static int
	-parse_args(char* argv[], int argc, bool use_pathp, int fdp,
	+parse_args(char argv[], int argc, bool use_pathp, int *fdp,
	const char *argv0, bool dir_ignore)
	{
	const char *arg;
	@@ -6080,7 +6158,7 @@
	*dir_ignore = false;
	seen_b = seen_f = false;

	- for (i = 1; i < argc; i++ ) {
	+ for (i = 1; i < argc; i++) {
	arg = argv[i];
	dbg("argv[%d]: '%s'", i, arg);

	@@ -6177,8 +6255,7 @@
	}
	}
	if (ll == nitems(ld_env_vars)) {
	- _rtld_error("Unknown LD_ option %s",
	- n);
	+ _rtld_error("Unknown LD_ option %s", n);
	rtld_die();
	}
	} else if (opt == 'p') {
	@@ -6207,12 +6284,10 @@
	"Hint file %s\n"
	"libmap file %s\n"
	"Optional static TLS size %zd bytes\n",
	- machine,
	- __FreeBSD_version, ld_standard_library_path,
	- gethints(false),
	+ machine, __FreeBSD_version,
	+ ld_standard_library_path, gethints(false),
	ld_env_prefix, ld_elf_hints_default,
	- ld_elf_hints_path,
	- ld_path_libmap_conf,
	+ ld_elf_hints_path, ld_path_libmap_conf,
	ld_static_tls_extra);
	_exit(0);
	} else {
	@@ -6234,7 +6309,7 @@
	static int
	parse_integer(const char *str)
	{
	- static const int RADIX = 10; /* XXXJA: possibly support hex? */
	+ static const int RADIX = 10; /* XXXJA: possibly support hex? */
	const char *orig;
	int n;
	char c;
	@@ -6258,7 +6333,6 @@
	static void
	print_usage(const char *argv0)
	{
	-
	rtld_printf(
	"Usage: %s [-h] [-b <exe>] [-d] [-f <FD>] [-p] [--] <binary> [<args>]\n"
	"\n"
	@@ -6273,10 +6347,11 @@
	" -v Display identification information\n"
	" -- End of RTLD options\n"
	" <binary> Name of process to execute\n"
	- " <args> Arguments to the executed process\n", argv0);
	+ " <args> Arguments to the executed process\n",
	+ argv0);
	}

	-#define AUXFMT(at, xfmt) [at] = { .name = #at, .fmt = xfmt }
	+#define AUXFMT(at, xfmt) [at] = { .name = #at, .fmt = xfmt }
	static const struct auxfmt {
	const char *name;
	const char *fmt;
	@@ -6421,7 +6496,6 @@
	const char *
	rtld_strerror(int errnum)
	{
	-
	if (errnum < 0 \|\| errnum >= sys_nerr)
	return ("Unknown error");
	return (sys_errlist[errnum]);
	@@ -6438,28 +6512,24 @@
	void *
	malloc(size_t nbytes)
	{
	-
	return (__crt_malloc(nbytes));
	}

	void *
	calloc(size_t num, size_t size)
	{
	-
	return (__crt_calloc(num, size));
	}

	void
	free(void *cp)
	{
	-
	__crt_free(cp);
	}

	void *
	realloc(void *cp, size_t nbytes)
	{
	-
	return (__crt_realloc(cp, nbytes));
	}

File Metadata

Mime Type: text/plain
Expires: Sun, Nov 1, 12:03 PM (22 h, 32 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 41285303
Default Alt Text: D48509.1793534591.diff (256 KB)

D48509.1793534591.diffNo OneTemporaryActions

D48509.1793534591.diffView Options

File Metadata

Event Timeline

D48509.1793534591.diff
No OneTemporary
Actions

D48509.1793534591.diff
View Options