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 /linuxthreads | |
| parent | b78ad5fd49ddfbe2e74aa6f00afbe992399c0efe (diff) | |
| download | glibc-3f488b9cddc0a49b0860a3714eb7a77019482d38.tar glibc-3f488b9cddc0a49b0860a3714eb7a77019482d38.tar.gz glibc-3f488b9cddc0a49b0860a3714eb7a77019482d38.tar.bz2 glibc-3f488b9cddc0a49b0860a3714eb7a77019482d38.zip | |
* 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 'linuxthreads')
| -rw-r--r-- | linuxthreads/ChangeLog | 13 | ||||
| -rw-r--r-- | linuxthreads/Makefile | 11 |
2 files changed, 13 insertions, 11 deletions
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog index 3a0af11862..e983f61b34 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 a6689bb4a0..3f06c41276 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/ |