This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
[gold commit] Fix testsuite issues in PR gold/16010
- From: ccoutant at google dot com (Cary Coutant)
- To: binutils at sourceware dot org
- Date: Mon, 7 Oct 2013 10:13:06 -0700 (PDT)
- Subject: [gold commit] Fix testsuite issues in PR gold/16010
- Authentication-results: sourceware.org; auth=none
PR gold/16010 notes a couple of bugs in the Makefile for the gold
testsuite. Three of the ICF tests had a problem where one command
generates two output files, and the rules as written caused some
problems with parallel make. The large_symbol_alignment test also
inherited the default LDADD rule, which adds a library not listed
among the test's DEPENDENCIES.
I've committed the following patch to fix these problems.
-cary
2013-10-07 Cary Coutant <ccoutant@google.com>
gold/
PR gold/16010
* testsuite/Makefile.am (icf_test): Fix dependencies.
(icf_safe_test): Likewise.
(icf_safe_so_test): Likewise.
(large_symbol_alignment): Add empty _LDADD rule.
* testsuite/Makefile.in: Regenerate.
Index: gold/testsuite/Makefile.am
===================================================================
RCS file: /cvs/src/src/gold/testsuite/Makefile.am,v
retrieving revision 1.216
diff -u -p -r1.216 Makefile.am
--- gold/testsuite/Makefile.am 14 Jun 2013 20:07:18 -0000 1.216
+++ gold/testsuite/Makefile.am 7 Oct 2013 16:56:24 -0000
@@ -208,8 +208,10 @@ check_DATA += icf_test.map
MOSTLYCLEANFILES += icf_test icf_test.map
icf_test.o: icf_test.cc
$(CXXCOMPILE) -O0 -c -ffunction-sections -g -o $@ $<
-icf_test icf_test.map: icf_test.o gcctestdir/ld
+icf_test: icf_test.o gcctestdir/ld
$(CXXLINK) -o icf_test -Bgcctestdir/ -Wl,--icf=all,-Map,icf_test.map icf_test.o
+icf_test.map: icf_test
+ @touch icf_test.map
check_SCRIPTS += icf_keep_unique_test.sh
check_DATA += icf_keep_unique_test.stdout
@@ -226,8 +228,10 @@ check_DATA += icf_safe_test_1.stdout icf
MOSTLYCLEANFILES += icf_safe_test icf_safe_test.map
icf_safe_test.o: icf_safe_test.cc
$(CXXCOMPILE) -O0 -c -ffunction-sections -g -o $@ $<
-icf_safe_test icf_safe_test.map: icf_safe_test.o gcctestdir/ld
+icf_safe_test: icf_safe_test.o gcctestdir/ld
$(CXXLINK) -o icf_safe_test -Bgcctestdir/ -Wl,--icf=safe,-Map,icf_safe_test.map icf_safe_test.o
+icf_safe_test.map: icf_safe_test
+ @touch icf_safe_test.map
icf_safe_test_1.stdout: icf_safe_test
$(TEST_NM) $< > $@
icf_safe_test_2.stdout: icf_safe_test
@@ -238,8 +242,10 @@ check_DATA += icf_safe_so_test_1.stdout
MOSTLYCLEANFILES += icf_safe_so_test icf_safe_so_test.map
icf_safe_so_test.o: icf_safe_so_test.cc
$(CXXCOMPILE) -O0 -c -ffunction-sections -fPIC -g -o $@ $<
-icf_safe_so_test icf_safe_so_test.map: icf_safe_so_test.o gcctestdir/ld
+icf_safe_so_test: icf_safe_so_test.o gcctestdir/ld
$(CXXLINK) -o icf_safe_so_test -Bgcctestdir/ -Wl,--icf=safe,-Map,icf_safe_so_test.map icf_safe_so_test.o -fPIC -shared
+icf_safe_so_test.map:
+ @touch icf_safe_so_test.map
icf_safe_so_test_1.stdout: icf_safe_so_test
$(TEST_NM) $< > $@
icf_safe_so_test_2.stdout: icf_safe_so_test
@@ -326,6 +332,7 @@ check_PROGRAMS += large_symbol_alignment
large_symbol_alignment_SOURCES = large_symbol_alignment.cc
large_symbol_alignment_DEPENDENCIES = gcctestdir/ld
large_symbol_alignment_LDFLAGS = -Bgcctestdir/
+large_symbol_alignment_LDADD =
check_SCRIPTS += merge_string_literals.sh
check_DATA += merge_string_literals.stdout