summaryrefslogtreecommitdiff
path: root/linuxthreads
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2004-12-03 10:17:07 +0000
committerJakub Jelinek <jakub@redhat.com>2004-12-03 10:17:07 +0000
commit2a561bf1e19f064e2f5689e961ea1f8e51bc14a0 (patch)
tree91e08d15ba52846a86a5b0d7a12dcb984c28ccd9 /linuxthreads
parentaa8a3b59b1603ce0855e5130cb060318c8e8c78d (diff)
Updated to fedora-glibc-20041203T0935
Diffstat (limited to 'linuxthreads')
-rw-r--r--linuxthreads/ChangeLog13
-rw-r--r--linuxthreads/Makefile11
2 files changed, 13 insertions, 11 deletions
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index ca2f39ee5a..a24d734fc2 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,3 +1,16 @@
+2004-12-02 Roland McGrath <roland@redhat.com>
+
+ * Makefile (libpthread-nonshared): Variable removed.
+ ($(objpfx)libpthread_nonshared.a): Target removed.
+ ($(inst_libdir)/libpthread_nonshared.a): Likewise.
+ These are now handled by generic magic from
+ libpthread-static-only-routines being set.
+
+2004-11-04 Roland McGrath <roland@redhat.com>
+
+ * sysdeps/pthread/getcpuclockid.c (pthread_getcpuclockid)
+ [__NR_clock_getres]: Use kernel-supplied CPU clocks if available.
+
2004-11-27 Ulrich Drepper <drepper@redhat.com>
* sysdeps/unix/sysv/linux/bits/posix_opt.h (_POSIX_PRIORITIZED_IO,
diff --git a/linuxthreads/Makefile b/linuxthreads/Makefile
index 75e6852733..f4c9f2a916 100644
--- a/linuxthreads/Makefile
+++ b/linuxthreads/Makefile
@@ -63,8 +63,6 @@ omit-deps = $(unix-syscalls:%=ptw-%)
libpthread-shared-only-routines = pt-allocrtsig
libpthread-static-only-routines = pthread_atfork
-libpthread-nonshared = pthread_atfork
-
linuxthreads-CPPFLAGS = -DIS_IN_linuxthreads=1
CFLAGS-pthread_atfork.c = -DNOT_IN_libc
@@ -82,13 +80,6 @@ CFLAGS-tst-cancel.c = -fno-inline -fno-inline-functions
include ../Makeconfig
ifeq ($(build-shared),yes)
-others: $(objpfx)libpthread_nonshared.a
-endif
-
-$(objpfx)libpthread_nonshared.a: $(addprefix $(objpfx),$(addsuffix .os,$(libpthread-nonshared)))
- $(AR) $(ARFLAGS) $@ $^
-
-ifeq ($(build-shared),yes)
# Set the `multidir' variable by grabbing the variable from the compiler.
# We do it once and save the result in a generated makefile.
@@ -180,8 +171,6 @@ $(inst_libdir)/libpthread.so: $(common-objpfx)format.lds \
')' \
) > $@.new
mv -f $@.new $@
-$(inst_libdir)/libpthread_nonshared.a: $(objpfx)libpthread_nonshared.a
- $(do-install)
extra-B-pthread.so = -B$(common-objpfx)linuxthreads/