From 5fe6af6dcfe684f9badc57442b168f0153dd8e5a Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Thu, 2 May 2019 13:58:47 +0000 Subject: [PATCH] re PR lto/85574 (LTO bootstapped binaries differ) 2019-05-02 Richard Biener 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 --- ChangeLog | 7 +++++++ Makefile.in | 4 ++-- Makefile.tpl | 2 +- config/ChangeLog | 5 +++++ config/bootstrap-lto.mk | 1 + 5 files changed, 16 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8831b20a6b0..edee8743b27 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2019-05-02 Richard Biener + + PR bootstrap/85574 + * Makefile.tpl (compare target): Also compare extra-compare + files. + * Makefile.in: Regenerate. + 2019-04-22 Roman Zhuykov * MAINTAINERS (Various Maintainers): Remove Ayal Zaks and add myself diff --git a/Makefile.in b/Makefile.in index 64e091ba71d..8f5880e9a60 100644 --- 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 41cae58a267..1cdc023c82f 100644 --- 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 37456f9fcaf..b9194c06718 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,8 @@ +2019-05-02 Richard Biener + + PR bootstrap/85574 + * bootstrap-lto.mk (extra-compare): Set to gcc/lto1$(exeext). + 2019-04-16 Martin Liska * bootstrap-lto-lean.mk: Filter out -flto in STAGEtrain_CFLAGS. diff --git a/config/bootstrap-lto.mk b/config/bootstrap-lto.mk index 768b6337bd6..4de07e5b226 100644 --- 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) -- 2.30.2