This is an automated email from the git hooks/post-receive script.
sthibault pushed a commit to branch sid
in repository glibc.
commit e6d430468fd6e5f2f67a742aacffcba13995affb
Author: Samuel Thibault <samuel.thiba...@ens-lyon.org>
Date: Wed Oct 11 22:27:31 2017 +0000
hurd: Complete MONOTONIC patch with clock_getres() and clock_settime()
---
debian/changelog | 2 +
.../hurd-i386/local-clock_gettime_MONOTONIC.diff | 52 ++++++++++++++++------
2 files changed, 41 insertions(+), 13 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 35245c9..18c598d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ glibc (2.24-18) UNRELEASED; urgency=medium
* libc0.3.symbols.hurd-i386: Update with proc_set/get_exe RPCs.
* patches/hurd-i386/tg-hurdsig-SA_SIGINFO.diff: Always define SA_SIGINFO.
* patches/hurd-i386/local-no_unsupported_ioctls.diff: New patch.
+ * patches/hurd-i386/local-clock_gettime_MONOTONIC.diff: Complete with
+ clock_getres() and clock_settime().
[ Svante Signell ]
* patches/hurd-i386/submitted-exec_filename.diff: Update, fixes
diff --git a/debian/patches/hurd-i386/local-clock_gettime_MONOTONIC.diff
b/debian/patches/hurd-i386/local-clock_gettime_MONOTONIC.diff
index 368bd3a..34920db 100644
--- a/debian/patches/hurd-i386/local-clock_gettime_MONOTONIC.diff
+++ b/debian/patches/hurd-i386/local-clock_gettime_MONOTONIC.diff
@@ -10,21 +10,47 @@ former.
sysdeps/mach/hurd/bits/posix_opt.h | 2 +-
sysdeps/unix/clock_gettime.c | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
-Index: eglibc-2.16/sysdeps/unix/clock_gettime.c
+Index: glibc-2.24/sysdeps/unix/clock_gettime.c
===================================================================
---- eglibc-2.16.orig/sysdeps/unix/clock_gettime.c 2012-07-23
00:41:03.000000000 +0200
-+++ eglibc-2.16/sysdeps/unix/clock_gettime.c 2012-07-23 00:41:10.000000000
+0200
-@@ -100,6 +100,7 @@
- #endif
+--- glibc-2.24.orig/sysdeps/unix/clock_gettime.c
++++ glibc-2.24/sysdeps/unix/clock_gettime.c
+@@ -101,6 +101,7 @@ __clock_gettime (clockid_t clock_id, str
#ifndef HANDLED_REALTIME
-+ case CLOCK_MONOTONIC:
case CLOCK_REALTIME:
++ case CLOCK_MONOTONIC:
{
struct timeval tv;
---- eglibc/sysdeps/pthread/timer_create.c.orig 2016-07-14 14:34:19.721218728
+0200
-+++ eglibc/sysdeps/pthread/timer_create.c 2016-07-14 14:34:25.881187804
+0200
-@@ -48,7 +48,7 @@
+ retval = gettimeofday (&tv, NULL);
+Index: glibc-2.24/sysdeps/posix/clock_getres.c
+===================================================================
+--- glibc-2.24.orig/sysdeps/posix/clock_getres.c
++++ glibc-2.24/sysdeps/posix/clock_getres.c
+@@ -88,6 +88,7 @@ __clock_getres (clockid_t clock_id, stru
+
+ #ifndef HANDLED_REALTIME
+ case CLOCK_REALTIME:
++ case CLOCK_MONOTONIC:
+ retval = realtime_getres (res);
+ break;
+ #endif /* handled REALTIME */
+Index: glibc-2.24/sysdeps/unix/clock_settime.c
+===================================================================
+--- glibc-2.24.orig/sysdeps/unix/clock_settime.c
++++ glibc-2.24/sysdeps/unix/clock_settime.c
+@@ -99,6 +99,7 @@ __clock_settime (clockid_t clock_id, con
+
+ #ifndef HANDLED_REALTIME
+ case CLOCK_REALTIME:
++ case CLOCK_MONOTONIC:
+ HANDLE_REALTIME;
+ break;
+ #endif
+Index: glibc-2.24/sysdeps/pthread/timer_create.c
+===================================================================
+--- glibc-2.24.orig/sysdeps/pthread/timer_create.c
++++ glibc-2.24/sysdeps/pthread/timer_create.c
+@@ -48,7 +48,7 @@ timer_create (clockid_t clock_id, struct
return -1;
}
@@ -33,10 +59,10 @@ Index: eglibc-2.16/sysdeps/unix/clock_gettime.c
{
__set_errno (EINVAL);
return -1;
-Index: eglibc-2.16/sysdeps/mach/hurd/bits/posix_opt.h
+Index: glibc-2.24/sysdeps/mach/hurd/bits/posix_opt.h
===================================================================
---- eglibc-2.16.orig/sysdeps/mach/hurd/bits/posix_opt.h 2012-07-23
00:41:03.000000000 +0200
-+++ eglibc-2.16/sysdeps/mach/hurd/bits/posix_opt.h 2012-07-23
00:41:10.000000000 +0200
+--- glibc-2.24.orig/sysdeps/mach/hurd/bits/posix_opt.h
++++ glibc-2.24/sysdeps/mach/hurd/bits/posix_opt.h
@@ -163,10 +163,10 @@
#define _POSIX_THREAD_PROCESS_SHARED -1
@@ -45,8 +71,8 @@ Index: eglibc-2.16/sysdeps/mach/hurd/bits/posix_opt.h
+#define _POSIX_MONOTONIC_CLOCK 200809L
-/* The clock selection interfaces are available. */
-+/* The clock selection interfaces are not really available yet. */
-#define _POSIX_CLOCK_SELECTION 200809L
++/* The clock selection interfaces are not really available yet. */
+#define _POSIX_CLOCK_SELECTION -1
/* Advisory information interfaces could be available in future. */
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-glibc/glibc.git
