 @@ -1,14 +1,14 @@
-/*	$NetBSD: pthread_atfork.c,v 1.12 2020/02/01 18:14:16 kamil Exp $	*/
+/*	$NetBSD: pthread_atfork.c,v 1.13 2020/04/16 14:39:58 joerg Exp $	*/
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Nathan J. Williams.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -21,43 +21,50 @@
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: pthread_atfork.c,v 1.12 2020/02/01 18:14:16 kamil Exp $");
+__RCSID("$NetBSD: pthread_atfork.c,v 1.13 2020/04/16 14:39:58 joerg Exp $");
 #endif /* LIBC_SCCS and not lint */
 #include "namespace.h"
 #include <errno.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <sys/queue.h>
 #include "reentrant.h"
 #ifdef __weak_alias
 __weak_alias(pthread_atfork, _pthread_atfork)
 __weak_alias(fork, _fork)
 #endif /* __weak_alias */
 pid_t	__fork(void);	/* XXX */
 pid_t	__atomic_fork(void) __weak; /* XXX */
 pid_t
 __atomic_fork(void)
+{
 	return __fork();
+}
 struct atfork_callback {
 	SIMPLEQ_ENTRY(atfork_callback) next;
 	void (*fn)(void);
 };
 /*
  * Hypothetically, we could protect the queues with a rwlock which is
  * write-locked by pthread_atfork() and read-locked by fork(), but
  * since the intended use of the functions is obtaining locks to hold
  * across the fork, forking is going to be serialized anyway.
  */
 static struct atfork_callback atfork_builtin;
 @@ -147,27 +154,27 @@ pthread_atfork(void (*prepare)(void), vo
 	return 0;
+}
 pid_t
 fork(void)
+{
 	struct atfork_callback *iter;
 	pid_t ret;
 	mutex_lock(&atfork_lock);
 	SIMPLEQ_FOREACH(iter, &prepareq, next)
 		(*iter->fn)();
-	ret = __fork();
+	ret = __atomic_fork();
 	if (ret != 0) {
 		/*
 		 * We are the parent. It doesn't matter here whether
 		 * the fork call succeeded or failed.
 		 */
 		SIMPLEQ_FOREACH(iter, &parentq, next)
 			(*iter->fn)();
 		mutex_unlock(&atfork_lock);
 	} else {
 		/* We are the child */
 		SIMPLEQ_FOREACH(iter, &childq, next)
 			(*iter->fn)();

 @@ -1,14 +1,14 @@
-/*	$NetBSD: rtld.c,v 1.203 2020/03/04 01:21:17 thorpej Exp $	 */
+/*	$NetBSD: rtld.c,v 1.204 2020/04/16 14:39:58 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.203 2020/03/04 01:21:17 thorpej Exp $");
+__RCSID("$NetBSD: rtld.c,v 1.204 2020/04/16 14:39:58 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>
 @@ -1522,26 +1522,41 @@ __dl_cxa_refcount(void *addr, ssize_t de
 			++obj->refcount;
 		obj->cxa_refcount += delta;
 		dbg(("new reference count: %zu", obj->cxa_refcount));
 		if (obj->cxa_refcount == 0) {
 			--obj->refcount;
 			if (obj->refcount == 0)
 				_rtld_unload_object(&mask, obj, true);
+		}
+	}
 	_rtld_exclusive_exit(&mask);
+}
 pid_t __fork(void);
 __dso_public pid_t
 __atomic_fork(void)
+{
 	sigset_t mask;
 	pid_t result;
 	_rtld_exclusive_enter(&mask);
 	result = __fork();
 	_rtld_exclusive_exit(&mask);
 	return result;
+}
 /*
  * Error reporting function.  Use it like printf.  If formats the message
  * into a buffer, and sets things up so that the next call to dlerror()
  * will return the message.
  */
 void
 _rtld_error(const char *fmt,...)
+{
 	static char     buf[512];
 	va_list         ap;
 	va_start(ap, fmt);
 	xvsnprintf(buf, sizeof buf, fmt, ap);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: rtld.h,v 1.138 2020/02/29 04:24:33 kamil Exp $	 */
+/*	$NetBSD: rtld.h,v 1.139 2020/04/16 14:39:58 joerg 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
 @@ -360,26 +360,28 @@ extern u_int _rtld_objgen;
 /* rtld.c */
 __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 *);
 __dso_public void *_dlauxinfo(void) __pure;
 __dso_public void __dl_cxa_refcount(void *addr, ssize_t delta);
 __dso_public pid_t __atomic_fork(void);
 #if defined(__ARM_EABI__) && !defined(__ARM_DWARF_EH__)
 /*
  * This is used by libgcc to find the start and length of the exception table
  * associated with a PC.
  */
 __dso_public _Unwind_Ptr __gnu_Unwind_Find_exidx(_Unwind_Ptr, int *);
 #endif
 /* These aren't exported */
 void _rtld_error(const char *, ...) __printflike(1,2);
 void _rtld_die(void) __dead;
 void *_rtld_objmain_sym(const char *);
 __dso_public void _rtld_debug_state(void) __noinline;

 @@ -13,15 +13,16 @@
     dladdr;
     __dladdr;
     dlinfo;
     __dlinfo;
     dl_iterate_phdr;
     ____dl_iterate_phdr;
     _dlauxinfo;
     _rtld_tls_allocate;
     _rtld_tls_free;
     __tls_get_addr;
     ___tls_get_addr;
     __gnu_Unwind_Find_exidx;
     __dl_cxa_refcount;
     __atomic_fork;
   local: *;
 };