Fix malloc threaded tests link on non-Linux

	* malloc/Makefile ($(objpfx)tst-malloc-backtrace,
	$(objpfx)tst-malloc-thread-exit, $(objpfx)tst-malloc-thread-fail): Use
	$(shared-thread-library) instead of hardcoding the path to libpthread.

(cherry picked from commit b87e41378beca3c98ec3464d64835e66cc788497)

diff --git a/ChangeLog b/ChangeLog
index 06bb23f89ab183d735d7d9f6bd57281cf20126ed..adf920a33596a1bd7bc3a0c102f430aec0737192 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2016-03-22  Samuel Thibault  <samuel.thibault@ens-lyon.org>
+
+       * malloc/Makefile ($(objpfx)tst-malloc-backtrace,
+       $(objpfx)tst-malloc-thread-exit, $(objpfx)tst-malloc-thread-fail): Use
+       $(shared-thread-library) instead of hardcoding the path to libpthread.
+
 2016-02-19  Florian Weimer  <fweimer@redhat.com>
 
        * sysdeps/generic/malloc-machine.h: Assume mutex_init is always

diff --git a/malloc/Makefile b/malloc/Makefile
index 360288bef847b6d4a975732b0611d084185c5854..59d4264ae0c50bf81fb92d6683e60f00963ced83 100644 (file)
--- a/malloc/Makefile
+++ b/malloc/Makefile
@@ -46,12 +46,9 @@ extra-libs-others = $(extra-libs)
 libmemusage-routines = memusage
 libmemusage-inhibit-o = $(filter-out .os,$(object-suffixes))
 
-$(objpfx)tst-malloc-backtrace: $(common-objpfx)nptl/libpthread.so \
-                              $(common-objpfx)nptl/libpthread_nonshared.a
-$(objpfx)tst-malloc-thread-exit: $(common-objpfx)nptl/libpthread.so \
-                              $(common-objpfx)nptl/libpthread_nonshared.a
-$(objpfx)tst-malloc-thread-fail: $(common-objpfx)nptl/libpthread.so \
-                              $(common-objpfx)nptl/libpthread_nonshared.a
+$(objpfx)tst-malloc-backtrace: $(shared-thread-library)
+$(objpfx)tst-malloc-thread-exit: $(shared-thread-library)
+$(objpfx)tst-malloc-thread-fail: $(shared-thread-library)
 
 # These should be removed by `make clean'.
 extra-objs = mcheck-init.o libmcheck.a