diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2020-06-08 13:32:08 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2020-06-08 14:34:22 +0200 |
| commit | dd7a8ad7ba25cb2269b306758c7d97d4a95527e6 (patch) | |
| tree | 2b2ad1c4cc26eec1dedbc8452edc23943ecd26aa /nptl | |
| parent | 314a431d37757ad179e89b83c3cb5720bae26e60 (diff) | |
| download | glibc-dd7a8ad7ba25cb2269b306758c7d97d4a95527e6.zip glibc-dd7a8ad7ba25cb2269b306758c7d97d4a95527e6.tar.gz glibc-dd7a8ad7ba25cb2269b306758c7d97d4a95527e6.tar.bz2 | |
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 'nptl')
| -rw-r--r-- | nptl/Makefile | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/nptl/Makefile b/nptl/Makefile index 3f0b107..55cd147 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -569,6 +569,24 @@ $(objpfx)libpthread.so: $(addprefix $(objpfx),$(crti-objs) $(crtn-objs)) $(objpfx)libpthread.so: +preinit += $(addprefix $(objpfx),$(crti-objs)) $(objpfx)libpthread.so: +postinit += $(addprefix $(objpfx),$(crtn-objs)) +# 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 + ifeq ($(build-shared),yes) $(objpfx)crti.o: $(objpfx)pt-crti.o ln -f $< $@ |