re PR bootstrap/85571 (non-bootstrap-debug miscompare with trunk)

2018-04-30  Richard Biener  <rguenther@suse.de>

	PR bootstrap/85571
	* Makefile.tpl (STAGE3_CFLAGS): Use -fchecking=1.
	(STAGE3_TFLAGS): Likewise.
	(STAGEtrain_CFLAGS): Filter out -fchecking=1.
	(STAGEtrain_TFLAGS): Likewise.
	* Makefile.in: Regenerate.

	* dwarf2out.c (gen_producer_string): Ignore -fchecking[=].

From-SVN: r259755

diff --git a/ChangeLog b/ChangeLog
index 7e74497c5bbd9e39b875ddedfffc7f4bcd523968..89d5fe57a02f0a5d0ec11f63faae53df5ee5506d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2018-04-30  Richard Biener  <rguenther@suse.de>
+
+       PR bootstrap/85571
+       * Makefile.tpl (STAGE3_CFLAGS): Use -fchecking=1.
+       (STAGE3_TFLAGS): Likewise.
+       (STAGEtrain_CFLAGS): Filter out -fchecking=1.
+       (STAGEtrain_TFLAGS): Likewise.
+       * Makefile.in: Regenerate.
+
 2018-04-26  Richard Biener  <rguenther@suse.de>
 
        * Makefile.tpl (STAGE1_TFLAGS): Add -fno-checking.

diff --git a/Makefile.in b/Makefile.in
index 4f5bbf75c98e5549cdcb45b0f735dd339ab38e03..2bf83b72265110e6ff977ab4f98753d519db9c26 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -536,14 +536,14 @@ STAGE1_CONFIGURE_FLAGS = --disable-intermodule $(STAGE1_CHECKING) \
 STAGE1_TFLAGS += -fno-checking
 STAGE2_CFLAGS += -fno-checking
 STAGE2_TFLAGS += -fno-checking
-STAGE3_CFLAGS += -fchecking
-STAGE3_TFLAGS += -fchecking
+STAGE3_CFLAGS += -fchecking=1
+STAGE3_TFLAGS += -fchecking=1
 
 STAGEprofile_CFLAGS = $(STAGE2_CFLAGS) -fprofile-generate
 STAGEprofile_TFLAGS = $(STAGE2_TFLAGS)
 
-STAGEtrain_CFLAGS = $(filter-out -fchecking,$(STAGE3_CFLAGS))
-STAGEtrain_TFLAGS = $(filter-out -fchecking,$(STAGE3_TFLAGS))
+STAGEtrain_CFLAGS = $(filter-out -fchecking=1,$(STAGE3_CFLAGS))
+STAGEtrain_TFLAGS = $(filter-out -fchecking=1,$(STAGE3_TFLAGS))
 
 STAGEfeedback_CFLAGS = $(STAGE4_CFLAGS) -fprofile-use
 STAGEfeedback_TFLAGS = $(STAGE4_TFLAGS)

diff --git a/Makefile.tpl b/Makefile.tpl
index 5967c7ad631945babbc7ee37fe6c7c3dc34a52be..abd2bc2fb897d3dca0dfd3f5535e0fea5226660b 100644 (file)
--- a/Makefile.tpl
+++ b/Makefile.tpl
@@ -459,14 +459,14 @@ STAGE1_CONFIGURE_FLAGS = --disable-intermodule $(STAGE1_CHECKING) \
 STAGE1_TFLAGS += -fno-checking
 STAGE2_CFLAGS += -fno-checking
 STAGE2_TFLAGS += -fno-checking
-STAGE3_CFLAGS += -fchecking
-STAGE3_TFLAGS += -fchecking
+STAGE3_CFLAGS += -fchecking=1
+STAGE3_TFLAGS += -fchecking=1
 
 STAGEprofile_CFLAGS = $(STAGE2_CFLAGS) -fprofile-generate
 STAGEprofile_TFLAGS = $(STAGE2_TFLAGS)
 
-STAGEtrain_CFLAGS = $(filter-out -fchecking,$(STAGE3_CFLAGS))
-STAGEtrain_TFLAGS = $(filter-out -fchecking,$(STAGE3_TFLAGS))
+STAGEtrain_CFLAGS = $(filter-out -fchecking=1,$(STAGE3_CFLAGS))
+STAGEtrain_TFLAGS = $(filter-out -fchecking=1,$(STAGE3_TFLAGS))
 
 STAGEfeedback_CFLAGS = $(STAGE4_CFLAGS) -fprofile-use
 STAGEfeedback_TFLAGS = $(STAGE4_TFLAGS)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1470c89f62b45fa0144cac1cd992db0e51b9227d..11b7a83e5084289783f7c3b86e5009c0a82549a0 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2018-04-30  Richard Biener  <rguenther@suse.de>
+
+       PR bootstrap/85571
+       * dwarf2out.c (gen_producer_string): Ignore -fchecking[=].
+
 2018-04-30  Richard Biener  <rguenther@suse.de>
 
        PR tree-optimization/28364

diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index d2d4ec009e769390750a000e937a305c1a6b9788..a92b0ce0b98c20d629f77c51ddfbe81144aa9a29 100644 (file)
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -24234,6 +24234,8 @@ gen_producer_string (void)
       case OPT_fmacro_prefix_map_:
       case OPT_ffile_prefix_map_:
       case OPT_fcompare_debug:
+      case OPT_fchecking:
+      case OPT_fchecking_:
        /* Ignore these.  */
        continue;
       default: