about summary refs log tree commit diff
path: root/nptl
diff options
context:
space:
mode:
Diffstat (limited to 'nptl')
-rw-r--r--nptl/ChangeLog7
-rw-r--r--nptl/Makefile8
2 files changed, 14 insertions, 1 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index f7241c51e4..bc8ae0d759 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,10 @@
+2014-02-14  Joseph Myers  <joseph@codesourcery.com>
+
+	* Makefile ($(objpfx)tst-cleanup0.out): Do not run cmp.
+	[$(run-built-tests) = yes] (tests): Depend on
+	$(objpfx)tst-cleanup0-cmp.out.
+	($(objpfx)tst-cleanup0-cmp.out): New rule.
+
 2014-02-10  Ondřej Bílka  <neleai@seznam.cz>
 
 	* allocatestack.c (queue_stack, allocate_stack,
diff --git a/nptl/Makefile b/nptl/Makefile
index 57cc8c69e4..889552ffc1 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -542,7 +542,13 @@ endif
 ifeq ($(build-shared),yes)
 
 $(objpfx)tst-cleanup0.out: /dev/null $(objpfx)tst-cleanup0
-	$(make-test-out) 2>&1 | cmp - tst-cleanup0.expect > $@
+	$(make-test-out) > $@ 2>&1
+
+ifeq ($(run-built-tests),yes)
+tests: $(objpfx)tst-cleanup0-cmp.out
+endif
+$(objpfx)tst-cleanup0-cmp.out: tst-cleanup0.expect $(objpfx)tst-cleanup0.out
+	cmp $^ > $@
 
 $(objpfx)crti.o: $(objpfx)pt-crti.o
 	ln -f $< $@