diff options
| author | Roland McGrath <roland@gnu.org> | 2004-12-02 22:55:30 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2004-12-02 22:55:30 +0000 |
| commit | 3f488b9cddc0a49b0860a3714eb7a77019482d38 (patch) | |
| tree | 883d896747cf2c687083528e4610078e234c1528 /nptl | |
| parent | b78ad5fd49ddfbe2e74aa6f00afbe992399c0efe (diff) | |
* extra-lib.mk (object-suffixes-$(lib)): Add .oS whencvs/fedora-glibc-20041203T0935
$(lib)-static-only-routines is nonempty.
(extra-objs, o-iterator.mk rule): Filter out .oS from generators.
Add a special rule for .oS objects -> _nonshared.a library.
Diffstat (limited to 'nptl')
| -rw-r--r-- | nptl/ChangeLog | 14 | ||||
| -rw-r--r-- | nptl/Makefile | 9 |
2 files changed, 14 insertions, 9 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog index 4b2c1dbf1b..f045eea012 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 c103503582..f9993dd1fd 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 |