about summary refs log tree commit diff
path: root/nptl
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 /nptl
parentaa8a3b59b1603ce0855e5130cb060318c8e8c78d (diff)
downloadglibc-2a561bf1e19f064e2f5689e961ea1f8e51bc14a0.tar.gz
glibc-2a561bf1e19f064e2f5689e961ea1f8e51bc14a0.tar.xz
glibc-2a561bf1e19f064e2f5689e961ea1f8e51bc14a0.zip
Updated to fedora-glibc-20041203T0935
Diffstat (limited to 'nptl')
-rw-r--r--nptl/ChangeLog14
-rw-r--r--nptl/Makefile9
2 files changed, 14 insertions, 9 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 9e193981de..fdbfde38fb 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,17 @@
+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-17  Roland McGrath  <roland@redhat.com>
+
+	* sysdeps/unix/sysv/linux/timer_create.c (timer_create): Handle
+	CLOCK_PROCESS_CPUTIME_ID and CLOCK_PROCESS_THREAD_ID specially,
+	translating to the kernel clockid_t for our own process/thread clock.
+
 2004-11-27  Ulrich Drepper  <drepper@redhat.com>
 
 	* sysdeps/unix/sysv/linux/bits/posix_opt.h (_POSIX_PRIORITIZED_IO,
diff --git a/nptl/Makefile b/nptl/Makefile
index 7152144609..d677318d00 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -125,8 +125,6 @@ libpthread-routines = init vars events version \
 libpthread-shared-only-routines = version pt-allocrtsig unwind-forcedunwind
 libpthread-static-only-routines = pthread_atfork
 
-libpthread-nonshared = pthread_atfork
-
 CFLAGS-pthread_atfork.c = -DNOT_IN_libc
 
 # Since cancellation handling is in large parts handled using exceptions
@@ -301,13 +299,8 @@ $(test-modules): $(objpfx)%.so: $(objpfx)%.os $(common-objpfx)shlib.lds
 ifeq ($(build-shared),yes)
 # Build all the modules even when not actually running test programs.
 tests: $(test-modules)
-
-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.
@@ -378,8 +371,6 @@ $(inst_libdir)/libpthread.so: $(common-objpfx)format.lds \
 	      ')' \
 	) > $@.new
 	mv -f $@.new $@
-$(inst_libdir)/libpthread_nonshared.a: $(objpfx)libpthread_nonshared.a
-	$(do-install)
 endif