From 8e13c51bb579d56b52e93a058c9efb0bbab35d1b Mon Sep 17 00:00:00 2001 From: Palmer Dabbelt Date: Tue, 26 Dec 2017 20:56:44 -0800 Subject: [PATCH] Avoid race conditions when rebuilding librt.so `make check' sometimes triggers a rebuild of librt.so using nptl/Makefile, which ignores librt's dependence on libpthread. This causes the build to blow up when we attempt to run the test suite on RISC-V. 2018-01-06 Palmer Dabbelt * nptl/Makefile (/librt.so): Always depend on "$(shared-thread-library)". --- ChangeLog | 2 ++ nptl/Makefile | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/ChangeLog b/ChangeLog index 905d93a..8ddf37e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19,6 +19,8 @@ (VDSO_HASH_LINUX_4_15): Likewise. * scripts/build-many-glibcs.py (class Glibc): Strip shared objects in subdirectories of lib. + * nptl/Makefile (/librt.so): Always depend on + "$(shared-thread-library)". 2018-01-06 Samuel Thibault diff --git a/nptl/Makefile b/nptl/Makefile index d7ed500..48b7e4b 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -612,6 +612,10 @@ else librt = $(common-objpfx)rt/librt.a endif +# `make check' sometimes triggers a rebuild of librt.so using this Makefile, +# which ignores librt's dependence on libpthread +$(common-objpfx)rt/librt.so: $(shared-thread-library) + $(objpfx)tst-cancel17: $(librt) $(objpfx)tst-cancelx17: $(librt) $(objpfx)tst-_res1mod2.so: $(objpfx)tst-_res1mod1.so -- 2.7.4