[gcc(refs/users/giulianob/heads/autopar_rebase2)] libstdc++: Enable simple invocation of runtest in testsuite

[gcc(refs/users/giulianob/heads/autopar_rebase2)] libstdc++: Enable simple invocation of runtest in testsuite

[Giuliano Belinassi]

https://gcc.gnu.org/g:e8744c8fd4467385d99a5f62eebf90c68d2a76e6

commit e8744c8fd4467385d99a5f62eebf90c68d2a76e6
Author: Matthias Kretz <kretz@kde.org>
Date:   Thu May 21 13:22:48 2020 +0100

    libstdc++: Enable simple invocation of runtest in testsuite
    
    2020-05-21  Matthias Kretz  <kretz@kde.org>
    
            * testsuite/Makefile.am: Remove dup target_triplet and set tool,
            allowing runtest to work without arguments.
            * testsuite/Makefile.in: Regenerate.
    
    Signed-off-by: Jonathan Wakely <jwakely@redhat.com>

Diff:
---
 libstdc++-v3/ChangeLog             | 6 ++++++
 libstdc++-v3/testsuite/Makefile.am | 2 +-
 libstdc++-v3/testsuite/Makefile.in | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 95c15977796..d19cd51db35 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2020-05-21  Matthias Kretz  <kretz@kde.org>
+
+	* testsuite/Makefile.am: Remove dup target_triplet and set tool,
+	allowing runtest to work without arguments.
+	* testsuite/Makefile.in: Regenerate.
+
 2020-05-21  Jonathan Wakely  <jwakely@redhat.com>
 
 	PR libstdc++/93983
diff --git a/libstdc++-v3/testsuite/Makefile.am b/libstdc++-v3/testsuite/Makefile.am
index e19509d2534..9cef1e65e1b 100644
--- a/libstdc++-v3/testsuite/Makefile.am
+++ b/libstdc++-v3/testsuite/Makefile.am
@@ -47,6 +47,7 @@ site.exp: Makefile
 	@echo '## these variables are automatically generated by make ##' >site.tmp
 	@echo '# Do not edit here.  If you wish to override these values' >>site.tmp
 	@echo '# edit the last section' >>site.tmp
+	@echo 'set tool libstdc++' >>site.tmp
 	@echo 'set srcdir $(srcdir)' >>site.tmp
 	@echo "set objdir `pwd`" >>site.tmp
 	@echo 'set build_alias "$(build_alias)"' >>site.tmp
@@ -55,7 +56,6 @@ site.exp: Makefile
 	@echo 'set host_triplet $(host_triplet)' >>site.tmp
 	@echo 'set target_alias "$(target_alias)"' >>site.tmp
 	@echo 'set target_triplet $(target_triplet)' >>site.tmp
-	@echo 'set target_triplet $(target_triplet)' >>site.tmp
 	@echo 'set libiconv "$(LIBICONV)"' >>site.tmp
 	@echo 'set baseline_dir "$(baseline_dir)"' >> site.tmp
 	@echo 'set baseline_subdir_switch "$(baseline_subdir_switch)"' >> site.tmp
diff --git a/libstdc++-v3/testsuite/Makefile.in b/libstdc++-v3/testsuite/Makefile.in
index 2c248cf6302..e2bf241e756 100644
--- a/libstdc++-v3/testsuite/Makefile.in
+++ b/libstdc++-v3/testsuite/Makefile.in
@@ -597,6 +597,7 @@ site.exp: Makefile
 	@echo '## these variables are automatically generated by make ##' >site.tmp
 	@echo '# Do not edit here.  If you wish to override these values' >>site.tmp
 	@echo '# edit the last section' >>site.tmp
+	@echo 'set tool libstdc++' >>site.tmp
 	@echo 'set srcdir $(srcdir)' >>site.tmp
 	@echo "set objdir `pwd`" >>site.tmp
 	@echo 'set build_alias "$(build_alias)"' >>site.tmp
@@ -605,7 +606,6 @@ site.exp: Makefile
 	@echo 'set host_triplet $(host_triplet)' >>site.tmp
 	@echo 'set target_alias "$(target_alias)"' >>site.tmp
 	@echo 'set target_triplet $(target_triplet)' >>site.tmp
-	@echo 'set target_triplet $(target_triplet)' >>site.tmp
 	@echo 'set libiconv "$(LIBICONV)"' >>site.tmp
 	@echo 'set baseline_dir "$(baseline_dir)"' >> site.tmp
 	@echo 'set baseline_subdir_switch "$(baseline_subdir_switch)"' >> site.tmp