1*4882a593SmuzhiyunFrom 21e0c16a85c2e028a963703511d750d1751bc254 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Alexey Brodkin <abrodkin@synopsys.com> 3*4882a593SmuzhiyunDate: Wed, 13 Jul 2016 23:46:38 +0200 4*4882a593SmuzhiyunSubject: [PATCH] Fix a build issue with uClibc-ng 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunuClibc-ng has clock_nanosleep() if built with UCLIBC_HAS_ADVANCED_REALTIME, 7*4882a593Smuzhiyun conflicting with emulation function. 8*4882a593Smuzhiyun 9*4882a593SmuzhiyunSigned-off-by: Peter Korsgaard <peter@korsgaard.com> 10*4882a593Smuzhiyun[Romain: 11*4882a593Smuzhiyun rebase on v1.0 12*4882a593Smuzhiyun remove uClibc legacy support, uClibc-ng provide utmpx.h] 13*4882a593SmuzhiyunSigned-off-by: Romain Naour <romain.naour@gmail.com> 14*4882a593Smuzhiyun--- 15*4882a593Smuzhiyun src/cyclictest/cyclictest.c | 2 +- 16*4882a593Smuzhiyun 1 file changed, 1 insertion(+), 1 deletion(-) 17*4882a593Smuzhiyun 18*4882a593Smuzhiyundiff --git a/src/cyclictest/cyclictest.c b/src/cyclictest/cyclictest.c 19*4882a593Smuzhiyunindex 00e5f3d..92fa3dd 100644 20*4882a593Smuzhiyun--- a/src/cyclictest/cyclictest.c 21*4882a593Smuzhiyun+++ b/src/cyclictest/cyclictest.c 22*4882a593Smuzhiyun@@ -58,7 +58,7 @@ 23*4882a593Smuzhiyun #define gettid() syscall(__NR_gettid) 24*4882a593Smuzhiyun #define sigev_notify_thread_id _sigev_un._tid 25*4882a593Smuzhiyun 26*4882a593Smuzhiyun-#ifdef __UCLIBC__ 27*4882a593Smuzhiyun+#if defined(__UCLIBC__) && !defined(__UCLIBC_HAS_ADVANCED_REALTIME__) 28*4882a593Smuzhiyun #define MAKE_PROCESS_CPUCLOCK(pid, clock) \ 29*4882a593Smuzhiyun ((~(clockid_t) (pid) << 3) | (clockid_t) (clock)) 30*4882a593Smuzhiyun #define CPUCLOCK_SCHED 2 31*4882a593Smuzhiyun-- 32*4882a593Smuzhiyun2.5.5 33*4882a593Smuzhiyun 34