aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2002-12-31 06:53:45 +0000
committerUlrich Drepper <drepper@redhat.com>2002-12-31 06:53:45 +0000
commitc1d3faf176931aa7e47ee7e17cff3b8f07a4835e (patch)
tree7af21c6eb641256d619e4734cb5aba1d8c2d7fb9
parent2b8d46acee61330cdd689447964f80240965d5f6 (diff)
downloadglibc-c1d3faf176931aa7e47ee7e17cff3b8f07a4835e.zip
glibc-c1d3faf176931aa7e47ee7e17cff3b8f07a4835e.tar.gz
glibc-c1d3faf176931aa7e47ee7e17cff3b8f07a4835e.tar.bz2
($(inst_libdir)/libpthread.so): Depend on $(common-objpfx)format.lds, include that into the output script. Fix comment. (extra-B-pthread.so): Change linuxthreads/ into nptl/.
-rw-r--r--nptl/Makefile12
1 files changed, 7 insertions, 5 deletions
diff --git a/nptl/Makefile b/nptl/Makefile
index 198f2b3..f1aaf48 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -175,20 +175,22 @@ tests-reverse += tst-cancel5
include ../Rules
-# What we install as libc.so for programs to link against is in fact a
+# What we install as libpthread.so for programs to link against is in fact a
# link script. It contains references for the various libraries we need.
-# The libc.so object is not complete since some functions are only defined
-# in libc_nonshared.a.
+# The libpthread.so object is not complete since some functions are only
+# defined in libpthread_nonshared.a.
# We need to use absolute paths since otherwise local copies (if they exist)
# of the files are taken by the linker.
install: $(inst_libdir)/libpthread.so
-$(inst_libdir)/libpthread.so: $(objpfx)libpthread.so$(libpthread.so-version) \
+$(inst_libdir)/libpthread.so: $(common-objpfx)format.lds \
+ $(objpfx)libpthread.so$(libpthread.so-version) \
$(inst_libdir)/$(patsubst %,$(libtype.oS),\
$(libprefix)pthread) \
$(+force)
(echo '/* GNU ld script';\
echo ' Use the shared library, but some functions are only in';\
echo ' the static library, so try that secondarily. */';\
+ cat $<; \
echo 'GROUP ( $(slibdir)/libpthread.so$(libpthread.so-version)' \
'$(libdir)/$(patsubst %,$(libtype.oS),$(libprefix)pthread)'\
')' \
@@ -200,7 +202,7 @@ $(inst_libdir)/libpthread_nonshared.a: $(objpfx)libpthread_nonshared.a
CFLAGS-tst-unload.c += -DPREFIX=\"$(objpfx)\"
-extra-B-pthread.so = -B$(common-objpfx)linuxthreads/
+extra-B-pthread.so = -B$(common-objpfx)nptl/
$(objpfx)libpthread.so: $(objpfx)crti.o
$(objpfx)libpthread.so: +preinit += $(objpfx)crti.o