about summary refs log tree commit diff
path: root/sysdeps
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2020-06-08 13:32:08 +0200
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2020-06-08 14:34:22 +0200
commitdd7a8ad7ba25cb2269b306758c7d97d4a95527e6 (patch)
tree2b2ad1c4cc26eec1dedbc8452edc23943ecd26aa /sysdeps
parent314a431d37757ad179e89b83c3cb5720bae26e60 (diff)
downloadglibc-dd7a8ad7ba25cb2269b306758c7d97d4a95527e6.tar.gz
glibc-dd7a8ad7ba25cb2269b306758c7d97d4a95527e6.tar.xz
glibc-dd7a8ad7ba25cb2269b306758c7d97d4a95527e6.zip
pthread: Move back linking rules to nptl and htl
d6d74ec16 ('htl: Enable more tests') moved the linking rules from
nptl/Makefile and htl/Makefile to the shared sysdeps/pthread/Makefile.  But
e.g. on powerpc some tests are added in sysdeps/powerpc/Makefile, which is
included *after* sysdeps/pthread/Makefile, and thus the tests don't get
affected by the rules and fail to link.  For now let's just copy over the
set of rules in both nptl/Makefile and htl/Makefile.

* sysdeps/pthread/Makefile: Move libpthread linking rules to...
* htl/Makefile: ... here and...
* nptl/Makefile: ... there.
Diffstat (limited to 'sysdeps')
-rw-r--r--sysdeps/pthread/Makefile18
1 files changed, 0 insertions, 18 deletions
diff --git a/sysdeps/pthread/Makefile b/sysdeps/pthread/Makefile
index 2d483c8534..8d094b2221 100644
--- a/sysdeps/pthread/Makefile
+++ b/sysdeps/pthread/Makefile
@@ -228,22 +228,4 @@ LDFLAGS-tst-join7mod.so = -Wl,-soname,tst-join7mod.so
 
 CFLAGS-tst-unwind-thread.c += -funwind-tables
 
-# Make sure we link with the thread library.
-ifeq ($(build-shared),yes)
-$(addprefix $(objpfx), \
-  $(filter-out $(tests-static) $(xtests-static) $(tests-reverse) \
-    $(tests-nolibpthread), \
-    $(tests) $(tests-internal) $(xtests) $(test-srcs) $(tests-container))): \
-	$(objpfx)libpthread.so
-$(objpfx)tst-unload: $(libdl)
-# $(objpfx)../libc.so is used instead of $(common-objpfx)libc.so,
-# since otherwise libpthread.so comes before libc.so when linking.
-$(addprefix $(objpfx), $(tests-reverse)): \
-  $(objpfx)../libc.so $(objpfx)libpthread.so
-$(objpfx)../libc.so: $(common-objpfx)libc.so ;
-$(addprefix $(objpfx),$(tests-static) $(xtests-static)): $(objpfx)libpthread.a
-else
-$(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
-endif
-
 endif