re PR lto/85574 (LTO bootstapped binaries differ)

2019-05-02  Richard Biener  <rguenther@suse.de>

	PR bootstrap/85574
	* Makefile.tpl (compare target): Also compare extra-compare
	files.
	* Makefile.in: Regenerate.

	config/
	* bootstrap-lto.mk (extra-compare): Set to gcc/lto1$(exeext).

From-SVN: r270798

diff --git a/ChangeLog b/ChangeLog
index 8831b20a6b089c7b4df6a292dcecea9f0733abb9..edee8743b272ff8e72ef280a601f1b487d3073f7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2019-05-02  Richard Biener  <rguenther@suse.de>
+
+       PR bootstrap/85574
+       * Makefile.tpl (compare target): Also compare extra-compare
+       files.
+       * Makefile.in: Regenerate.
+
 2019-04-22  Roman Zhuykov  <zhroma@ispras.ru>
 
        * MAINTAINERS (Various Maintainers): Remove Ayal Zaks and add myself

diff --git a/Makefile.in b/Makefile.in
index 64e091ba71d5ad968b97f8e6c7723e9e79c83008..8f5880e9a606504db96f341ef4920d0cd34de79b 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -54057,7 +54057,7 @@ compare:
         sed=`echo stage3 | sed 's,^stage,,;s,.,.,g'`; \
        files=`find stage3-* -name "*$(objext)" -print | \
                 sed -n s,^stage$$sed-,,p`; \
-       for file in $${files}; do \
+       for file in $${files} ${extra-compare}; do \
          f1=$$r/stage2-$$file; f2=$$r/stage3-$$file; \
          if test ! -f $$f1; then continue; fi; \
          $(do-compare) > /dev/null 2>&1; \
@@ -54455,7 +54455,7 @@ compare3:
         sed=`echo stage4 | sed 's,^stage,,;s,.,.,g'`; \
        files=`find stage4-* -name "*$(objext)" -print | \
                 sed -n s,^stage$$sed-,,p`; \
-       for file in $${files}; do \
+       for file in $${files} ${extra-compare}; do \
          f1=$$r/stage3-$$file; f2=$$r/stage4-$$file; \
          if test ! -f $$f1; then continue; fi; \
          $(do-compare3) > /dev/null 2>&1; \

diff --git a/Makefile.tpl b/Makefile.tpl
index 41cae58a267932b93153f47cba64af61958d40e6..1cdc023c82f9c75204357b47848b5ca8497171a1 100644 (file)
--- a/Makefile.tpl
+++ b/Makefile.tpl
@@ -1677,7 +1677,7 @@ do-clean: clean-stage[+id+]
         sed=`echo stage[+id+] | sed 's,^stage,,;s,.,.,g'`; \
        files=`find stage[+id+]-* -name "*$(objext)" -print | \
                 sed -n s,^stage$$sed-,,p`; \
-       for file in $${files}; do \
+       for file in $${files} ${extra-compare}; do \
          f1=$$r/stage[+prev+]-$$file; f2=$$r/stage[+id+]-$$file; \
          if test ! -f $$f1; then continue; fi; \
          $(do-[+compare-target+]) > /dev/null 2>&1; \

diff --git a/config/ChangeLog b/config/ChangeLog
index 37456f9fcafd5a61fbd00d2697acbf1056441a2c..b9194c067189a7085f78d478101a39125ecb53fe 100644 (file)
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,8 @@
+2019-05-02  Richard Biener  <rguenther@suse.de>
+
+       PR bootstrap/85574
+       * bootstrap-lto.mk (extra-compare): Set to gcc/lto1$(exeext).
+
 2019-04-16  Martin Liska  <mliska@suse.cz>
 
        * bootstrap-lto-lean.mk: Filter out -flto in STAGEtrain_CFLAGS.

diff --git a/config/bootstrap-lto.mk b/config/bootstrap-lto.mk
index 768b6337bd6a463bef7a919e630d9fb2fe5f776c..4de07e5b22698f9f97c45adeb078a217ae72f26e 100644 (file)
--- a/config/bootstrap-lto.mk
+++ b/config/bootstrap-lto.mk
@@ -15,3 +15,4 @@ LTO_EXPORTS = AR="$(LTO_AR)"; export AR; \
 LTO_FLAGS_TO_PASS = AR="$(LTO_AR)" RANLIB="$(LTO_RANLIB)"
 
 do-compare = $(SHELL) $(srcdir)/contrib/compare-lto $$f1 $$f2
+extra-compare = gcc/lto1$(exeext)