From: Palmer Dabbelt <palmer@dabbelt.com>
Date: Wed, 27 Dec 2017 04:56:44 +0000 (-0800)
Subject: Avoid race conditions when rebuilding librt.so
X-Git-Tag: glibc-2.27~167
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8e13c51bb579d56b52e93a058c9efb0bbab35d1b;p=thirdparty%2Fglibc.git

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  <palmer@sifive.com>

        * nptl/Makefile (/librt.so): Always depend on
        "$(shared-thread-library)".
---

diff --git a/ChangeLog b/ChangeLog
index 905d93aad19..8ddf37ebb88 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  <samuel.thibault@ens-lyon.org>
 
diff --git a/nptl/Makefile b/nptl/Makefile
index d7ed5007073..48b7e4bc9e9 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