From 541d79cb651cfd3238b9aa41fce70208df8e9496 Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Fri, 10 Aug 2018 16:45:07 +0200 Subject: build: Link to libpthread, if pthread_atfork() needs to be used On non-glibc systems (e.g., FreeBSD), pthread_atfork() stub is provided as a nop and our fork detection mechanism doesn't work. Pull in the actual implementation from libpthread in that case. Signed-off-by: Daiki Ueno --- common/library.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'common') diff --git a/common/library.c b/common/library.c index b72465b..73a008c 100644 --- a/common/library.c +++ b/common/library.c @@ -145,12 +145,14 @@ extern int __register_atfork (void (*prepare) (void), void (*parent) (void), #ifdef HAVE___REGISTER_ATFORK -#define p11_register_atfork(a,b,c,d) \ - (__register_atfork((a),(b),(c),(d))) +extern void *__dso_handle; + +#define p11_register_atfork(a,b,c) \ + (__register_atfork((a),(b),(c),__dso_handle)) #else -#define p11_register_atfork(a,b,c,d) \ +#define p11_register_atfork(a,b,c) \ (pthread_atfork((a),(b),(c))) #endif /* HAVE___REGISTER_ATFORK */ @@ -177,7 +179,7 @@ p11_library_init_impl (void) p11_message_locale = newlocale (LC_ALL_MASK, "POSIX", (locale_t) 0); #endif - p11_register_atfork (NULL, NULL, count_forks, NULL); + p11_register_atfork (NULL, NULL, count_forks); } void -- cgit v1.1