From: Thomas Petazzoni Date: Fri, 21 Feb 2014 23:41:38 +0000 (+0100) Subject: m4: fix gl_TIMER_TIME() detection of threads on uClibc X-Git-Tag: v1.0~7431 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=72fb9075b2812765d2ce55a1a26c3764392377cb;p=gnulib.git m4: fix gl_TIMER_TIME() detection of threads on uClibc The timer_time.m4 gl_TIMER_TIME function determines which libraries need to be linked to get access to the timer function, generally -lrt for Linux systems. On platforms where threads are used, librt typically uses thread functions from libpthread. However, the test to determine whether the platform has thread or not is incorrect: it assumes that if the C library is uClibc, then threads are not available. This is actually not true: uClibc has configurable thread support, and when thread support is available, librt calls libpthread functions. This is important when static linking is used, because otherwise only -lrt is used at link time, which fails because librt calls undefined thread functions. Both -lrt and -lpthread must be passed. This problem is fixed by making the uClibc thread detection a bit smarter, thanks to the usage of the __HAS_NO_THREADS__ macro defined in , which itself is included by . Signed-off-by: Thomas Petazzoni Signed-off-by: Eric Blake --- diff --git a/ChangeLog b/ChangeLog index 6a115e266a..4cf45008d5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2014-02-21 Thomas Petazzoni (tiny change) + timer: fix uClibc detection of threading + * m4/time_time.m4 (gl_TIMER_TIME): Detect whether threads are + enabled in uClibc. + 2014-02-21 Eric Blake maintainer-makefiles: provide AC_PROG_SED for older autoconf diff --git a/m4/timer_time.m4 b/m4/timer_time.m4 index 6eceadd59a..8e2c921cbe 100644 --- a/m4/timer_time.m4 +++ b/m4/timer_time.m4 @@ -28,7 +28,7 @@ AC_DEFUN([gl_TIMER_TIME], #include #ifdef __GNU_LIBRARY__ #if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || (__GLIBC__ > 2)) \ - && !defined __UCLIBC__ + && !(__UCLIBC__ && __HAS_NO_THREADS__) Thread emulation available #endif #endif