# HG changeset patch # User Bruno Haible # Date 1518859415 -3600 # Node ID ef22bb0a95915d701ef29d380dd16ca4fbeb61bf # Parent f6cb783d3822a496077da8252e8a1baf193007a3 lock: Fix test-once1 crash on FreeBSD11. * lib/glthread/lock.h: On FreeBSD, test the weak value of the symbol 'pthread_create', not 'pthread_cancel'. diff -r f6cb783d3822 -r ef22bb0a9591 ChangeLog --- a/ChangeLog Sat Feb 17 10:05:01 2018 +0100 +++ b/ChangeLog Sat Feb 17 10:23:35 2018 +0100 @@ -1,3 +1,9 @@ +2018-02-17 Bruno Haible + + lock: Fix test-once1 crash on FreeBSD11. + * lib/glthread/lock.h: On FreeBSD, test the weak value of the symbol + 'pthread_create', not 'pthread_cancel'. + 2018-02-17 Bruno Haible lock: Add test of gl_once. diff -r f6cb783d3822 -r ef22bb0a9591 lib/glthread/lock.h --- a/lib/glthread/lock.h Sat Feb 17 10:05:01 2018 +0100 +++ b/lib/glthread/lock.h Sat Feb 17 10:23:35 2018 +0100 @@ -149,8 +149,18 @@ # endif # if !PTHREAD_IN_USE_DETECTION_HARD -# pragma weak pthread_cancel -# define pthread_in_use() (pthread_cancel != NULL) + /* On most platforms, pthread_cancel or pthread_kill can be used to + determine whether libpthread is in use. + On newer versions of FreeBSD, however, this is no longer possible, + because pthread_cancel and pthread_kill got added to libc. Therefore + use pthread_create to test whether libpthread is in use. */ +# if defined __FreeBSD__ || defined __DragonFly__ /* FreeBSD */ +# pragma weak pthread_create +# define pthread_in_use() (pthread_create != NULL) +# else /* glibc, NetBSD, OpenBSD, IRIX, OSF/1, Solaris */ +# pragma weak pthread_cancel +# define pthread_in_use() (pthread_cancel != NULL) +# endif # endif # else