[git commit] sysconf.c: the clock_getres function is good for NPTL as well

Bernhard Reutner-Fischer rep.dot.nop at gmail.com
Fri Jun 15 12:00:31 UTC 2012


commit: http://git.uclibc.org/uClibc/commit/?id=df87a0f21e673bd4d79b174a39d8a72d5cac37ef
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/master

Even if glibc reuses the syscall (bloat), we can reuse the function.
Make sure, that we use it only if it is provided by the syscall
and the function is really around (UCLIBC_HAS_REALTIME disables it),
else we get into a loop.

Signed-off-by: Peter S. Mazinger <ps.m at gmx.net>
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop at gmail.com>
---
 libc/unistd/sysconf.c |   13 +------------
 1 files changed, 1 insertions(+), 12 deletions(-)

diff --git a/libc/unistd/sysconf.c b/libc/unistd/sysconf.c
index 66486ae..ce60167 100644
--- a/libc/unistd/sysconf.c
+++ b/libc/unistd/sysconf.c
@@ -982,20 +982,9 @@ long int sysconf(int name)
 #endif
 
     case _SC_MONOTONIC_CLOCK:
-#ifdef __NR_clock_getres
-    /* Check using the clock_getres system call.  */
-# ifdef __UCLIBC_HAS_THREADS_NATIVE__
-    {
-      struct timespec ts;
-      INTERNAL_SYSCALL_DECL (err);
-      int r;
-      r = INTERNAL_SYSCALL (clock_getres, err, 2, CLOCK_MONOTONIC, &ts);
-      return INTERNAL_SYSCALL_ERROR_P (r, err) ? -1 : _POSIX_VERSION;
-    }
-# elif defined __UCLIBC_HAS_REALTIME__
+#if defined __UCLIBC_HAS_REALTIME__ && defined __NR_clock_getres
       if (clock_getres(CLOCK_MONOTONIC, NULL) >= 0)
         return _POSIX_VERSION;
-# endif
 #endif
       RETURN_NEG_1;
 


More information about the uClibc-cvs mailing list