summaryrefslogtreecommitdiff
path: root/m4/timer_time.m4
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2014-02-22 00:41:38 +0100
committerEric Blake <eblake@redhat.com>2014-02-21 17:09:58 -0700
commit72fb9075b2812765d2ce55a1a26c3764392377cb (patch)
tree5f09e35681123d3007dcd4ef52f4effe50146600 /m4/timer_time.m4
parent33da0ae99103cc6f0748908b6427ed0d102efb15 (diff)
downloadgnulib-72fb9075b2812765d2ce55a1a26c3764392377cb.tar.gz
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 <bits/uClibc_config.h>, which itself is included by <features.h>. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Eric Blake <eblake@redhat.com>
Diffstat (limited to 'm4/timer_time.m4')
-rw-r--r--m4/timer_time.m42
1 files changed, 1 insertions, 1 deletions
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 <features.h>
#ifdef __GNU_LIBRARY__
#if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || (__GLIBC__ > 2)) \
- && !defined __UCLIBC__
+ && !(__UCLIBC__ && __HAS_NO_THREADS__)
Thread emulation available
#endif
#endif