summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog11
-rw-r--r--Makefile.in14
-rw-r--r--Makefile.tpl14
3 files changed, 35 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index bc57770e511..7e74497c5bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2018-04-26 Richard Biener <rguenther@suse.de>
+
+ * Makefile.tpl (STAGE1_TFLAGS): Add -fno-checking.
+ (STAGE2_CFLAGS): Likewise.
+ (STAGE2_TFLAGS): Likewise.
+ (STAGE3_CFLAGS): Add -fchecking.
+ (STAGE3_TFLAGS): Likewise.
+ (STAGEtrain_CFLAGS): Filter out -fchecking.
+ (STAGEtrain_TFLAGS): Likewise.
+ * Makefile.in: Re-generate.
+
2018-04-25 Catherine Moore <clm@codesourcery.com>
* MAINTAINERS (mips): Remove myself as MIPS maintainer.
diff --git a/Makefile.in b/Makefile.in
index 38774f542a6..4f5bbf75c98 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -529,11 +529,21 @@ STAGE1_CONFIGURE_FLAGS = --disable-intermodule $(STAGE1_CHECKING) \
--disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" \
--disable-build-format-warnings
+# When using the slow stage1 compiler disable IL verification and forcefully
+# enable it when using the stage2 compiler instead. As we later compare
+# stage2 and stage3 we are merely avoid doing redundant work, plus we apply
+# checking when building all target libraries for release builds.
+STAGE1_TFLAGS += -fno-checking
+STAGE2_CFLAGS += -fno-checking
+STAGE2_TFLAGS += -fno-checking
+STAGE3_CFLAGS += -fchecking
+STAGE3_TFLAGS += -fchecking
+
STAGEprofile_CFLAGS = $(STAGE2_CFLAGS) -fprofile-generate
STAGEprofile_TFLAGS = $(STAGE2_TFLAGS)
-STAGEtrain_CFLAGS = $(STAGE3_CFLAGS)
-STAGEtrain_TFLAGS = $(STAGE3_TFLAGS)
+STAGEtrain_CFLAGS = $(filter-out -fchecking,$(STAGE3_CFLAGS))
+STAGEtrain_TFLAGS = $(filter-out -fchecking,$(STAGE3_TFLAGS))
STAGEfeedback_CFLAGS = $(STAGE4_CFLAGS) -fprofile-use
STAGEfeedback_TFLAGS = $(STAGE4_TFLAGS)
diff --git a/Makefile.tpl b/Makefile.tpl
index 1f23b79b4b2..5967c7ad631 100644
--- a/Makefile.tpl
+++ b/Makefile.tpl
@@ -452,11 +452,21 @@ STAGE1_CONFIGURE_FLAGS = --disable-intermodule $(STAGE1_CHECKING) \
--disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" \
--disable-build-format-warnings
+# When using the slow stage1 compiler disable IL verification and forcefully
+# enable it when using the stage2 compiler instead. As we later compare
+# stage2 and stage3 we are merely avoid doing redundant work, plus we apply
+# checking when building all target libraries for release builds.
+STAGE1_TFLAGS += -fno-checking
+STAGE2_CFLAGS += -fno-checking
+STAGE2_TFLAGS += -fno-checking
+STAGE3_CFLAGS += -fchecking
+STAGE3_TFLAGS += -fchecking
+
STAGEprofile_CFLAGS = $(STAGE2_CFLAGS) -fprofile-generate
STAGEprofile_TFLAGS = $(STAGE2_TFLAGS)
-STAGEtrain_CFLAGS = $(STAGE3_CFLAGS)
-STAGEtrain_TFLAGS = $(STAGE3_TFLAGS)
+STAGEtrain_CFLAGS = $(filter-out -fchecking,$(STAGE3_CFLAGS))
+STAGEtrain_TFLAGS = $(filter-out -fchecking,$(STAGE3_TFLAGS))
STAGEfeedback_CFLAGS = $(STAGE4_CFLAGS) -fprofile-use
STAGEfeedback_TFLAGS = $(STAGE4_TFLAGS)