summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Modra <amodra@gmail.com>2018-11-02 13:59:31 +1030
committerAlan Modra <amodra@gmail.com>2018-11-02 14:00:15 +1030
commit396ce9988361a812ec620ac392839dbb9594db62 (patch)
tree8acc1fc06fc74ec91da3c2d8917d5a288e712ae6
parent285e3f99c77510344021b1252c594b28fe7971e8 (diff)
downloadbinutils-gdb-396ce9988361a812ec620ac392839dbb9594db62.tar.gz
[GOLD] make clean
Cleans a few more test files. * Makefile.am (MOSTLYCLEANFILES): Define. * Makefile.in: Regnerate. * testsuite/Makefile.am (MOSTLYCLEANFILES): Add ver_test_14 and gnu_property_test. * testsuite/Makefile.in: Regnerate.
-rw-r--r--gold/ChangeLog8
-rw-r--r--gold/Makefile.am3
-rw-r--r--gold/Makefile.in6
-rw-r--r--gold/testsuite/Makefile.am2
-rw-r--r--gold/testsuite/Makefile.in8
5 files changed, 24 insertions, 3 deletions
diff --git a/gold/ChangeLog b/gold/ChangeLog
index 9bad89b4f0a..c46897625e0 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,11 @@
+2018-11-02 Alan Modra <amodra@gmail.com>
+
+ * Makefile.am (MOSTLYCLEANFILES): Define.
+ * Makefile.in: Regnerate.
+ * testsuite/Makefile.am (MOSTLYCLEANFILES): Add ver_test_14 and
+ gnu_property_test.
+ * testsuite/Makefile.in: Regnerate.
+
2018-10-16 Cherry Zhang <cherryyz@google.com>
PR 23769
diff --git a/gold/Makefile.am b/gold/Makefile.am
index 3586ebd35f3..fd0a3591855 100644
--- a/gold/Makefile.am
+++ b/gold/Makefile.am
@@ -315,6 +315,7 @@ bootstrap-test-r: ld2-r
check_PROGRAMS = ld1 ld2 ld1-r ld2-r
TESTS = bootstrap-test bootstrap-test-r
+MOSTLYCLEANFILES = bootstrap-test bootstrap-test-r
# Verify that changing the number of threads doesn't change the
# treehash computation, by building ld1 and ld3 the same way except
@@ -324,6 +325,7 @@ TESTS = bootstrap-test bootstrap-test-r
# because the treehash can still operate in that mode.
check_PROGRAMS += ld4
TESTS += bootstrap-test-treehash-chunksize
+MOSTLYCLEANFILES += bootstrap-test-treehash-chunksize
gcctestdir3/ld: ld-new
test -d gcctestdir3 || mkdir -p gcctestdir3
@@ -358,6 +360,7 @@ ld3_LDFLAGS += -Wl,--thread-count=13
ld4_LDFLAGS += -Wl,--thread-count=3
check_PROGRAMS += ld3
TESTS += bootstrap-test-treehash-chunksize
+MOSTLYCLEANFILES += bootstrap-test-treehash-chunksize
bootstrap-test-treehash: ld1 ld3
rm -f $@
diff --git a/gold/Makefile.in b/gold/Makefile.in
index f0ae9771c14..2c43cf0dcc5 100644
--- a/gold/Makefile.in
+++ b/gold/Makefile.in
@@ -120,6 +120,7 @@ noinst_PROGRAMS = ld-new$(EXEEXT) incremental-dump$(EXEEXT)
@GCC_TRUE@@NATIVE_LINKER_TRUE@@THREADS_TRUE@am__append_4 = -Wl,--thread-count=3
@GCC_TRUE@@NATIVE_LINKER_TRUE@@THREADS_TRUE@am__append_5 = ld3
@GCC_TRUE@@NATIVE_LINKER_TRUE@@THREADS_TRUE@am__append_6 = bootstrap-test-treehash-chunksize
+@GCC_TRUE@@NATIVE_LINKER_TRUE@@THREADS_TRUE@am__append_7 = bootstrap-test-treehash-chunksize
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../config/ax_pthread.m4 \
@@ -866,6 +867,10 @@ POTFILES = $(CCFILES) $(HFILES) $(TARGETSOURCES)
@GCC_TRUE@@NATIVE_LINKER_TRUE@TESTS = bootstrap-test bootstrap-test-r \
@GCC_TRUE@@NATIVE_LINKER_TRUE@ bootstrap-test-treehash-chunksize \
@GCC_TRUE@@NATIVE_LINKER_TRUE@ $(am__append_6)
+@GCC_TRUE@@NATIVE_LINKER_TRUE@MOSTLYCLEANFILES = bootstrap-test \
+@GCC_TRUE@@NATIVE_LINKER_TRUE@ bootstrap-test-r \
+@GCC_TRUE@@NATIVE_LINKER_TRUE@ bootstrap-test-treehash-chunksize \
+@GCC_TRUE@@NATIVE_LINKER_TRUE@ $(am__append_7)
@GCC_TRUE@@NATIVE_LINKER_TRUE@ld3_SOURCES = $(sources_var)
@GCC_TRUE@@NATIVE_LINKER_TRUE@ld3_DEPENDENCIES = $(deps_var) gcctestdir3/ld
@GCC_TRUE@@NATIVE_LINKER_TRUE@ld3_LDADD = $(ldadd_var)
@@ -1448,6 +1453,7 @@ install-strip:
"INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
fi
mostlyclean-generic:
+ -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
-test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
-test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
-test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
diff --git a/gold/testsuite/Makefile.am b/gold/testsuite/Makefile.am
index c1c5539cdb0..f4c1f4686fe 100644
--- a/gold/testsuite/Makefile.am
+++ b/gold/testsuite/Makefile.am
@@ -1875,6 +1875,7 @@ ver_test_13.o: ver_test_13.c
check_SCRIPTS += ver_test_14.sh
check_DATA += ver_test_14.syms
+MOSTLYCLEANFILES += ver_test_14
ver_test_14.syms: ver_test_14
$(TEST_OBJDUMP) -T $< | $(TEST_CXXFILT) >$@
ver_test_14: gcctestdir/ld ver_test_main.o ver_test_1.so ver_test_2.so ver_test_4.so ver_test_14.script
@@ -3267,6 +3268,7 @@ endif DEFAULT_TARGET_X86_64
if DEFAULT_TARGET_X86_64
check_SCRIPTS += gnu_property_test.sh
check_DATA += gnu_property_test.stdout
+MOSTLYCLEANFILES += gnu_property_test
gnu_property_test.stdout: gnu_property_test
$(TEST_READELF) -n $< >$@
gnu_property_test: gcctestdir/ld gnu_property_a.o gnu_property_b.o gnu_property_c.o
diff --git a/gold/testsuite/Makefile.in b/gold/testsuite/Makefile.in
index 08b5c07a672..3c6ea980efe 100644
--- a/gold/testsuite/Makefile.in
+++ b/gold/testsuite/Makefile.in
@@ -426,8 +426,9 @@ check_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3) \
@GCC_TRUE@@NATIVE_LINKER_TRUE@ flagstest_compress_debug_sections_gabi.check \
@GCC_TRUE@@NATIVE_LINKER_TRUE@ pr18689a.o pr18689b.o \
@GCC_TRUE@@NATIVE_LINKER_TRUE@ flagstest_o_ttext_2 \
-@GCC_TRUE@@NATIVE_LINKER_TRUE@ ver_test_11.a protected_3.err \
-@GCC_TRUE@@NATIVE_LINKER_TRUE@ justsyms_lib binary.txt \
+@GCC_TRUE@@NATIVE_LINKER_TRUE@ ver_test_11.a ver_test_14 \
+@GCC_TRUE@@NATIVE_LINKER_TRUE@ protected_3.err justsyms_lib \
+@GCC_TRUE@@NATIVE_LINKER_TRUE@ binary.txt \
@GCC_TRUE@@NATIVE_LINKER_TRUE@ ver_matching_test.stdout \
@GCC_TRUE@@NATIVE_LINKER_TRUE@ script_test_3.stdout \
@GCC_TRUE@@NATIVE_LINKER_TRUE@ script_test_4 script_test_5 \
@@ -892,7 +893,8 @@ check_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3) \
@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@ incremental_test_4.base \
@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@ two_file_test_tmp_4.o \
@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@ two_file_test_5.a \
-@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@ two_file_test_6.a
+@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@ two_file_test_6.a \
+@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@ gnu_property_test
@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@am__append_84 = gnu_property_test.sh
@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@am__append_85 = gnu_property_test.stdout
@GCC_TRUE@@NATIVE_LINKER_TRUE@am__append_86 = pr22266