 @@ -1,14 +1,14 @@
-/*	$NetBSD: rtld.c,v 1.207 2020/09/22 00:41:27 kamil Exp $	 */
+/*	$NetBSD: rtld.c,v 1.208 2021/05/30 02:26:08 joerg Exp $	 */
 /*
  * Copyright 1996 John D. Polstra.
  * Copyright 1996 Matt Thomas <matt@3am-software.com>
  * Copyright 2002 Charles M. Hannum <root@ihack.net>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -30,27 +30,27 @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * Dynamic linker for ELF.
+ *
  * John Polstra <jdp@polstra.com>.
  */
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: rtld.c,v 1.207 2020/09/22 00:41:27 kamil Exp $");
+__RCSID("$NetBSD: rtld.c,v 1.208 2021/05/30 02:26:08 joerg Exp $");
 #endif /* not lint */
 #include <sys/param.h>
 #include <sys/atomic.h>
 #include <sys/mman.h>
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <lwp.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 @@ -1108,27 +1108,27 @@ _rtld_objmain_sym(const char *name)
 	hash.sysv = _rtld_sysv_hash(name);
 	hash.gnu = _rtld_gnu_hash(name);
 	obj = _rtld_objmain;
 	_rtld_donelist_init(&donelist);
 	def = _rtld_symlook_list(name, &hash, &_rtld_list_main, &obj, 0,
 	    NULL, &donelist);
 	if (def != NULL)
 		return obj->relocbase + def->st_value;
 	return NULL;
+}
-#ifdef __powerpc__
+#if defined(__powerpc__) && !defined(__clang__)
 static __noinline void *
 hackish_return_address(void)
+{
 #if __GNUC_PREREQ__(6,0)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wframe-address"
 #endif
 	return __builtin_return_address(1);
 #if __GNUC_PREREQ__(6,0)
 #pragma GCC diagnostic pop
 #endif
+}
 #endif
 @@ -1274,52 +1274,52 @@ do_dlsym(void *handle, const char *name,
 	_rtld_error("Undefined symbol \"%s\"", name);
 	lookup_mutex_exit();
 	return NULL;
+}
 __strong_alias(__dlsym,dlsym)
 void *
 dlsym(void *handle, const char *name)
+{
 	void *retaddr;
 	dbg(("dlsym of %s in %p", name, handle));
-#ifdef __powerpc__
+#if defined(__powerpc__) && !defined(__clang__)
 	retaddr = hackish_return_address();
 #else
 	retaddr = __builtin_return_address(0);
 #endif
 	return do_dlsym(handle, name, NULL, retaddr);
+}
 __strong_alias(__dlvsym,dlvsym)
 void *
 dlvsym(void *handle, const char *name, const char *version)
+{
 	Ver_Entry *ventry = NULL;
 	Ver_Entry ver_entry;
 	void *retaddr;
 	dbg(("dlvsym of %s@%s in %p", name, version ? version : NULL, handle));
 	if (version != NULL) {
 		ver_entry.name = version;
 		ver_entry.file = NULL;
 		ver_entry.hash = _rtld_sysv_hash(version);
 		ver_entry.flags = 0;
 		ventry = &ver_entry;
+	}
-#ifdef __powerpc__
+#if defined(__powerpc__) && !defined(__clang__)
 	retaddr = hackish_return_address();
 #else
 	retaddr = __builtin_return_address(0);
 #endif
 	return do_dlsym(handle, name, ventry, retaddr);
+}
 __strong_alias(__dladdr,dladdr)
 int
 dladdr(const void *addr, Dl_info *info)
+{
 	const Obj_Entry *obj;
 	const Elf_Sym *def, *best_def;
 @@ -1397,27 +1397,27 @@ dladdr(const void *addr, Dl_info *info)
 __strong_alias(__dlinfo,dlinfo)
 int
 dlinfo(void *handle, int req, void *v)
+{
 	const Obj_Entry *obj;
 	void *retaddr;
 	dbg(("dlinfo for %p %d", handle, req));
 	_rtld_shared_enter();
 	if (handle == RTLD_SELF) {
-#ifdef __powerpc__
+#if defined(__powerpc__) && !defined(__clang__)
 		retaddr = hackish_return_address();
 #else
 		retaddr = __builtin_return_address(0);
 #endif
 		if ((obj = _rtld_obj_from_addr(retaddr)) == NULL) {
 			_rtld_error("Cannot determine caller's shared object");
 			_rtld_shared_exit();
 			return -1;
+		}
 	} else {
 		if ((obj = _rtld_dlcheck(handle)) == NULL) {
 			_rtld_shared_exit();
 			return -1;