 @@ -1,228 +1,231 @@
-/*	$NetBSD: reloc.c,v 1.104 2011/06/25 05:45:12 nonaka Exp $	 */
+/*	$NetBSD: reloc.c,v 1.105 2011/12/02 09:06:49 skrll Exp $	 */
 /*
  * Copyright 1996 John D. Polstra.
  * Copyright 1996 Matt Thomas <matt@3am-software.com>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
  *      This product includes software developed by John Polstra.
  * 4. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * Dynamic linker for ELF.
+ *
  * John Polstra <jdp@polstra.com>.
  */
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: reloc.c,v 1.104 2011/06/25 05:45:12 nonaka Exp $");
+__RCSID("$NetBSD: reloc.c,v 1.105 2011/12/02 09:06:49 skrll Exp $");
 #endif /* not lint */
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/mman.h>
 #include <sys/bitops.h>
 #include <dirent.h>
 #include "debug.h"
 #include "rtld.h"
 #ifndef RTLD_INHIBIT_COPY_RELOCS
 static int _rtld_do_copy_relocation(const Obj_Entry *, const Elf_Rela *);
 static int
 _rtld_do_copy_relocation(const Obj_Entry *dstobj, const Elf_Rela *rela)
+{
 	void           *dstaddr = (void *)(dstobj->relocbase + rela->r_offset);
 	const Elf_Sym  *dstsym = dstobj->symtab + ELF_R_SYM(rela->r_info);
 	const char     *name = dstobj->strtab + dstsym->st_name;
 	unsigned long   hash = _rtld_elf_hash(name);
 	size_t          size = dstsym->st_size;
 	const void     *srcaddr;
 	const Elf_Sym  *srcsym = NULL;
 	Obj_Entry      *srcobj;
 	for (srcobj = dstobj->next; srcobj != NULL; srcobj = srcobj->next) {
 		srcsym = _rtld_symlook_obj(name, hash, srcobj, 0,
 		    _rtld_fetch_ventry(dstobj, ELF_R_SYM(rela->r_info)));
 		if (srcsym != NULL)
 			break;
+	}
 	if (srcobj == NULL) {
 		_rtld_error("Undefined symbol \"%s\" referenced from COPY"
 		    " relocation in %s", name, dstobj->path);
 		return (-1);
+	}
 	srcaddr = (const void *)(srcobj->relocbase + srcsym->st_value);
 	(void)memcpy(dstaddr, srcaddr, size);
 	rdbg(("COPY %s %s %s --> src=%p dst=%p size %ld",
 	    dstobj->path, srcobj->path, name, srcaddr,
 	    (void *)dstaddr, (long)size));
 	return (0);
+}
 #endif /* RTLD_INHIBIT_COPY_RELOCS */
 /*
  * Process the special R_xxx_COPY relocations in the main program.  These
  * copy data from a shared object into a region in the main program's BSS
  * segment.
+ *
  * Returns 0 on success, -1 on failure.
  */
 int
 _rtld_do_copy_relocations(const Obj_Entry *dstobj)
+{
 #ifndef RTLD_INHIBIT_COPY_RELOCS
 	/* COPY relocations are invalid elsewhere */
 	assert(!dstobj->isdynamic);
 	if (dstobj->rel != NULL) {
 		const Elf_Rel  *rel;
 		for (rel = dstobj->rel; rel < dstobj->rellim; ++rel) {
 			if (ELF_R_TYPE(rel->r_info) == R_TYPE(COPY)) {
 				Elf_Rela        ourrela;
 				ourrela.r_info = rel->r_info;
 				ourrela.r_offset = rel->r_offset;
 				ourrela.r_addend = 0;
 				if (_rtld_do_copy_relocation(dstobj,
 				    &ourrela) < 0)
 					return (-1);
+			}
+		}
+	}
 	if (dstobj->rela != NULL) {
 		const Elf_Rela *rela;
 		for (rela = dstobj->rela; rela < dstobj->relalim; ++rela) {
 			if (ELF_R_TYPE(rela->r_info) == R_TYPE(COPY)) {
 				if (_rtld_do_copy_relocation(dstobj, rela) < 0)
 					return (-1);
+			}
+		}
+	}
 #endif /* RTLD_INHIBIT_COPY_RELOCS */
 	return (0);
+}
 /*
  * Relocate newly-loaded shared objects.  The argument is a pointer to
  * the Obj_Entry for the first such object.  All objects from the first
  * to the end of the list of objects are relocated.  Returns 0 on success,
  * or -1 on failure.
  */
 int
 _rtld_relocate_objects(Obj_Entry *first, bool bind_now)
+{
 	Obj_Entry *obj;
 	int ok = 1;
 	for (obj = first; obj != NULL; obj = obj->next) {
 		if (obj->nbuckets == 0 || obj->nchains == 0 ||
 		    obj->buckets == NULL || obj->symtab == NULL ||
 		    obj->strtab == NULL) {
 			_rtld_error("%s: Shared object has no run-time"
 			    " symbol table", obj->path);
 			return -1;
+		}
 		if (obj->nbuckets == UINT32_MAX) {
 			_rtld_error("%s: Symbol table too large", obj->path);
 			return -1;
+		}
 		rdbg((" relocating %s (%ld/%ld rel/rela, %ld/%ld plt rel/rela)",
 		    obj->path,
 		    (long)(obj->rellim - obj->rel),
 		    (long)(obj->relalim - obj->rela),
 		    (long)(obj->pltrellim - obj->pltrel),
 		    (long)(obj->pltrelalim - obj->pltrela)));
 		if (obj->textrel) {
 			/*
 			 * There are relocations to the write-protected text
 			 * segment.
 			 */
 			if (mprotect(obj->mapbase, obj->textsize,
 				PROT_READ | PROT_WRITE | PROT_EXEC) == -1) {
 				_rtld_error("%s: Cannot write-enable text "
 				    "segment: %s", obj->path, xstrerror(errno));
 				return -1;
+			}
+		}
 		dbg(("doing non-PLT relocations"));
 		if (_rtld_relocate_nonplt_objects(obj) < 0)
 			ok = 0;
 		if (obj->textrel) {	/* Re-protected the text segment. */
 			if (mprotect(obj->mapbase, obj->textsize,
 				     PROT_READ | PROT_EXEC) == -1) {
 				_rtld_error("%s: Cannot write-protect text "
 				    "segment: %s", obj->path, xstrerror(errno));
 				return -1;
+			}
+		}
 		dbg(("doing lazy PLT binding"));
 		if (_rtld_relocate_plt_lazy(obj) < 0)
 			ok = 0;
 #if defined(__hppa__)
 		bind_now = 1;
 #endif
 		if (obj->z_now || bind_now) {
 			dbg(("doing immediate PLT binding"));
 			if (_rtld_relocate_plt_objects(obj) < 0)
 				ok = 0;
+		}
 		if (!ok)
 			return -1;
 		/* Set some sanity-checking numbers in the Obj_Entry. */
 		obj->magic = RTLD_MAGIC;
 		obj->version = RTLD_VERSION;
-		/* Fill in the dynamic linker entry points. */
+		/*
 		 * Fill in the backwards compatibility dynamic linker entry points.
+		 *
 		 * DO NOT ADD TO THIS LIST
 		 */
 		obj->dlopen = dlopen;
 		obj->dlsym = dlsym;
 		obj->dlvsym = dlvsym;
 		obj->dlerror = dlerror;
 		obj->dlclose = dlclose;
 		obj->dladdr = dladdr;
 		dbg(("fixing up PLTGOT"));
 		/* Set the special PLTGOT entries. */
 		if (obj->pltgot != NULL)
 			_rtld_setup_pltgot(obj);
+	}
 	return 0;
+}

 @@ -1,453 +1,457 @@
-/*	$NetBSD: rtld.h,v 1.106 2011/06/25 05:45:12 nonaka Exp $	 */
+/*	$NetBSD: rtld.h,v 1.107 2011/12/02 09:06:49 skrll Exp $	 */
 /*
  * Copyright 1996 John D. Polstra.
  * Copyright 1996 Matt Thomas <matt@3am-software.com>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
  *      This product includes software developed by John Polstra.
  * 4. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #ifndef RTLD_H
 #define RTLD_H
 #include <dlfcn.h>
 #include <signal.h>
 #include <stdbool.h>
 #include <stddef.h>
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/queue.h>
 #include <sys/exec_elf.h>
 #include <sys/tls.h>
 #include "rtldenv.h"
 #include "link.h"
 #if defined(_RTLD_SOURCE)
 #ifndef	RTLD_DEFAULT_LIBRARY_PATH
 #define	RTLD_DEFAULT_LIBRARY_PATH	"/usr/lib"
 #endif
 #define _PATH_LD_HINTS			"/etc/ld.so.conf"
 extern size_t _rtld_pagesz;
 #define round_down(x)	((x) & ~(_rtld_pagesz - 1))
 #define round_up(x)	round_down((x) + _rtld_pagesz - 1)
 #define NEW(type)	((type *) xmalloc(sizeof(type)))
 #define CNEW(type)	((type *) xcalloc(sizeof(type)))
 /*
  * Fill in a DoneList with an allocation large enough to hold all of
  * the currently-loaded objects. Keep this in a macro since it calls
  * alloca and we want that to occur within the scope of the caller.
  */
 #define _rtld_donelist_init(dlp)					\
     ((dlp)->num_alloc = _rtld_objcount,					\
     (dlp)->objs = alloca((dlp)->num_alloc * sizeof((dlp)->objs[0])),	\
     assert((dlp)->objs != NULL),					\
     (dlp)->num_used = 0)
 #endif /* _RTLD_SOURCE */
 /*
  * C++ has mandated the use of the following keywords for its new boolean
  * type.  We might as well follow their lead.
  */
 struct Struct_Obj_Entry;
 typedef struct Struct_Objlist_Entry {
 	SIMPLEQ_ENTRY(Struct_Objlist_Entry) link;
 	struct Struct_Obj_Entry *obj;
 } Objlist_Entry;
 typedef SIMPLEQ_HEAD(Struct_Objlist, Struct_Objlist_Entry) Objlist;
 typedef struct Struct_Name_Entry {
 	STAILQ_ENTRY(Struct_Name_Entry)	link;
 	char	name[1];
 } Name_Entry;
 typedef struct Struct_Needed_Entry {
 	struct Struct_Needed_Entry *next;
 	struct Struct_Obj_Entry *obj;
 	unsigned long   name;	/* Offset of name in string table */
 } Needed_Entry;
 typedef struct _rtld_search_path_t {
 	struct _rtld_search_path_t *sp_next;
 	const char     *sp_path;
 	size_t          sp_pathlen;
 } Search_Path;
 typedef struct Struct_Ver_Entry {
 	Elf_Word        hash;
 	u_int           flags;
 	const char     *name;
 	const char     *file;
 } Ver_Entry;
 /* Ver_Entry.flags */
 #define VER_INFO_HIDDEN	0x01
 #define RTLD_MAX_ENTRY 10
 #define RTLD_MAX_LIBRARY 4
 #define RTLD_MAX_CTL 2
 typedef struct _rtld_library_xform_t {
 	struct _rtld_library_xform_t *next;
 	char *name;
 	const char *ctlname;
 	struct {
 		char *value;
 		char *library[RTLD_MAX_LIBRARY];
 	} entry[RTLD_MAX_ENTRY];
 } Library_Xform;
 /*
  * Shared object descriptor.
+ *
  * Items marked with "(%)" are dynamically allocated, and must be freed
  * when the structure is destroyed.
+ *
  * The layout of this structure needs to be preserved because pre-2.0 binaries
  * hard-coded the location of dlopen() and friends.
  */
 #define RTLD_MAGIC	0xd550b87a
 #define RTLD_VERSION	1
 typedef struct Struct_Obj_Entry {
 	Elf32_Word      magic;		/* Magic number (sanity check) */
 	Elf32_Word      version;	/* Version number of struct format */
 	struct Struct_Obj_Entry *next;
 	char           *path;		/* Pathname of underlying file (%) */
 	int             refcount;
 	int             dl_refcount;	/* Number of times loaded by dlopen */
 	/* These items are computed by map_object() or by digest_phdr(). */
 	caddr_t         mapbase;	/* Base address of mapped region */
 	size_t          mapsize;	/* Size of mapped region in bytes */
 	size_t          textsize;	/* Size of text segment in bytes */
 	Elf_Addr        vaddrbase;	/* Base address in shared object file */
 	caddr_t         relocbase;	/* Reloc const = mapbase - *vaddrbase */
 	Elf_Dyn        *dynamic;	/* Dynamic section */
 	caddr_t         entry;		/* Entry point */
 	const Elf_Phdr *phdr;		/* Program header (may be xmalloc'ed) */
 	size_t		phsize;		/* Size of program header in bytes */
 	/* Items from the dynamic section. */
 	Elf_Addr       *pltgot;		/* PLTGOT table */
 	const Elf_Rel  *rel;		/* Relocation entries */
 	const Elf_Rel  *rellim;		/* Limit of Relocation entries */
 	const Elf_Rela *rela;		/* Relocation entries */
 	const Elf_Rela *relalim;	/* Limit of Relocation entries */
 	const Elf_Rel  *pltrel;		/* PLT relocation entries */
 	const Elf_Rel  *pltrellim;	/* Limit of PLT relocation entries */
 	const Elf_Rela *pltrela;	/* PLT relocation entries */
 	const Elf_Rela *pltrelalim;	/* Limit of PLT relocation entries */
 	const Elf_Sym  *symtab;		/* Symbol table */
 	const char     *strtab;		/* String table */
 	unsigned long   strsize;	/* Size in bytes of string table */
 #ifdef __mips__
 	Elf_Word        local_gotno;	/* Number of local GOT entries */
 	Elf_Word        symtabno;	/* Number of dynamic symbols */
 	Elf_Word        gotsym;		/* First dynamic symbol in GOT */
 #endif
 	const Elf_Symindx *buckets;	/* Hash table buckets array */
 	unsigned long	unused1;	/* Used to be nbuckets */
 	const Elf_Symindx *chains;	/* Hash table chain array */
 	unsigned long   nchains;	/* Number of chains */
 	Search_Path    *rpaths;		/* Search path specified in object */
 	Needed_Entry   *needed;		/* Shared objects needed by this (%) */
 	void            (*init)(void); 	/* Initialization function to call */
 	void            (*fini)(void);	/* Termination function to call */
-	/* Entry points for dlopen() and friends. */
+	/*
 	 * BACKWARDS COMPAT Entry points for dlopen() and friends.
+	 *
 	 * DO NOT MOVE OR ADD TO THE LIST
+	 *
 	 */
 	void           *(*dlopen)(const char *, int);
 	void           *(*dlsym)(void *, const char *);
 	void           *(*dlvsym)(void *, const char *, const char *);
 	char           *(*dlerror)(void);
 	int             (*dlclose)(void *);
 	int             (*dladdr)(const void *, Dl_info *);
 	u_int32_t	mainprog:1,	/* True if this is the main program */
 	        	rtld:1,		/* True if this is the dynamic linker */
 			textrel:1,	/* True if there are relocations to
 					 * text seg */
 			symbolic:1,	/* True if generated with
 					 * "-Bsymbolic" */
 			printed:1,	/* True if ldd has printed it */
 			isdynamic:1,	/* True if this is a pure PIC object */
 			mainref:1,	/* True if on _rtld_list_main */
 			globalref:1,	/* True if on _rtld_list_global */
 			init_done:1,	/* True if .init has been added */
 			init_called:1,	/* True if .init function has been
 					 * called */
 			fini_called:1,	/* True if .fini function has been
 					 * called */
 			z_now:1,	/* True if object's symbols should be
 					   bound immediately */
 			z_nodelete:1,	/* True if object should never be
 					   unloaded */
 			z_initfirst:1,	/* True if object's .init/.fini take
 					 * priority over others */
 			z_noopen:1,	/* True if object should never be
 					   dlopen'ed */
 			phdr_loaded:1,	/* Phdr is loaded and doesn't need to
 					 * be freed. */
 #if defined(__HAVE_TLS_VARIANT_I) || defined(__HAVE_TLS_VARIANT_II)
 			tls_done:1,	/* True if static TLS offset
 					 * has been allocated */
 #endif
 			ref_nodel:1;	/* Refcount increased to prevent dlclose */
 	struct link_map linkmap;	/* for GDB */
 	/* These items are computed by map_object() or by digest_phdr(). */
 	const char     *interp;	/* Pathname of the interpreter, if any */
 	Objlist         dldags;	/* Object belongs to these dlopened DAGs (%) */
 	Objlist         dagmembers;	/* DAG has these members (%) */
 	dev_t           dev;		/* Object's filesystem's device */
 	ino_t           ino;		/* Object's inode number */
 	void		*ehdr;
 	uint32_t        nbuckets;	/* Number of buckets */
 	uint32_t        nbuckets_m;	/* Precomputed for fast remainder */
 	uint8_t         nbuckets_s1;
 	uint8_t         nbuckets_s2;
 	size_t		pathlen;	/* Pathname length */
 	STAILQ_HEAD(, Struct_Name_Entry) names;	/* List of names for this object we
 						   know about. */
 #ifdef __powerpc__
 	Elf_Addr       *gotptr;		/* GOT table (secure-plt only) */
 #endif
 #if defined(__HAVE_TLS_VARIANT_I) || defined(__HAVE_TLS_VARIANT_II)
 	/* Thread Local Storage support for this module */
 	size_t		tlsindex;	/* Index in DTV */
 	void		*tlsinit;	/* Base address of TLS init block */
 	size_t		tlsinitsize;	/* Size of TLS init block */
 	size_t		tlssize;	/* Size of TLS block */
 	size_t		tlsoffset;	/* Offset in the static TLS block */
 	size_t		tlsalign;	/* Needed alignment for static TLS */
 #endif
 	/* symbol versioning */
 	const Elf_Verneed *verneed;	/* Required versions. */
 	Elf_Word	verneednum;	/* Number of entries in verneed table */
 	const Elf_Verdef  *verdef;	/* Provided versions. */
 	Elf_Word	verdefnum;	/* Number of entries in verdef table */
 	const Elf_Versym *versyms;	/* Symbol versions table */
 	Ver_Entry	*vertab;	/* Versions required/defined by this
 					 * object */
 	int		vertabnum;	/* Number of entries in vertab */
 } Obj_Entry;
 typedef struct Struct_DoneList {
 	const Obj_Entry **objs;		/* Array of object pointers */
 	unsigned int num_alloc;		/* Allocated size of the array */
 	unsigned int num_used;		/* Number of array slots used */
 } DoneList;
 #if defined(_RTLD_SOURCE)
 extern struct r_debug _rtld_debug;
 extern Search_Path *_rtld_default_paths;
 extern Obj_Entry *_rtld_objlist;
 extern Obj_Entry **_rtld_objtail;
 extern u_int _rtld_objcount;
 extern u_int _rtld_objloads;
 extern Obj_Entry *_rtld_objmain;
 extern Obj_Entry _rtld_objself;
 extern Search_Path *_rtld_paths;
 extern Library_Xform *_rtld_xforms;
 extern bool _rtld_trust;
 extern Objlist _rtld_list_global;
 extern Objlist _rtld_list_main;
 extern Elf_Sym _rtld_sym_zero;
 #define	RTLD_MODEMASK 0x3
 /* Flags to be passed into _rtld_symlook_ family of functions. */
 #define SYMLOOK_IN_PLT	0x01	/* Lookup for PLT symbol */
 #define SYMLOOK_DLSYM	0x02	/* Return newes versioned symbol.
 				   Used by dlsym. */
 /* Flags for _rtld_load_object() and friends. */
 #define	_RTLD_GLOBAL	0x01	/* Add object to global DAG. */
 #define	_RTLD_MAIN	0x02
 #define	_RTLD_NOLOAD	0x04	/* dlopen() specified RTLD_NOLOAD. */
 #define	_RTLD_DLOPEN	0x08	/* Load_object() called from dlopen(). */
 /* Preallocation for static TLS model */
 #define	RTLD_STATIC_TLS_RESERVATION	64
 /* rtld.c */
 /* We export these symbols using _rtld_symbol_lookup and is_exported. */
 __dso_public char *dlerror(void);
 __dso_public void *dlopen(const char *, int);
 __dso_public void *dlsym(void *, const char *);
 __dso_public int dlclose(void *);
 __dso_public int dladdr(const void *, Dl_info *);
 __dso_public int dlinfo(void *, int, void *);
 __dso_public int dl_iterate_phdr(int (*)(struct dl_phdr_info *, size_t, void *),
     void *);
 /* These aren't exported */
 void _rtld_error(const char *, ...)
      __attribute__((__format__(__printf__,1,2)));
 void _rtld_die(void) __attribute__((__noreturn__));
 void *_rtld_objmain_sym(const char *);
 __dso_public void _rtld_debug_state(void);
 void _rtld_linkmap_add(Obj_Entry *);
 void _rtld_linkmap_delete(Obj_Entry *);
 void _rtld_objlist_push_head(Objlist *, Obj_Entry *);
 void _rtld_objlist_push_tail(Objlist *, Obj_Entry *);
 Objlist_Entry *_rtld_objlist_find(Objlist *, const Obj_Entry *);
 void _rtld_ref_dag(Obj_Entry *);
 void _rtld_shared_enter(void);
 void _rtld_shared_exit(void);
 void _rtld_exclusive_enter(sigset_t *);
 void _rtld_exclusive_exit(sigset_t *);
 /* expand.c */
 size_t _rtld_expand_path(char *, size_t, const char *, const char *,\
     const char *);
 /* headers.c */
 void _rtld_digest_dynamic(const char *, Obj_Entry *);
 Obj_Entry *_rtld_digest_phdr(const Elf_Phdr *, int, caddr_t);
 /* load.c */
 Obj_Entry *_rtld_load_object(const char *, int);
 int _rtld_load_needed_objects(Obj_Entry *, int);
 int _rtld_preload(const char *);
 #define	OBJ_ERR	(Obj_Entry *)(-1)
 /* path.c */
 void _rtld_add_paths(const char *, Search_Path **, const char *);
 void _rtld_process_hints(const char *, Search_Path **, Library_Xform **,
     const char *);
 int _rtld_sysctl(const char *, void *, size_t *);
 /* reloc.c */
 int _rtld_do_copy_relocations(const Obj_Entry *);
 int _rtld_relocate_objects(Obj_Entry *, bool);
 int _rtld_relocate_nonplt_objects(Obj_Entry *);
 int _rtld_relocate_plt_lazy(const Obj_Entry *);
 int _rtld_relocate_plt_objects(const Obj_Entry *);
 void _rtld_setup_pltgot(const Obj_Entry *);
 /* search.c */
 Obj_Entry *_rtld_load_library(const char *, const Obj_Entry *, int);
 /* symbol.c */
 unsigned long _rtld_elf_hash(const char *);
 const Elf_Sym *_rtld_symlook_obj(const char *, unsigned long,
     const Obj_Entry *, u_int, const Ver_Entry *);
 const Elf_Sym *_rtld_find_symdef(unsigned long, const Obj_Entry *,
     const Obj_Entry **, u_int);
 const Elf_Sym *_rtld_find_plt_symdef(unsigned long, const Obj_Entry *,
     const Obj_Entry **, bool);
 const Elf_Sym *_rtld_symlook_list(const char *, unsigned long,
     const Objlist *, const Obj_Entry **, u_int, const Ver_Entry *, DoneList *);
 const Elf_Sym *_rtld_symlook_default(const char *, unsigned long,
     const Obj_Entry *, const Obj_Entry **, u_int, const Ver_Entry *);
 const Elf_Sym *_rtld_symlook_needed(const char *, unsigned long,
     const Needed_Entry *, const Obj_Entry **, u_int, const Ver_Entry *,
     DoneList *, DoneList *);
 #ifdef COMBRELOC
 void _rtld_combreloc_reset(const Obj_Entry *);
 #endif
 /* symver.c */
 int _rtld_object_match_name(const Obj_Entry *, const char *);
 int _rtld_verify_object_versions(Obj_Entry *);
 static __inline const Ver_Entry *
 _rtld_fetch_ventry(const Obj_Entry *obj, unsigned long symnum)
+{
 	Elf_Half vernum;
 	if (obj->vertab) {
 		vernum = VER_NDX(obj->versyms[symnum].vs_vers);
 		if (vernum >= obj->vertabnum) {
 			_rtld_error("%s: symbol %s has wrong verneed value %d",
 			    obj->path, &obj->strtab[symnum], vernum);
 		} else if (obj->vertab[vernum].hash) {
 			return &obj->vertab[vernum];
+		}
+	}
 	return NULL;
+}
 #if defined(__HAVE_TLS_VARIANT_I) || defined(__HAVE_TLS_VARIANT_II)
 /* tls.c */
 void *_rtld_tls_get_addr(void *, size_t, size_t);
 void _rtld_tls_initial_allocation(void);
 void *_rtld_tls_module_allocate(size_t index);
 int _rtld_tls_offset_allocate(Obj_Entry *);
 void _rtld_tls_offset_free(Obj_Entry *);
 extern size_t _rtld_tls_dtv_generation;
 extern size_t _rtld_tls_max_index;
 __dso_public extern void *__tls_get_addr(void *);
 #ifdef __i386__
 __dso_public extern void *___tls_get_addr(void *)
     __attribute__((__regparm__(1)));
 #endif
 #endif
 /* map_object.c */
 struct stat;
 Obj_Entry *_rtld_map_object(const char *, int, const struct stat *);
 void _rtld_obj_free(Obj_Entry *);
 Obj_Entry *_rtld_obj_new(void);
 /* function descriptors */
 #ifdef __HAVE_FUNCTION_DESCRIPTORS
 Elf_Addr _rtld_function_descriptor_alloc(const Obj_Entry *,
     const Elf_Sym *, Elf_Addr);
 const void *_rtld_function_descriptor_function(const void *);
 #endif /* __HAVE_FUNCTION_DESCRIPTORS */
 #endif /* _RTLD_SOURCE */
 #endif /* RTLD_H */