Use bitrig's pthread_once and friends.

diagnosed by drahn@

Author: marcopeereboom

lib/libc/gen/_once_stub.c

@@ -59,6 +59,6 @@ _once(pthread_once_t *once_control, void (*init_routine)(void))
 {
 
 	if (__isthreaded)
-		return (_pthread_once(once_control, init_routine));
+		return (_libc_pthread_once(once_control, init_routine));
 	return (_libc_once(once_control, init_routine));
 }

lib/libc/gen/_pthread_stub.c

@@ -22,18 +22,13 @@
 #include <pthread.h>
 #include <errno.h>
 
-void *_pthread_getspecific(pthread_key_t key);
-int _pthread_setspecific(pthread_key_t key, const void *value);
-int _pthread_key_create(pthread_key_t *key, void (*destructor)(void *));
-int _pthread_once(pthread_once_t *once_control, void (*init_routine)(void));
-
 void *pthread_getspecific(pthread_key_t key) __attribute__((weak));
 int pthread_setspecific(pthread_key_t key, const void *value) __attribute__((weak));
 int pthread_key_create(pthread_key_t *key, void (*destructor)(void *)) __attribute__((weak));
 int pthread_once(pthread_once_t *once_control, void (*init_routine)(void)) __attribute__((weak));
 
 void *
-_pthread_getspecific(pthread_key_t key)
+_libc_pthread_getspecific(pthread_key_t key)
 {
 	void *(*func)(pthread_key_t key);
 	func = pthread_getspecific;
@@ -43,7 +38,7 @@ _pthread_getspecific(pthread_key_t key)
 }
 
 int
-_pthread_setspecific(pthread_key_t key, const void *value)
+_libc_pthread_setspecific(pthread_key_t key, const void *value)
 {
 	int (*func)(pthread_key_t key, const void *value);
 	func = pthread_setspecific;
@@ -54,7 +49,7 @@ _pthread_setspecific(pthread_key_t key, const void *value)
 
 
 int
-_pthread_key_create(pthread_key_t *key, void (*destructor)(void *))
+_libc_pthread_key_create(pthread_key_t *key, void (*destructor)(void *))
 {
 	int (*func)(pthread_key_t *key, void (*destructor)(void *));
 	func = pthread_key_create;
@@ -64,7 +59,7 @@ _pthread_key_create(pthread_key_t *key, void (*destructor)(void *))
 }
 
 int
-_pthread_once(pthread_once_t *once_control, void (*init_routine)(void))
+_libc_pthread_once(pthread_once_t *once_control, void (*init_routine)(void))
 {
 	int (*func)(pthread_once_t *once_control, void (*init_routine)(void));
 	func = pthread_once;

lib/libc/include/thread_private.h

@@ -193,4 +193,11 @@ pid_t	_thread_fork(void);
 void	*_rtld_allocate_tls(void *, size_t, size_t) __attribute__((weak));
 void	_rtld_free_tls(void *, size_t, size_t) __attribute__((weak));
 
+#include <pthread.h> /* for pthread_key_t */
+
+void *_libc_pthread_getspecific(pthread_key_t key);
+int _libc_pthread_setspecific(pthread_key_t key, const void *value);
+int _libc_pthread_key_create(pthread_key_t *key, void (*destructor)(void *));
+int _libc_pthread_once(pthread_once_t *once_control, void (*init_routine)(void));
+
 #endif /* _THREAD_PRIVATE_H_ */