Andreas Schwab
44414488d6
- Import patches from 2.23 branch OBS-URL: https://build.opensuse.org/request/show/394998 OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=436
27 lines
1.2 KiB
Diff
27 lines
1.2 KiB
Diff
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.
|
|
|
|
Index: glibc-2.23/malloc/Makefile
|
|
===================================================================
|
|
--- glibc-2.23.orig/malloc/Makefile
|
|
+++ glibc-2.23/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
|