From b87e41378beca3c98ec3464d64835e66cc788497 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Tue, 22 Mar 2016 09:58:48 +0100 Subject: [PATCH] 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. --- ChangeLog | 6 ++++++ malloc/Makefile | 9 +++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0a0e9d975b..36360d9134 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2016-03-22 Samuel Thibault + + * 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-03-22 Joseph Myers * sysdeps/unix/sysv/linux/kernel-features.h diff --git a/malloc/Makefile b/malloc/Makefile index 360288bef8..59d4264ae0 100644 --- 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