aboutsummaryrefslogtreecommitdiff
path: root/linuxthreads
diff options
context:
space:
mode:
authorGreg McGary <greg@mcgary.org>2000-08-17 07:38:02 +0000
committerGreg McGary <greg@mcgary.org>2000-08-17 07:38:02 +0000
commite64911d1d6b3539c69d9cfe4fdaa5841e4f28cc8 (patch)
tree29ef3bfb2c18e1605e78881b97e5e2fd5be896cf /linuxthreads
parent9e25f6e29bd6728ad4012e3c4c9b11a96b7a4acf (diff)
downloadglibc-e64911d1d6b3539c69d9cfe4fdaa5841e4f28cc8.tar
glibc-e64911d1d6b3539c69d9cfe4fdaa5841e4f28cc8.tar.gz
glibc-e64911d1d6b3539c69d9cfe4fdaa5841e4f28cc8.tar.bz2
glibc-e64911d1d6b3539c69d9cfe4fdaa5841e4f28cc8.zip
Update.
2000-08-17 Greg McGary <greg@mcgary.org> * Makeconfig (link-extra-libs-bounded): Strip `-bp' suffix from test program name when constructing suffix for $(LDLIBS-*). (bounded-thread-library): New variable. * crypt/Makefile [build-shared, build-static] (libcrypt-dep): Remove variable. ($(addprefix $(objpfx),$(tests))): Consolidate individual dependencies. [build-bounded] ($(tests:%=$(objpfx)%-bp)): Add dependencies. * linuxthreads/Makefile (libpthread, librt): Remove variables. (librt-tests): Add variable. (tests): Use it. [build-shared, build-static] ($(addprefix $(objpfx),$(tests)), $(addprefix $(objpfx),$(librt-tests))): Consolidate individual dependencies. [build-bounded] ($(tests:%=$(objpfx)%-bp), $(librt-tests:%=$(objpfx)%-bp)): Add dependencies. * math/Makefile (LDLIBS-*): Remove variables (they are redundant). [build-bounded] ($(tests:%=$(objpfx)%-bp)): Add dependencies. * misc/Makefile [build-bounded] ($(objpfx)tst-tsearch-bp): Add dependencies. * rt/Makefile [build-shared, build-static] ($(addprefix $(objpfx),$(tests))): Consolidate individual dependencies. [build-bounded] ($(tests:%=$(objpfx)%-bp)): Add dependencies. 2000-08-17 Greg McGary <greg@mcgary.org> * sysdeps/generic/bp-checks.h: s/\(CHECK\w+\)opt/\1_NULL_OK/ * sysdeps/unix/make-syscalls.sh: Likewise. * sysdeps/unix/sysv/linux/shmctl.c: Likewise. * sysdeps/unix/sysv/linux/sigprocmask.c: Likewise. * sysdeps/unix/sysv/linux/ia64/sigaction.c: Likewise. * sysdeps/unix/sysv/linux/ia64/sigprocmask.c: Likewise. * sysdeps/unix/sysv/linux/sparc/sparc64/sigprocmask.c: Likewise. 2000-08-17 Greg McGary <greg@mcgary.org> * sysdeps/i386/fpu/s_frexp.S: Check bounds. Wrap extern symbols in BP_SYM (). * sysdeps/i386/fpu/s_frexpf.S: Likewise. * sysdeps/i386/fpu/s_frexpl.S: Likewise. * sysdeps/i386/fpu/s_remquo.S: Likewise. * sysdeps/i386/fpu/s_remquof.S: Likewise. * sysdeps/i386/fpu/s_remquol.S: Likewise. * sysdeps/i386/fpu/s_sincos.S: Likewise. * sysdeps/i386/fpu/s_sincosf.S: Likewise. * sysdeps/i386/fpu/s_sincosl.S: Likewise. * sysdeps/unix/sysv/linux/i386/clone.S: Likewise. * sysdeps/unix/sysv/linux/i386/mmap64.S: Likewise.
Diffstat (limited to 'linuxthreads')
-rw-r--r--linuxthreads/Makefile31
1 files changed, 11 insertions, 20 deletions
diff --git a/linuxthreads/Makefile b/linuxthreads/Makefile
index 55174d4099..e60e2dc253 100644
--- a/linuxthreads/Makefile
+++ b/linuxthreads/Makefile
@@ -41,7 +41,9 @@ nodelete-yes = -Wl,--enable-new-dtags,-z,nodelete
LDFLAGS-pthread.so = $(nodelete-$(have-z-nodelete))
vpath %.c Examples
-tests = ex1 ex2 ex3 ex4 ex5 ex6 ex7 ex8 ex9 ex10 ex11 ex12 joinrace tststack
+
+librt-tests = ex10 ex11
+tests = ex1 ex2 ex3 ex4 ex5 ex6 ex7 ex8 ex9 $(librt-tests) ex12 joinrace tststack
include ../Rules
@@ -58,24 +60,13 @@ $(objpfx)libpthread.so: $(common-objpfx)libc.so
# Make sure we link with the thread library.
ifeq ($(build-shared),yes)
-libpthread = $(objpfx)libpthread.so
-librt = $(common-objpfx)rt/librt.so
+$(addprefix $(objpfx),$(tests)): $(objpfx)libpthread.so
+$(addprefix $(objpfx),$(librt-tests)): $(common-objpfx)rt/librt.so
else
-libpthread = $(objpfx)libpthread.a
-librt = $(common-objpfx)rt/librt.a
+$(addprefix $(objpfx),$(tests)): $(objpfx)libpthread.a
+$(addprefix $(objpfx),$(librt-tests)): $(common-objpfx)rt/librt.a
+endif
+ifeq ($(build-bounded),yes)
+$(tests:%=$(objpfx)%-bp): $(objpfx)libpthread_b.a
+$(librt-tests:%=$(objpfx)%-bp): $(common-objpfx)rt/librt_b.a
endif
-
-$(objpfx)ex1: $(libpthread)
-$(objpfx)ex2: $(libpthread)
-$(objpfx)ex3: $(libpthread)
-$(objpfx)ex4: $(libpthread)
-$(objpfx)ex5: $(libpthread)
-$(objpfx)ex6: $(libpthread)
-$(objpfx)ex7: $(libpthread)
-$(objpfx)ex8: $(libpthread)
-$(objpfx)ex9: $(libpthread)
-$(objpfx)ex10: $(libpthread) $(librt)
-$(objpfx)ex11: $(libpthread) $(librt)
-$(objpfx)ex12: $(libpthread)
-$(objpfx)joinrace: $(libpthread)
-$(objpfx)tststack: $(libpthread)