diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2021-04-09 14:17:24 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2021-04-09 14:19:34 +0200 |
| commit | 87961fc965b96ac0c7a5909ac2faab2d023b5339 (patch) | |
| tree | eaaac205b9bbe3ef40635897fd88716950959d06 /gnu/packages/patches/glibc-hurd-clock_gettime_monotonic.patch | |
| parent | 4863c4304e7d4d5945474e771d242878f8339d44 (diff) | |
| download | guix-87961fc965b96ac0c7a5909ac2faab2d023b5339.tar.gz | |
gnu: glibc: Update to 2.33.
* gnu/packages/base.scm (glibc): Update to 2.33. [source]: Remove "glibc-hurd-signal-sa-siginfo.patch", now upstream. * gnu/packages/patches/glibc-hurd-clock_gettime_monotonic.patch: Update. * gnu/packages/patches/glibc-hurd-signal-sa-siginfo.patch: Remove. * gnu/local.mk (dist_patch_DATA): Adjust accordingly.
Diffstat (limited to 'gnu/packages/patches/glibc-hurd-clock_gettime_monotonic.patch')
| -rw-r--r-- | gnu/packages/patches/glibc-hurd-clock_gettime_monotonic.patch | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/gnu/packages/patches/glibc-hurd-clock_gettime_monotonic.patch b/gnu/packages/patches/glibc-hurd-clock_gettime_monotonic.patch index 1c3fe427f9..e31f99a1ce 100644 --- a/gnu/packages/patches/glibc-hurd-clock_gettime_monotonic.patch +++ b/gnu/packages/patches/glibc-hurd-clock_gettime_monotonic.patch @@ -24,18 +24,17 @@ Subject: [PATCH 2/2] Use realtime clock for the monotonic clock. 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/sysdeps/mach/clock_gettime.c b/sysdeps/mach/clock_gettime.c -index ac3547df3c..af8681ba4e 100644 +index 6862fc8c..be1449bf 100644 --- a/sysdeps/mach/clock_gettime.c +++ b/sysdeps/mach/clock_gettime.c -@@ -25,7 +25,7 @@ - int - __clock_gettime (clockid_t clock_id, struct timespec *ts) - { -- if (clock_id != CLOCK_REALTIME) -+ if (clock_id != CLOCK_MONOTONIC && clock_id != CLOCK_REALTIME) - { - errno = EINVAL; - return -1; +@@ -32,6 +32,7 @@ __clock_gettime (clockid_t clock_id, struct timespec *ts) + switch (clock_id) { + + case CLOCK_REALTIME: ++ case CLOCK_MONOTONIC: + { + /* __host_get_time can only fail if passed an invalid host_t. + __mach_host_self could theoretically fail (producing an diff --git a/sysdeps/mach/hurd/bits/posix_opt.h b/sysdeps/mach/hurd/bits/posix_opt.h index 0050151332..27b3a28ab7 100644 --- a/sysdeps/mach/hurd/bits/posix_opt.h |