Skip to contentSkip to conversation

uclibc: fix clock_nanosleep declaration for linuxthreads

PATCH New Waldemar Brodkorb 2 participants 3 messages May 1, 2018 – May 2, 2018

lore
Share & tools
lore

Waldemar Brodkorb

author
#0 lore raw

PATCH 1/1 uclibc: fix clock_nanosleep declaration for linuxthreads

Fixes autobuild errors:
http://autobuild.buildroot.net/results/a58007263355e2734a8074d52b1b26b88973c39e
http://autobuild.buildroot.net/results/7d6fd0872efd23c7de552ab637956902b43c3f58

Signed-off-by Waldemar Brodkorb <[email protected]>
Reported-by Baruch Siach <[email protected]>
---
 ...declare-clock_nanosleep-not-only-for-NPTL.patch | 36 ++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 package/uclibc/0002-librt-declare-clock_nanosleep-not-only-for-NPTL.patch
package/uclibc/0002-librt-declare-clock_nanosleep-not-only-for-NPTL.patch new file +36 -0
new file mode 100644
index 0000000..adc6be4
@@ -0,0 +1,36 @@
+From ffea49761b3933924cf1125857e9e737eb4a3b25 Mon Sep 17 00:00:00 2001
+From: Waldemar Brodkorb <[email protected]>
+Date: Tue, 1 May 2018 19:35:20 +0200
+Subject: [PATCH] librt: declare clock_nanosleep not only for NPTL
+
+Reported-by: Baruch Siach <[email protected]>
+Signed-off-by: Waldemar Brodkorb <[email protected]>
+---
+ include/time.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/include/time.h b/include/time.h
+index 785c8f6..c29038b 100644
+--- a/include/time.h
++++ b/include/time.h
+@@ -356,7 +356,7 @@ extern int clock_settime (clockid_t __clock_id, const struct timespec *__tp)
+ #  endif /* __UCLIBC_HAS_REALTIME__ */
+ 
+ #  if defined __USE_XOPEN2K && defined __UCLIBC_HAS_ADVANCED_REALTIME__
+-#   ifdef __UCLIBC_HAS_THREADS_NATIVE__
++#   ifdef __UCLIBC_HAS_THREADS__
+ /* High-resolution sleep with the specified clock.
+ 
+    This function is a cancellation point and therefore not marked with
+@@ -367,7 +367,7 @@ extern int clock_nanosleep (clockid_t __clock_id, int __flags,
+ 
+ /* Return clock ID for CPU-time clock.  */
+ extern int clock_getcpuclockid (pid_t __pid, clockid_t *__clock_id) __THROW;
+-#   endif /* __UCLIBC_HAS_THREADS_NATIVE__ */
++#   endif /* __UCLIBC_HAS_THREADS__ */
+ #  endif
+ 
+ #  if defined __UCLIBC_HAS_REALTIME__
+-- 
+2.1.4
+
Signature · 1 line
2.1.4
#1 lore raw

PATCH 1/1 uclibc: fix clock_nanosleep declaration for linuxthreads

Hi Waldemar,

Thanks for your quick response. One question below.

Quoted 29 lines · Waldemar Brodkorb

Fixes autobuild errors:
http://autobuild.buildroot.net/results/a58007263355e2734a8074d52b1b26b88973c39e
http://autobuild.buildroot.net/results/7d6fd0872efd23c7de552ab637956902b43c3f58

Signed-off-by Waldemar Brodkorb <[email protected]>
Reported-by Baruch Siach <[email protected]>
---
 ...declare-clock_nanosleep-not-only-for-NPTL.patch | 36 ++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 package/uclibc/0002-librt-declare-clock_nanosleep-not-only-for-NPTL.patch
package/uclibc/0002-librt-declare-clock_nanosleep-not-only-for-NPTL.patch new file +11 -0
new file mode 100644
index 0000000..adc6be4
@@ -0,0 +1,36 @@
+From ffea49761b3933924cf1125857e9e737eb4a3b25 Mon Sep 17 00:00:00 2001
+From: Waldemar Brodkorb <[email protected]>
+Date: Tue, 1 May 2018 19:35:20 +0200
+Subject: [PATCH] librt: declare clock_nanosleep not only for NPTL
+
+Reported-by: Baruch Siach <[email protected]>
+Signed-off-by: Waldemar Brodkorb <[email protected]>
+---
+ include/time.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+

package/uclibc/0002-librt-declare-clock_nanosleep-not-only-for-NPTL.patch line 21

Quoted 10 lines
package/uclibc/0002-librt-declare-clock_nanosleep-not-only-for-NPTL.patch new file +10 -0
+diff --git a/include/time.h b/include/time.h
+index 785c8f6..c29038b 100644
+--- a/include/time.h
++++ b/include/time.h
+@@ -356,7 +356,7 @@ extern int clock_settime (clockid_t __clock_id, const struct timespec *__tp)
+ #  endif /* __UCLIBC_HAS_REALTIME__ */
+ 
+ #  if defined __USE_XOPEN2K && defined __UCLIBC_HAS_ADVANCED_REALTIME__
+-#   ifdef __UCLIBC_HAS_THREADS_NATIVE__
++#   ifdef __UCLIBC_HAS_THREADS__

Why does the clock_nanosleep() declaration depend on threading support at all?

package/uclibc/0002-librt-declare-clock_nanosleep-not-only-for-NPTL.patch line 33

Quoted 12 lines
package/uclibc/0002-librt-declare-clock_nanosleep-not-only-for-NPTL.patch new file +12 -0
+ /* High-resolution sleep with the specified clock.
+ 
+    This function is a cancellation point and therefore not marked with
+@@ -367,7 +367,7 @@ extern int clock_nanosleep (clockid_t __clock_id, int __flags,
+ 
+ /* Return clock ID for CPU-time clock.  */
+ extern int clock_getcpuclockid (pid_t __pid, clockid_t *__clock_id) __THROW;
+-#   endif /* __UCLIBC_HAS_THREADS_NATIVE__ */
++#   endif /* __UCLIBC_HAS_THREADS__ */
+ #  endif
+ 
+ #  if defined __UCLIBC_HAS_REALTIME__

baruch

Signature · 3 lines
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -
author
#2 lore raw

PATCH 1/1 uclibc: fix clock_nanosleep declaration for linuxthreads

Hi,

stupid me, we decoupled both in the mentioned commit, I'll sent a new patch,

best regards and sorry for iphone tofu..

best regards
Waldemar

Quoted 69 lines

Am 01.05.2018 um 20:14 schrieb Baruch Siach <[email protected]>:

Hi Waldemar,

Thanks for your quick response. One question below.

Quoted 30 lines · Waldemar Brodkorb

Fixes autobuild errors:
http://autobuild.buildroot.net/results/a58007263355e2734a8074d52b1b26b88973c39e
http://autobuild.buildroot.net/results/7d6fd0872efd23c7de552ab637956902b43c3f58

Signed-off-by Waldemar Brodkorb <[email protected]>
Reported-by Baruch Siach <[email protected]>

---
...declare-clock_nanosleep-not-only-for-NPTL.patch | 36 ++++++++++++++++++++++

1 file changed, 36 insertions(+)

create mode 100644 package/uclibc/0002-librt-declare-clock_nanosleep-not-only-for-NPTL.patch

package/uclibc/0002-librt-declare-clock_nanosleep-not-only-for-NPTL.patch new file +11 -0
new file mode 100644
index 0000000..adc6be4
@@ -0,0 +1,36 @@
+From ffea49761b3933924cf1125857e9e737eb4a3b25 Mon Sep 17 00:00:00 2001
+From: Waldemar Brodkorb <[email protected]>
+Date: Tue, 1 May 2018 19:35:20 +0200
+Subject: [PATCH] librt: declare clock_nanosleep not only for NPTL
+
+Reported-by: Baruch Siach <[email protected]>
+Signed-off-by: Waldemar Brodkorb <[email protected]>
+---
+ include/time.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+

package/uclibc/0002-librt-declare-clock_nanosleep-not-only-for-NPTL.patch line 21

Quoted 10 lines
package/uclibc/0002-librt-declare-clock_nanosleep-not-only-for-NPTL.patch new file +10 -0
+diff --git a/include/time.h b/include/time.h
+index 785c8f6..c29038b 100644
+--- a/include/time.h
++++ b/include/time.h
+@@ -356,7 +356,7 @@ extern int clock_settime (clockid_t __clock_id, const struct timespec *__tp)
+ #  endif /* __UCLIBC_HAS_REALTIME__ */
+ 
+ #  if defined __USE_XOPEN2K && defined __UCLIBC_HAS_ADVANCED_REALTIME__
+-#   ifdef __UCLIBC_HAS_THREADS_NATIVE__
++#   ifdef __UCLIBC_HAS_THREADS__

Why does the clock_nanosleep() declaration depend on threading support at all?

package/uclibc/0002-librt-declare-clock_nanosleep-not-only-for-NPTL.patch line 33

Quoted 12 lines
package/uclibc/0002-librt-declare-clock_nanosleep-not-only-for-NPTL.patch new file +12 -0
+ /* High-resolution sleep with the specified clock.
+ 
+    This function is a cancellation point and therefore not marked with
+@@ -367,7 +367,7 @@ extern int clock_nanosleep (clockid_t __clock_id, int __flags,
+ 
+ /* Return clock ID for CPU-time clock.  */
+ extern int clock_getcpuclockid (pid_t __pid, clockid_t *__clock_id) __THROW;
+-#   endif /* __UCLIBC_HAS_THREADS_NATIVE__ */
++#   endif /* __UCLIBC_HAS_THREADS__ */
+ #  endif
+ 
+ #  if defined __UCLIBC_HAS_REALTIME__

baruch

Signature · 3 lines
    http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
  - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -