about summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2004-02-19 09:02:01 +0000
committerUlrich Drepper <drepper@redhat.com>2004-02-19 09:02:01 +0000
commit1dc74473a8cb7ada214626917c107e02e570c99d (patch)
treef1bba66ccd991a68d0da5abead6ea94f719e24c6
parent37c054c7c4a969816d2bc3c8284bdcadf68ebeec (diff)
downloadglibc-1dc74473a8cb7ada214626917c107e02e570c99d.tar.gz
glibc-1dc74473a8cb7ada214626917c107e02e570c99d.tar.xz
glibc-1dc74473a8cb7ada214626917c107e02e570c99d.zip
Update.
2004-02-19  Ulrich Drepper  <drepper@redhat.com>

	* sysdeps/unix/clock_settime.c (clock_settime): Fix typo which
	prevented system-dependent handling from being used.
-rw-r--r--ChangeLog5
-rw-r--r--nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S5
-rw-r--r--sysdeps/unix/clock_settime.c6
3 files changed, 11 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index dff56bf8b2..8251309e11 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-02-19  Ulrich Drepper  <drepper@redhat.com>
+
+	* sysdeps/unix/clock_settime.c (clock_settime): Fix typo which
+	prevented system-dependent handling from being used.
+
 2004-02-18  Carlos O'Donell  <carlos@baldric.uwo.ca>
 
 	* test-skeleton.c (main): If set, use environment variable
diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S
index 3a24adf911..4722b4c0e0 100644
--- a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S
+++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
 
@@ -65,6 +65,7 @@ __pthread_cond_signal:
 	movl	total_seq(%edi), %ecx
 	cmpl	4(%ebx), %eax
 #if cond_lock != 0
+	/* Must use leal to preserve the flags.  */
 	leal	cond_lock(%edi), %edi
 #endif
 	ja	3f
@@ -76,7 +77,7 @@ __pthread_cond_signal:
 3:	addl	$1, (%ebx)
 	adcl	$0, 4(%ebx)
 
-	/* Wake up one thread by moving it to the internal lock futex.  */
+	/* Wake up one thread.  */
 	movl	$FUTEX_WAKE, %ecx
 	movl	$SYS_futex, %eax
 	movl	$1, %edx
diff --git a/sysdeps/unix/clock_settime.c b/sysdeps/unix/clock_settime.c
index 6e1f487171..0194999b36 100644
--- a/sysdeps/unix/clock_settime.c
+++ b/sysdeps/unix/clock_settime.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 1999,2000,2001,2002,2003,2004 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -59,8 +59,8 @@ clock_settime (clockid_t clock_id, const struct timespec *tp)
 	retval = settimeofday (&tv, NULL);				      \
       } while (0)
 
-#ifdef SYSDEP_GETTIME
-      SYSDEP_GETTIME;
+#ifdef SYSDEP_SETTIME
+      SYSDEP_SETTIME;
 #endif
 
 #ifndef HANDLED_REALTIME