r5257 - in glibc-package/trunk/debian: . patches/any
Author: ps-guest
Date: 2012-05-26 14:10:21 +0000 (Sat, 26 May 2012)
New Revision: 5257
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/any/local-linuxthreads-setclock.diff
Log:
fixup any/local-linuxthreads-setclock.diff. Closes: #673711.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2012-05-25 00:34:00 UTC (rev 5256)
+++ glibc-package/trunk/debian/changelog 2012-05-26 14:10:21 UTC (rev 5257)
@@ -1,4 +1,4 @@
-eglibc (2.13-33) UNRELEASED; urgency=low
+eglibc (2.13-33) UNRELEASED; urgency=medium
[ Clint Adams ]
* patches/localedata/cvs-rupeesign.diff: use new rupee symbol
@@ -27,6 +27,9 @@
* patches/hurd-i386/libpthread.diff: Add -lrt in libpthread.a to fix static
linking.
+ [ Petr Salinger ]
+ * fixup any/local-linuxthreads-setclock.diff. Closes: #673711.
+
-- Clint Adams <clint@debian.org> Fri, 04 May 2012 23:39:00 -0400
eglibc (2.13-32) unstable; urgency=medium
Modified: glibc-package/trunk/debian/patches/any/local-linuxthreads-setclock.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/local-linuxthreads-setclock.diff 2012-05-25 00:34:00 UTC (rev 5256)
+++ glibc-package/trunk/debian/patches/any/local-linuxthreads-setclock.diff 2012-05-26 14:10:21 UTC (rev 5257)
@@ -31,15 +31,22 @@
sigset_t unblock, initial_mask;
int was_signalled = 0;
sigjmp_buf jmpbuf;
-@@ -1420,7 +1427,7 @@
- struct timespec reltime;
+@@ -1405,12 +1423,11 @@
+ sigprocmask(SIG_UNBLOCK, &unblock, &initial_mask);
+ while (1) {
+- struct timeval now;
+- struct timespec reltime;
++ struct timespec now, reltime;
+
/* Compute a time offset relative to now. */
- __gettimeofday (&now, NULL);
+- reltime.tv_nsec = abstime->tv_nsec - now.tv_usec * 1000;
+ INLINE_SYSCALL (clock_gettime, 2, clock_id, &now);
- reltime.tv_nsec = abstime->tv_nsec - now.tv_usec * 1000;
++ reltime.tv_nsec = abstime->tv_nsec - now.tv_nsec;
reltime.tv_sec = abstime->tv_sec - now.tv_sec;
if (reltime.tv_nsec < 0) {
+ reltime.tv_nsec += 1000000000;
--- /dev/null
+++ b/linuxthreads/pthread_condattr_getclock.c
@@ -0,0 +1,30 @@
Reply to: