From c10b5ea0d8b2b268fcb16ae9768dea61c7271735 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Fri, 17 Apr 2015 19:09:20 +0200 Subject: [PATCH] re PR bootstrap/62077 (--with-build-config=bootstrap-lto fails) PR bootstrap/62077 * configure.ac (--enable-stage1-checking): Default to release,misc,gimple,rtlflag,tree,types if --disable-checking or --enable-checking is not specified and DEV-PHASE is not experimental. * configure: Regenerated. From-SVN: r222187 --- ChangeLog | 9 +++++++++ configure | 14 +++++++++++++- configure.ac | 14 +++++++++++++- 3 files changed, 35 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4a4b3fd2af6..88dc50ee349 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2015-04-17 Jakub Jelinek + + PR bootstrap/62077 + * configure.ac (--enable-stage1-checking): Default to + release,misc,gimple,rtlflag,tree,types if --disable-checking + or --enable-checking is not specified and DEV-PHASE is not + experimental. + * configure: Regenerated. + 2015-04-14 Max Ostapenko * Makefile.tpl (EXTRA_HOST_EXPORTS): New variables. diff --git a/configure b/configure index 064e69b80ec..7616f88a447 100755 --- a/configure +++ b/configure @@ -14761,7 +14761,19 @@ if test "${enable_stage1_checking+set}" = set; then : enableval=$enable_stage1_checking; stage1_checking=--enable-checking=${enable_stage1_checking} else if test "x$enable_checking" = xno || test "x$enable_checking" = x; then - stage1_checking=--enable-checking=yes,types + # For --disable-checking or implicit --enable-checking=release, avoid + # setting --enable-checking=gc in the default stage1 checking for LTO + # bootstraps. See PR62077. + stage1_checking=--enable-checking=release,misc,gimple,rtlflag,tree,types + case $BUILD_CONFIG in + *lto*) + if test "x$enable_checking" = x && \ + test -d ${srcdir}/gcc && \ + test x"`cat ${srcdir}/gcc/DEV-PHASE`" = xexperimental; then + stage1_checking=--enable-checking=yes,types + fi;; + *) stage1_checking=--enable-checking=yes,types;; + esac else stage1_checking=--enable-checking=$enable_checking,types fi diff --git a/configure.ac b/configure.ac index 56f6af3e83d..8c85a08c382 100644 --- a/configure.ac +++ b/configure.ac @@ -3482,7 +3482,19 @@ AC_ARG_ENABLE(stage1-checking, [choose additional checking for stage1 of the compiler])], [stage1_checking=--enable-checking=${enable_stage1_checking}], [if test "x$enable_checking" = xno || test "x$enable_checking" = x; then - stage1_checking=--enable-checking=yes,types + # For --disable-checking or implicit --enable-checking=release, avoid + # setting --enable-checking=gc in the default stage1 checking for LTO + # bootstraps. See PR62077. + stage1_checking=--enable-checking=release,misc,gimple,rtlflag,tree,types + case $BUILD_CONFIG in + *lto*) + if test "x$enable_checking" = x && \ + test -d ${srcdir}/gcc && \ + test x"`cat ${srcdir}/gcc/DEV-PHASE`" = xexperimental; then + stage1_checking=--enable-checking=yes,types + fi;; + *) stage1_checking=--enable-checking=yes,types;; + esac else stage1_checking=--enable-checking=$enable_checking,types fi]) -- 2.30.2