summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2006-08-15 20:43:52 +0000
committerJakub Jelinek <jakub@redhat.com>2006-08-15 20:43:52 +0000
commitab3017a58b517cb20feb6e6688b9cb1948c00156 (patch)
tree8241ada53866bb5e8fc216c519fb02a4c9edf2e4
parent977e1ac9afec4afa4e1ac5a704d30bb45b582bc9 (diff)
Updated to fedora-glibc-20060815T2033cvs/fedora-glibc-2_4_90-21
-rw-r--r--fedora/branch.mk4
-rw-r--r--fedora/glibc.spec.in3
-rw-r--r--nptl/ChangeLog7
-rw-r--r--nptl/Makefile4
-rw-r--r--sysdeps/unix/sysv/linux/clock_settime.c4
5 files changed, 15 insertions, 7 deletions
diff --git a/fedora/branch.mk b/fedora/branch.mk
index 2416955f13..1c17d89707 100644
--- a/fedora/branch.mk
+++ b/fedora/branch.mk
@@ -3,5 +3,5 @@ glibc-branch := fedora
glibc-base := HEAD
DIST_BRANCH := devel
COLLECTION := dist-fc4
-fedora-sync-date := 2006-08-15 05:33 UTC
-fedora-sync-tag := fedora-glibc-20060815T0533
+fedora-sync-date := 2006-08-15 20:33 UTC
+fedora-sync-tag := fedora-glibc-20060815T2033
diff --git a/fedora/glibc.spec.in b/fedora/glibc.spec.in
index 4c292a497d..3fb4576c5a 100644
--- a/fedora/glibc.spec.in
+++ b/fedora/glibc.spec.in
@@ -1,4 +1,4 @@
-%define glibcrelease 20
+%define glibcrelease 21
%define auxarches i586 i686 athlon sparcv9 alphaev6
%define xenarches i686 athlon
%ifarch %{xenarches}
@@ -1448,6 +1448,7 @@ rm -f *.filelist*
%endif
%changelog
+* Tue Aug 15 2006 Jakub Jelinek <jakub@redhat.com> 2.4.90-21
- if some test gets stuck, kill the tee process after make check
finishes
- build with -mtune=generic on i686 and x86_64
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index fe6e5c06c3..ce0cb9af4f 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,10 @@
+2006-08-15 Jakub Jelinek <jakub@redhat.com>
+
+ * sysdeps/unix/sysv/linux/clock_settime.c (INTERNAL_VSYSCALL): Use
+ HAVE_CLOCK_GETRES_VSYSCALL as guard macro rather than
+ HAVE_CLOCK_GETTIME_VSYSCALL.
+ (maybe_syscall_settime_cpu): Use plain INTERNAL_VSYSCALL here.
+
2006-08-14 Jakub Jelinek <jakub@redhat.com>
* sysdeps/unix/sysv/linux/bits/posix_opt.h
diff --git a/nptl/Makefile b/nptl/Makefile
index c0c09e52fe..47cc4b08db 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -122,7 +122,7 @@ libpthread-routines = init vars events version \
pthread_mutexattr_getprotocol \
pthread_mutexattr_setprotocol \
pthread_mutexattr_getprioceiling \
- pthread_mutexattr_setprioceiling \
+ pthread_mutexattr_setprioceiling tpp \
pthread_mutex_getprioceiling pthread_mutex_setprioceiling
# pthread_setuid pthread_seteuid pthread_setreuid \
# pthread_setresuid \
@@ -258,7 +258,7 @@ tests = tst-typesizes \
tst-vfork1 tst-vfork2 tst-vfork1x tst-vfork2x \
tst-getpid1 tst-getpid2 tst-getpid3 \
tst-initializers1 $(patsubst %,tst-initializers1-%,c89 gnu89 c99 gnu99)
-xtests = tst-setuid1 tst-setuid1-static
+xtests = tst-setuid1 tst-setuid1-static tst-mutexpp1 tst-mutexpp6 tst-mutexpp10
# Files which must not be linked with libpthread.
tests-nolibpthread = tst-unload
diff --git a/sysdeps/unix/sysv/linux/clock_settime.c b/sysdeps/unix/sysv/linux/clock_settime.c
index 731b7be7b8..217ae3f29b 100644
--- a/sysdeps/unix/sysv/linux/clock_settime.c
+++ b/sysdeps/unix/sysv/linux/clock_settime.c
@@ -22,7 +22,7 @@
#include "kernel-posix-cpu-timers.h"
#include <kernel-features.h>
-#ifndef HAVE_CLOCK_GETTIME_VSYSCALL
+#ifndef HAVE_CLOCK_GETRES_VSYSCALL
# undef INTERNAL_VSYSCALL
# define INTERNAL_VSYSCALL INTERNAL_SYSCALL
# undef INLINE_VSYSCALL
@@ -43,7 +43,7 @@ maybe_syscall_settime_cpu (clockid_t clock_id, const struct timespec *tp)
if (!__libc_missing_posix_cpu_timers)
{
INTERNAL_SYSCALL_DECL (err);
- int r = INTERNAL_VSYSCALL (clock_settime, err, 2, clock_id, tp);
+ int r = INTERNAL_SYSCALL (clock_settime, err, 2, clock_id, tp);
if (!INTERNAL_SYSCALL_ERROR_P (r, err))
return 0;