Merge Ignore and Deprecated in .opt files.

2018-08-17  Martin Liska  <mliska@suse.cz>

	* common.opt: Remove Warn, Init and Report for options with
        Ignore/Deprecated flag. Warning is done automatically for
        Deprecated flags.
	* config/i386/i386.opt: Likewise.
	* config/ia64/ia64.opt: Likewise.
	* config/rs6000/rs6000.opt: Likewise.
	* cppbuiltin.c (define_builtin_macros_for_compilation_flags):
        Remove usage of flag_check_pointer_bounds.
	* lto-wrapper.c (merge_and_complain): Do not handle
        OPT_fcheck_pointer_bounds.
	(append_compiler_options): Likewise.
	* opt-functions.awk: Do not handle Deprecated.
	* optc-gen.awk: Check that Var, Report and Init are not
        used for an option with Ignore/Deprecated flag.
	* opts-common.c (decode_cmdline_option): Do not report
        CL_ERR_DEPRECATED.
	(read_cmdline_option): Report warning for OPT_SPECIAL_deprecated
        options.
	* opts.h (struct cl_option): Remove cl_deprecated flag.
	(CL_ERR_DEPRECATED): Remove error enum value.
2018-08-17  Martin Liska  <mliska@suse.cz>

	* g++.dg/opt/mpx.C: Fix scanned pattern.
	* gcc.target/i386/mpx.c: Likewise.
	* g++.dg/warn/Wunreachable-code-1.C: Remove.
	* g++.dg/warn/Wunreachable-code-2.C: Likewise.
	* gcc.dg/torture/pr52969.c: Likewise.
	* g++.dg/warn/pr31246-2.C: Likewise.
	* g++.dg/warn/pr31246.C: Likewise.
	* gcc.dg/pr33092.c: Likewise.
	* g++.dg/opt/eh1.C: Remove a deprecated option.
	* g++.dg/template/inline1.C: Likewise.
	* g++.dg/tree-ssa/pr81408.C: Likewise.
	* gcc.dg/pr41837.c: Likewise.
	* gcc.dg/pr41841.c: Likewise.
	* gcc.dg/pr42250.c: Likewise.
	* gcc.dg/pr43084.c: Likewise.
	* gcc.dg/pr43317.c: Likewise.
	* gcc.dg/pr51879-18.c: Likewise.
	* gcc.dg/torture/pr36066.c: Likewise.
	* gcc.dg/tree-ssa/ifc-8.c: Likewise.
	* gcc.dg/tree-ssa/ifc-cd.c: Likewise.
	* gcc.dg/tree-ssa/pr19210-1.c: Likewise.
	* gcc.dg/tree-ssa/pr45122.c: Likewise.
	* gcc.target/i386/pr45352-2.c: Likewise.
	* gcc.target/i386/zee.c: Likewise.
	* gfortran.dg/auto_char_len_2.f90: Likewise.
	* gfortran.dg/auto_char_len_4.f90: Likewise.
	* gfortran.dg/c_ptr_tests_15.f90: Likewise.
	* gfortran.dg/char_array_structure_constructor.f90: Likewise.
	* gfortran.dg/gomp/pr47331.f90: Likewise.
	* gfortran.dg/pr40999.f: Likewise.
	* gfortran.dg/pr41011.f: Likewise.
	* gfortran.dg/pr42051.f03: Likewise.
	* gfortran.dg/pr46804.f90: Likewise.
	* gfortran.dg/pr83149_1.f90: Likewise.
	* gfortran.dg/pr83149_b.f90: Likewise.
	* gfortran.dg/whole_file_1.f90: Likewise.
	* gfortran.dg/whole_file_10.f90: Likewise.
	* gfortran.dg/whole_file_11.f90: Likewise.
	* gfortran.dg/whole_file_12.f90: Likewise.
	* gfortran.dg/whole_file_13.f90: Likewise.
	* gfortran.dg/whole_file_14.f90: Likewise.
	* gfortran.dg/whole_file_15.f90: Likewise.
	* gfortran.dg/whole_file_16.f90: Likewise.
	* gfortran.dg/whole_file_17.f90: Likewise.
	* gfortran.dg/whole_file_18.f90: Likewise.
	* gfortran.dg/whole_file_19.f90: Likewise.
	* gfortran.dg/whole_file_2.f90: Likewise.
	* gfortran.dg/whole_file_20.f03: Likewise.
	* gfortran.dg/whole_file_3.f90: Likewise.
	* gfortran.dg/whole_file_4.f90: Likewise.
	* gfortran.dg/whole_file_5.f90: Likewise.
	* gfortran.dg/whole_file_6.f90: Likewise.
	* gfortran.dg/whole_file_7.f90: Likewise.
	* gfortran.dg/whole_file_8.f90: Likewise.
	* gfortran.dg/whole_file_9.f90: Likewise.
	* gcc.dg/vect/vect.exp: Likewise.
2018-08-17  Martin Liska  <mliska@suse.cz>

	* c.opt: Remove Warn, Init and Report for options with
        Ignore/Deprecated flag. Warning is done automatically for
        Deprecated flags.

From-SVN: r263614

gcc/ChangeLog

+2018-08-17  Martin Liska  <mliska@suse.cz>
+
+	* common.opt: Remove Warn, Init and Report for options with
+        Ignore/Deprecated flag. Warning is done automatically for
+        Deprecated flags.
+	* config/i386/i386.opt: Likewise.
+	* config/ia64/ia64.opt: Likewise.
+	* config/rs6000/rs6000.opt: Likewise.
+	* cppbuiltin.c (define_builtin_macros_for_compilation_flags):
+        Remove usage of flag_check_pointer_bounds.
+	* lto-wrapper.c (merge_and_complain): Do not handle
+        OPT_fcheck_pointer_bounds.
+	(append_compiler_options): Likewise.
+	* opt-functions.awk: Do not handle Deprecated.
+	* optc-gen.awk: Check that Var, Report and Init are not
+        used for an option with Ignore/Deprecated flag.
+	* opts-common.c (decode_cmdline_option): Do not report
+        CL_ERR_DEPRECATED.
+	(read_cmdline_option): Report warning for OPT_SPECIAL_deprecated
+        options.
+	* opts.h (struct cl_option): Remove cl_deprecated flag.
+	(CL_ERR_DEPRECATED): Remove error enum value.
+
 2018-08-17  Richard Biener  <rguenther@suse.de>
 
 	PR middle-end/86505

gcc/c-family/ChangeLog

+2018-08-17  Martin Liska  <mliska@suse.cz>
+
+	* c.opt: Remove Warn, Init and Report for options with
+        Ignore/Deprecated flag. Warning is done automatically for
+        Deprecated flags.
+
 2018-08-16  David Malcolm  <dmalcolm@redhat.com>
 
 	PR c++/70693

gcc/common.opt

@@ -1087,7 +1087,7 @@ Common Report Var(flag_caller_saves) Optimization
 Save registers around function calls.
 
 fcheck-data-deps
-Common Report Var(flag_check_data_deps)
+Common Ignore
 This switch is deprecated; do not use.
 
 fcheck-new
@@ -2897,19 +2897,19 @@ Common Driver Var(dwarf2out_as_locview_support) Init(2)
 Assume assembler support for view in (DWARF2+) .loc directives
 
 gcoff
-Common Driver Ignore Warn(switch %qs no longer supported)
+Common Driver Deprecated
 Does nothing.  Preserved for backward compatibility.
 
 gcoff1
-Common Driver Ignore Warn(switch %qs no longer supported)
+Common Driver Deprecated
 Does nothing.  Preserved for backward compatibility.
 
 gcoff2
-Common Driver Ignore Warn(switch %qs no longer supported)
+Common Driver Deprecated
 Does nothing.  Preserved for backward compatibility.
 
 gcoff3
-Common Driver Ignore Warn(switch %qs no longer supported)
+Common Driver Deprecated
 Does nothing.  Preserved for backward compatibility.
 
 gcolumn-info

gcc/config/i386/i386.opt

@@ -842,7 +842,7 @@ Target Report Mask(ISA_CLWB) Var(ix86_isa_flags) Save
 Support CLWB instruction.
 
 mpcommit
-Target Ignore Warn(%qs was deprecated)
+Target Deprecated
 ;; Deprecated
 
 mfxsr
@@ -951,7 +951,7 @@ Target Report Mask(ISA_RTM) Var(ix86_isa_flags) Save
 Support RTM built-in functions and code generation.
 
 mmpx
-Target Report Deprecated
+Target Deprecated
 Deprecated in GCC 9.  This switch has no effect.
 
 mmwaitx
@@ -999,7 +999,7 @@ Target RejectNegative Joined Integer Var(ix86_stack_protector_guard_symbol_str)
 Use the given symbol for addressing the stack-protector guard.
 
 mmitigate-rop
-Target Ignore Warn(%qs was deprecated)
+Target Deprecated
 ;; Deprecated
 
 mgeneral-regs-only

gcc/config/ia64/ia64.opt

@@ -164,10 +164,10 @@ Target Report Var(mflag_sched_spec_control_ldc) Init(0)
 Use simple data speculation check for control speculation.
 
 msched-prefer-non-data-spec-insns
-Target Ignore Warn(switch %qs is no longer supported)
+Target Deprecated
 
 msched-prefer-non-control-spec-insns
-Target Ignore Warn(switch %qs is no longer supported)
+Target Deprecated
 
 msched-count-spec-in-critical-path
 Target Report Var(mflag_sched_count_spec_in_critical_path) Init(0)

gcc/config/rs6000/rs6000.opt

@@ -177,7 +177,7 @@ mno-string
 Target RejectNegative Undocumented Ignore
 
 mstring
-Target RejectNegative Undocumented Warn(%<-mstring%> is deprecated)
+Target RejectNegative Undocumented Deprecated
 
 msoft-float
 Target Report RejectNegative Mask(SOFT_FLOAT) Var(rs6000_isa_flags)
@@ -483,8 +483,9 @@ mcrypto
 Target Report Mask(CRYPTO) Var(rs6000_isa_flags)
 Use ISA 2.07 Category:Vector.AES and Category:Vector.SHA2 instructions.
 
+; We can't use Ignore flag because DIRECT_MOVE mask is still used.
 mdirect-move
-Target Undocumented Mask(DIRECT_MOVE) Var(rs6000_isa_flags) Ignore Warn(%qs is deprecated)
+Target Undocumented Mask(DIRECT_MOVE) Var(rs6000_isa_flags) Warn(%qs is deprecated)
 
 mhtm
 Target Report Mask(HTM) Var(rs6000_isa_flags)

gcc/cppbuiltin.c

@@ -110,9 +110,6 @@ define_builtin_macros_for_compilation_flags (cpp_reader *pfile)
 
   cpp_define_formatted (pfile, "__FINITE_MATH_ONLY__=%d",
 			flag_finite_math_only);
-
-  if (flag_check_pointer_bounds)
-    cpp_define (pfile, "__CHKP__");
 }
 
 

gcc/dwarf2out.c

@@ -24240,6 +24240,7 @@ gen_producer_string (void)
       case OPT_U:
       case OPT_SPECIAL_unknown:
       case OPT_SPECIAL_ignore:
+      case OPT_SPECIAL_deprecated:
       case OPT_SPECIAL_program_name:
       case OPT_SPECIAL_input_file:
       case OPT_grecord_gcc_switches:

gcc/lto-opts.c

@@ -107,6 +107,7 @@ lto_write_options (void)
 	case OPT_dumpbase:
 	case OPT_SPECIAL_unknown:
 	case OPT_SPECIAL_ignore:
+	case OPT_SPECIAL_deprecated:
 	case OPT_SPECIAL_program_name:
 	case OPT_SPECIAL_input_file:
 	case OPT_dumpdir:

gcc/lto-wrapper.c

@@ -245,6 +245,7 @@ merge_and_complain (struct cl_decoded_option **decoded_options,
 	{
 	case OPT_SPECIAL_unknown:
 	case OPT_SPECIAL_ignore:
+	case OPT_SPECIAL_deprecated:
 	case OPT_SPECIAL_program_name:
 	case OPT_SPECIAL_input_file:
 	  break;
@@ -285,7 +286,6 @@ merge_and_complain (struct cl_decoded_option **decoded_options,
 
 	case OPT_fopenmp:
 	case OPT_fopenacc:
-	case OPT_fcheck_pointer_bounds:
 	  /* For selected options we can merge conservatively.  */
 	  for (j = 0; j < *decoded_options_count; ++j)
 	    if ((*decoded_options)[j].opt_index == foption->opt_index)
@@ -293,8 +293,7 @@ merge_and_complain (struct cl_decoded_option **decoded_options,
 	  if (j == *decoded_options_count)
 	    append_option (decoded_options, decoded_options_count, foption);
 	  /* -fopenmp > -fno-openmp,
-	     -fopenacc > -fno-openacc,
-	     -fcheck_pointer_bounds > -fcheck_pointer_bounds  */
+	     -fopenacc > -fno-openacc  */
 	  else if (foption->value > (*decoded_options)[j].value)
 	    (*decoded_options)[j] = *foption;
 	  break;
@@ -557,7 +556,6 @@ append_compiler_options (obstack *argv_obstack, struct cl_decoded_option *opts,
 	case OPT_Ofast:
 	case OPT_Og:
 	case OPT_Os:
-	case OPT_fcheck_pointer_bounds:
 	  break;
 
 	default:

gcc/opt-functions.awk

@@ -156,7 +156,6 @@ function switch_bit_fields (flags)
 	  hwi_flag \
 	  flag_init("ToLower", flags) \
 	  flag_init("Report", flags) \
-	  flag_init("Deprecated", flags) \
 	  byte_size_flag
 
 	sub(", $", "", result)

gcc/optc-gen.awk

@@ -323,8 +323,24 @@ for (i = 0; i < n_opts; i++) {
 
 	alias_arg = opt_args("Alias", flags[i])
 	if (alias_arg == "") {
-		if (flag_set_p("Ignore", flags[i]))
-			alias_data = "NULL, NULL, OPT_SPECIAL_ignore"
+		if (flag_set_p("Ignore", flags[i])) {
+			  alias_data = "NULL, NULL, OPT_SPECIAL_ignore"
+        if (warn_message != "NULL")
+				  print "#error Ignored option with Warn"
+        if (var_name(flags[i]) != "")
+				  print "#error Ignored option with Var"
+        if (flag_set_p("Report", flags[i]))
+				  print "#error Ignored option with Report"
+      }
+    else if (flag_set_p("Deprecated", flags[i])) {
+			  alias_data = "NULL, NULL, OPT_SPECIAL_deprecated"
+        if (warn_message != "NULL")
+				  print "#error Deprecated option with Warn"
+        if (var_name(flags[i]) != "")
+				  print "#error Deprecated option with Var"
+        if (flag_set_p("Report", flags[i]))
+				  print "#error Deprecated option with Report"
+      }
 		else
 			alias_data = "NULL, NULL, N_OPTS"
 		if (flag_set_p("Enum.*", flags[i])) {

gcc/opth-gen.awk

@@ -493,6 +493,7 @@ for (i = 0; i < n_opts; i++) {
 print "  N_OPTS,"
 print "  OPT_SPECIAL_unknown,"
 print "  OPT_SPECIAL_ignore,"
+print "  OPT_SPECIAL_deprecated,"
 print "  OPT_SPECIAL_program_name,"
 print "  OPT_SPECIAL_input_file"
 print "};"

gcc/opts-common.c

@@ -663,13 +663,13 @@ decode_cmdline_option (const char **argv, unsigned int lang_mask,
     {
       size_t new_opt_index = option->alias_target;
 
-      if (new_opt_index == OPT_SPECIAL_ignore)
+      if (new_opt_index == OPT_SPECIAL_ignore
+	  || new_opt_index == OPT_SPECIAL_deprecated)
 	{
 	  gcc_assert (option->alias_arg == NULL);
 	  gcc_assert (option->neg_alias_arg == NULL);
 	  opt_index = new_opt_index;
 	  arg = NULL;
-	  value = 1;
 	}
       else
 	{
@@ -744,10 +744,6 @@ decode_cmdline_option (const char **argv, unsigned int lang_mask,
   if (!option_ok_for_language (option, lang_mask))
     errors |= CL_ERR_WRONG_LANG;
 
-  /* Mark all deprecated options.  */
-  if (option->cl_deprecated)
-    errors |= CL_ERR_DEPRECATED;
-
   /* Convert the argument to lowercase if appropriate.  */
   if (arg && option->cl_tolower)
     {
@@ -823,7 +819,8 @@ decode_cmdline_option (const char **argv, unsigned int lang_mask,
       else
 	decoded->canonical_option[i] = NULL;
     }
-  if (opt_index != OPT_SPECIAL_unknown && opt_index != OPT_SPECIAL_ignore)
+  if (opt_index != OPT_SPECIAL_unknown && opt_index != OPT_SPECIAL_ignore
+      && opt_index != OPT_SPECIAL_deprecated)
     {
       generate_canonical_option (opt_index, arg, value, decoded);
       if (separate_args > 1)
@@ -1001,6 +998,7 @@ prune_options (struct cl_decoded_option **decoded_options,
 	{
 	case OPT_SPECIAL_unknown:
 	case OPT_SPECIAL_ignore:
+	case OPT_SPECIAL_deprecated:
 	case OPT_SPECIAL_program_name:
 	case OPT_SPECIAL_input_file:
 	  goto keep;
@@ -1324,6 +1322,14 @@ read_cmdline_option (struct gcc_options *opts,
   if (decoded->opt_index == OPT_SPECIAL_ignore)
     return;
 
+  if (decoded->opt_index == OPT_SPECIAL_deprecated)
+    {
+      /* Warn only about positive ignored options.  */
+      if (decoded->value)
+	warning_at (loc, 0, "switch %qs is no longer supported", opt);
+      return;
+    }
+
   option = &cl_options[decoded->opt_index];
 
   if (decoded->errors
@@ -1337,12 +1343,6 @@ read_cmdline_option (struct gcc_options *opts,
       return;
     }
 
-  if (decoded->errors & CL_ERR_DEPRECATED)
-    {
-      warning_at (loc, 0, "deprecated command line option %qs", opt);
-      return;
-    }
-
   gcc_assert (!decoded->errors);
 
   if (!handle_option (opts, opts_set, decoded, lang_mask, DK_UNSPECIFIED,
@@ -1619,7 +1619,7 @@ control_warning_option (unsigned int opt_index, int kind, const char *arg,
 	arg = cl_options[opt_index].alias_arg;
       opt_index = cl_options[opt_index].alias_target;
     }
-  if (opt_index == OPT_SPECIAL_ignore)
+  if (opt_index == OPT_SPECIAL_ignore || opt_index == OPT_SPECIAL_deprecated)
     return;
   if (dc)
     diagnostic_classify_diagnostic (dc, opt_index, (diagnostic_t) kind, loc);

gcc/opts.h

@@ -106,8 +106,6 @@ struct cl_option
   BOOL_BITFIELD cl_tolower : 1;
   /* Report argument with -fverbose-asm  */
   BOOL_BITFIELD cl_report : 1;
-  /* Deprecated option  */
-  BOOL_BITFIELD cl_deprecated: 1;
   /* Argument is an unsigned integer with an optional byte suffix.  */
   BOOL_BITFIELD cl_byte_size: 1;
   /* Offset of field for this option in struct gcc_options, or
@@ -219,7 +217,6 @@ extern const unsigned int cl_enums_count;
 #define CL_ERR_NEGATIVE		(1 << 6) /* Negative form of option
 					    not permitted (together
 					    with OPT_SPECIAL_unknown).  */
-#define CL_ERR_DEPRECATED	(1 << 7) /* Deprecated option.  */
 
 /* Structure describing the result of decoding an option.  */
 

gcc/testsuite/ChangeLog

+2018-08-17  Martin Liska  <mliska@suse.cz>
+
+	* g++.dg/opt/mpx.C: Fix scanned pattern.
+	* gcc.target/i386/mpx.c: Likewise.
+	* g++.dg/warn/Wunreachable-code-1.C: Remove.
+	* g++.dg/warn/Wunreachable-code-2.C: Likewise.
+	* gcc.dg/torture/pr52969.c: Likewise.
+	* g++.dg/warn/pr31246-2.C: Likewise.
+	* g++.dg/warn/pr31246.C: Likewise.
+	* gcc.dg/pr33092.c: Likewise.
+	* g++.dg/opt/eh1.C: Remove a deprecated option.
+	* g++.dg/template/inline1.C: Likewise.
+	* g++.dg/tree-ssa/pr81408.C: Likewise.
+	* gcc.dg/pr41837.c: Likewise.
+	* gcc.dg/pr41841.c: Likewise.
+	* gcc.dg/pr42250.c: Likewise.
+	* gcc.dg/pr43084.c: Likewise.
+	* gcc.dg/pr43317.c: Likewise.
+	* gcc.dg/pr51879-18.c: Likewise.
+	* gcc.dg/torture/pr36066.c: Likewise.
+	* gcc.dg/tree-ssa/ifc-8.c: Likewise.
+	* gcc.dg/tree-ssa/ifc-cd.c: Likewise.
+	* gcc.dg/tree-ssa/pr19210-1.c: Likewise.
+	* gcc.dg/tree-ssa/pr45122.c: Likewise.
+	* gcc.target/i386/pr45352-2.c: Likewise.
+	* gcc.target/i386/zee.c: Likewise.
+	* gfortran.dg/auto_char_len_2.f90: Likewise.
+	* gfortran.dg/auto_char_len_4.f90: Likewise.
+	* gfortran.dg/c_ptr_tests_15.f90: Likewise.
+	* gfortran.dg/char_array_structure_constructor.f90: Likewise.
+	* gfortran.dg/gomp/pr47331.f90: Likewise.
+	* gfortran.dg/pr40999.f: Likewise.
+	* gfortran.dg/pr41011.f: Likewise.
+	* gfortran.dg/pr42051.f03: Likewise.
+	* gfortran.dg/pr46804.f90: Likewise.
+	* gfortran.dg/pr83149_1.f90: Likewise.
+	* gfortran.dg/pr83149_b.f90: Likewise.
+	* gfortran.dg/whole_file_1.f90: Likewise.
+	* gfortran.dg/whole_file_10.f90: Likewise.
+	* gfortran.dg/whole_file_11.f90: Likewise.
+	* gfortran.dg/whole_file_12.f90: Likewise.
+	* gfortran.dg/whole_file_13.f90: Likewise.
+	* gfortran.dg/whole_file_14.f90: Likewise.
+	* gfortran.dg/whole_file_15.f90: Likewise.
+	* gfortran.dg/whole_file_16.f90: Likewise.
+	* gfortran.dg/whole_file_17.f90: Likewise.
+	* gfortran.dg/whole_file_18.f90: Likewise.
+	* gfortran.dg/whole_file_19.f90: Likewise.
+	* gfortran.dg/whole_file_2.f90: Likewise.
+	* gfortran.dg/whole_file_20.f03: Likewise.
+	* gfortran.dg/whole_file_3.f90: Likewise.
+	* gfortran.dg/whole_file_4.f90: Likewise.
+	* gfortran.dg/whole_file_5.f90: Likewise.
+	* gfortran.dg/whole_file_6.f90: Likewise.
+	* gfortran.dg/whole_file_7.f90: Likewise.
+	* gfortran.dg/whole_file_8.f90: Likewise.
+	* gfortran.dg/whole_file_9.f90: Likewise.
+	* gcc.dg/vect/vect.exp: Likewise.
+
 2018-08-17  Richard Biener  <rguenther@suse.de>
 
 	PR middle-end/86505

gcc/testsuite/g++.dg/opt/eh1.C

 // PR middle-end/14477
 // { dg-do compile }
-// { dg-options "-O2 -fno-default-inline" }
+// { dg-options "-O2" }
 
 struct A
 {

gcc/testsuite/g++.dg/opt/mpx.C

 // { dg-do compile }
 // { dg-options "-fcheck-pointer-bounds -fchkp-first-field-has-own-bounds" }
 
-// { dg-warning "deprecated command line option .-fcheck-pointer-bounds." "" { target *-*-* } 0 }
-// { dg-warning "deprecated command line option .-fchkp-first-field-has-own-bounds." "" { target *-*-* } 0 }
+// { dg-warning ".-fcheck-pointer-bounds. is no longer supported" "" { target *-*-* } 0 }
+// { dg-warning ".-fchkp-first-field-has-own-bounds. is no longer supported" "" { target *-*-* } 0 }

gcc/testsuite/g++.dg/template/inline1.C

 // { dg-do compile }
-// { dg-options "-fno-default-inline -O0" }
+// { dg-options "-O0" }
 // { dg-final { scan-assembler-not "\n_?_ZN1X3FooIiEEvT_\[: \t\n\]" } }
 
 // Copyright (C) 2003 Free Software Foundation, Inc.

gcc/testsuite/g++.dg/tree-ssa/pr81408.C

 /* { dg-do compile } */
-/* { dg-options "-O2 -std=gnu++11 -fopt-info-loop-missed -Wunsafe-loop-optimizations" } */
+/* { dg-options "-O2 -std=gnu++11 -fopt-info-loop-missed" } */
 struct p
 {
   char *ay;

gcc/testsuite/g++.dg/warn/Wunreachable-code-1.C

-/* PR17544 Incorrect -Wunreachable-code warning
-   Origin: sebor@roguewave.com
-
-   G++ appends a "return 0;" when finishing a function, but it was not
-   given a source location.  The gimplifier thinks a return statement
-   needs a locus so it would add one, making the compiler generated code
-   visible to the unreachable code warning.  */
-
-/* { dg-do compile } */
-/* { dg-options "-O -Wunreachable-code" } */
-
-int
-main (int argc, char *argv[])
-{
-  const char* const s = argc < 2 ? "" : argv [1];
-  int i = 0;
-  do {
-    ++i;
-  } while (i < s [0]);
-  return i;
-}
-

gcc/testsuite/g++.dg/warn/Wunreachable-code-2.C

-// PR c++/21228
-/* { dg-options "-Wunreachable-code" } */
-
-class testStringBase
-{
-public:
-  char *stringPtr;
-};
-
-class testString : public testStringBase
-{
-public:
-  testString();
-};
-
-testString::testString()
-{
-  stringPtr = (char *) 9;
-}
- 
-int main(int argc, char **argv) {
-  testString s;
-}

gcc/testsuite/g++.dg/warn/pr31246-2.C

-// PR 31246
-// { dg-do compile }
-// { dg-options "-Wunreachable-code" }
-#include <new>
-
-int* get_ptr(void* ptr)
-{
-  return new(ptr) int();
-}

gcc/testsuite/g++.dg/warn/pr31246.C

-// PR 31246
-// { dg-do compile }
-// { dg-options "-Wunreachable-code -D_GLIBCXX_DEBUG" }
-#include <vector>
-
-int main()
-{
-  std::vector<int>::iterator a;
-}

gcc/testsuite/gcc.dg/pr33092.c

-/* { dg-do compile } */
-/* { dg-options "-O1 -fno-tree-salias" } */
-int foo ()
-{
-  return 0;
-}

gcc/testsuite/gcc.dg/pr41837.c

 /* PR middle-end/41837 */
 /* { dg-do compile } */
-/* { dg-options "-fipa-struct-reorg -O -fwhole-program -fprofile-generate" } */
+/* { dg-options "-O -fwhole-program -fprofile-generate" } */
 
 typedef struct { int a, b; } T1;
 typedef struct S1 *T2;

gcc/testsuite/gcc.dg/pr41841.c

 /* PR tree-optimization/41841 */
 /* { dg-do compile } */
-/* { dg-options "-O -fipa-struct-reorg -fwhole-program -fipa-cp" } */
+/* { dg-options "-O -fwhole-program -fipa-cp" } */
 
 typedef struct S *T;
 typedef struct { } *U;

gcc/testsuite/gcc.dg/pr42250.c

 /* { dg-do compile } */
-/* { dg-options "-O2 -fipa-struct-reorg" } */
+/* { dg-options "-O2" } */
 
 extern double log10 (double __x);
 extern double ceil (double __x);

gcc/testsuite/gcc.dg/pr43084.c

 /* PR debug/43084 */
 /* { dg-do compile } */
-/* { dg-options "-O1 -fipa-struct-reorg -fwhole-program -fcompare-debug" } */
+/* { dg-options "-O1 -fwhole-program -fcompare-debug" } */
 /* { dg-xfail-if "" { powerpc-ibm-aix* } } */
 
 struct S

gcc/testsuite/gcc.dg/pr43317.c

 /* { dg-do compile } */
-/* { dg-options "-O -fipa-struct-reorg -fwhole-program -g" } */
+/* { dg-options "-O -fwhole-program -g" } */
 
 extern void *malloc(__SIZE_TYPE__);
 

gcc/testsuite/gcc.dg/pr51879-18.c

 /* { dg-do compile } */
-/* { dg-options "-O2 -ftree-tail-merge -fdump-tree-pre -fno-tree-copy-prop -fno-tree-dominator-opts -fno-tree-copyrename" } */
+/* { dg-options "-O2 -ftree-tail-merge -fdump-tree-pre -fno-tree-copy-prop -fno-tree-dominator-opts" } */
 
 extern int foo (void);
 

gcc/testsuite/gcc.dg/torture/pr36066.c

 /* { dg-do compile } */
-/* { dg-options "-funsafe-loop-optimizations -ftree-vrp" } */
+/* { dg-options "-ftree-vrp" } */
 
 typedef int FLAC__int32;
 typedef int FLAC__bool;

gcc/testsuite/gcc.dg/torture/pr52969.c

-/* { dg-do compile } */
-/* { dg-options "-ftree-loop-if-convert-stores" } */
-
-int a, b;
-float xsum[100];
-void foo (float *cluster)
-{
-  int j;
-  for (; a ; ++j) {
-      xsum[j] = cluster[j];
-      if (xsum[j] > 0)
-	xsum[j] = 0;
-  }
-  if (xsum[0])
-    b = 0;
-}

gcc/testsuite/gcc.dg/tree-ssa/ifc-8.c

 
 /* { dg-do compile } */
-/* { dg-options "-Ofast -fdump-tree-ifcvt-details-blocks -ftree-loop-if-convert-stores" } */
+/* { dg-options "-Ofast -fdump-tree-ifcvt-details-blocks" } */
 /* { dg-require-visibility "" } */
 
 #define LEN 4096

gcc/testsuite/gcc.dg/tree-ssa/ifc-cd.c

 /* { dg-do compile } */
-/* { dg-options "-O3 -fdump-tree-ifcvt-details-blocks-details -ftree-loop-if-convert-stores" } */
+/* { dg-options "-O3 -fdump-tree-ifcvt-details-blocks-details" } */
 
 void foo (int *x1, int *x2, int *x3, int *x4, int *y)
 {

gcc/testsuite/gcc.dg/tree-ssa/pr19210-1.c

 /* { dg-do compile } */
-/* { dg-options "-O2 -fopt-info-loop-missed -Wunsafe-loop-optimizations" } */
+/* { dg-options "-O2 -fopt-info-loop-missed" } */
 extern void g(void);
 
 void

gcc/testsuite/gcc.dg/tree-ssa/pr45122.c

@@ -2,7 +2,7 @@
 /* PR tree-optimization/45122 */
 
 /* { dg-do run } */
-/* { dg-options "-O2 -funsafe-loop-optimizations" } */
+/* { dg-options "-O2" } */
 
 extern void abort (void);
 

gcc/testsuite/gcc.dg/vect/vect.exp

@@ -262,13 +262,6 @@ et-dg-runtest dg-runtest [lsort \
 	[glob -nocomplain $srcdir/$subdir/ggc-*.\[cS\]]] \
 	"" $DEFAULT_VECTCFLAGS
 
-# -ftree-loop-if-convert-stores
-set DEFAULT_VECTCFLAGS $SAVED_DEFAULT_VECTCFLAGS
-lappend DEFAULT_VECTCFLAGS "-ftree-loop-if-convert-stores"
-et-dg-runtest dg-runtest [lsort \
-	[glob -nocomplain $srcdir/$subdir/if-cvt-stores-vect-*.\[cS\]]] \
-	"" $DEFAULT_VECTCFLAGS
-
 # With -O3.
 # Don't allow IPA cloning, because it throws our counts out of whack.
 set DEFAULT_VECTCFLAGS $SAVED_DEFAULT_VECTCFLAGS

gcc/testsuite/gcc.target/i386/mpx.c

 /* { dg-do compile } */
 // { dg-options "-mmpx" }
-// { dg-warning "deprecated command line option .-mmpx." "" { target *-*-* } 0 }
+// { dg-warning "switch .-mmpx. is no longer supported" "" { target *-*-* } 0 }

gcc/testsuite/gcc.target/i386/pr45352-2.c

 /* { dg-do compile } */
-/* { dg-options "-O1 -mtune=amdfam10 -fexpensive-optimizations -fgcse -foptimize-register-move -freorder-blocks -fschedule-insns2 -funswitch-loops -fgcse-las -fselective-scheduling2 -fsel-sched-pipelining -funroll-all-loops" } */
+/* { dg-options "-O1 -mtune=amdfam10 -fexpensive-optimizations -fgcse -freorder-blocks -fschedule-insns2 -funswitch-loops -fgcse-las -fselective-scheduling2 -fsel-sched-pipelining -funroll-all-loops" } */
 
 typedef char uint8_t;
 typedef int uint32_t;

gcc/testsuite/gcc.target/i386/zee.c

 /* { dg-do compile { target { ! ia32 } } } */
-/* { dg-options "-O2 -fzee" } */
+/* { dg-options "-O2" } */
 /* { dg-final { scan-assembler-not "mov\[\\t \]+\(%\[\^,\]+\),\[\\t \]*\\1" } } */
 int mask[100];
 int foo(unsigned x)

gcc/testsuite/gfortran.dg/auto_char_len_2.f90

 ! { dg-do compile }
-! { dg-options "-fwhole-file" }
+! { dg-options "" }
 !
 ! PR fortran/41235
 !

gcc/testsuite/gfortran.dg/auto_char_len_4.f90

 ! { dg-do compile }
-! { dg-options "-pedantic -fwhole-file" }
 !
 ! Tests the fix for PR25087, in which the following invalid code
 ! was not detected.

gcc/testsuite/gfortran.dg/c_ptr_tests_15.f90

 ! { dg-do compile }
-! { dg-options "-fwhole-file -fdump-tree-original" }
+! { dg-options "-fdump-tree-original" }
 !
 ! PR fortran/43042 - fix ICE with c_null_ptr when using
 ! -fwhole-file (or -flto, which implies -fwhole-file).

gcc/testsuite/gfortran.dg/char_array_structure_constructor.f90

 ! { dg-do run }
-! { dg-options "-fwhole-file" }
 !
 ! PR fortran/19107
 ! -fwhole-file flag added for PR fortran/44945

gcc/testsuite/gfortran.dg/gomp/pr47331.f90

 ! PR fortran/47331
 ! { dg-do compile }
-! { dg-options "-fopenmp -fwhole-file" }
+! { dg-options "-fopenmp" }
 
 subroutine foo
   !$omp parallel

gcc/testsuite/gfortran.dg/pr40999.f

 ! { dg-do compile }
-! { dg-options "-O3 -fwhole-file" }
+! { dg-options "-O3" }
 
       SUBROUTINE ZLARFG( ALPHA )
         COMPLEX*16 ZLADIV

gcc/testsuite/gfortran.dg/pr41011.f

 ! { dg-do compile }
-! { dg-options "-O3 -fwhole-file" }
+! { dg-options "-O3" }
       CALL UVSET(NX,NY,NZ,HVAR,ZET,NP,DZ,DKM,UM,VM,UG,VG,TM,DCDX, ! { dg-warning "Rank mismatch" }
      *ITY,ISH,NSMT,F)
          CALL DCTDX(NX,NY,NX1,NFILT,C(MLAG),DCDX(MLAG),HELP,HELPA,

gcc/testsuite/gfortran.dg/pr42051.f03

 ! { dg-do compile }
-! { dg-options "-fno-whole-file" }
 !
 ! PR fortran/42051
 ! PR fortran/44064

gcc/testsuite/gfortran.dg/pr46804.f90

 ! PR rtl-optimization/46804
 ! { dg-do run }
-! { dg-options "-O -fPIC -fexpensive-optimizations -fgcse -foptimize-register-move -fpeel-loops -fno-tree-loop-optimize" }
+! { dg-options "-O -fPIC -fexpensive-optimizations -fgcse -fpeel-loops -fno-tree-loop-optimize" }
 
 program main
   integer, parameter :: n1 = 2, n2 = 3, n3 = 4, slen = 3

gcc/testsuite/gfortran.dg/pr83149_1.f90

 ! Compiled with pr83149.f90
 ! { dg-do run }
-! { dg-options "-fno-whole-file" }
 ! { dg-compile-aux-modules "pr83149.f90" }
 ! { dg-additional-sources pr83149.f90 }
 !

gcc/testsuite/gfortran.dg/pr83149_b.f90

 ! Compiled with pr83149_a.f90
 ! { dg-do run }
-! { dg-options "-fno-whole-file" }
 ! { dg-compile-aux-modules "pr83149_a.f90" }
 ! { dg-additional-sources pr83149_a.f90 }
 !

gcc/testsuite/gfortran.dg/whole_file_1.f90

 ! { dg-do compile }
-! { dg-options "-fwhole-file" }
+! { dg-options "" }
 ! Tests the fix for PR22571 in which the derived types in a, b
 ! c and d were not detected to be different.  In e and f, they
 ! are the same because they are sequence types.

gcc/testsuite/gfortran.dg/whole_file_10.f90

 ! { dg-do compile }
-! { dg-options "-fwhole-file" }
 ! Test the fix for the fifth problem in PR40011, where the
 ! entries were not resolved, resulting in a segfault.
 !

gcc/testsuite/gfortran.dg/whole_file_11.f90

 ! { dg-do compile }
-! { dg-options "-fwhole-file" }
 !
 ! Tests the fix PR40011 comment 16 in which the derived type lists in
 ! different program units were getting mixed up.

gcc/testsuite/gfortran.dg/whole_file_12.f90

 ! { dg-do compile }
-! { dg-options "-fwhole-file" }
 !
 ! Tests the fix PR40011 comment 17 in which the explicit interface was
 ! being ignored and the missing argument was not correctly handled, which

gcc/testsuite/gfortran.dg/whole_file_13.f90

 ! { dg-do run }
-! { dg-options "-fwhole-file -O3" }
 ! Check that the TYPE_CANONICAL is being correctly set
 ! for the derived types, when whole file compiling.
 ! (based on import.f90)

gcc/testsuite/gfortran.dg/whole_file_14.f90

 ! { dg-do run }
-! { dg-options "-fwhole-file -O3" }
+! { dg-options "-O3" }
 ! Check that the derived types are correctly substituted when
 ! whole file compiling.
 !

gcc/testsuite/gfortran.dg/whole_file_15.f90

 ! { dg-do compile }
-! { dg-options "-fwhole-file" }
 ! Test the fix for PR43450 in which the use of 'replica_env_type'
 ! caused an ICE in ep_types
 !

gcc/testsuite/gfortran.dg/whole_file_16.f90

 ! { dg-do compile }
-! { dg-options "-fwhole-file" }
 !
 ! PR fortran/31346
 !

gcc/testsuite/gfortran.dg/whole_file_17.f90

 ! { dg-do compile }
-! { dg-options "-pedantic -fwhole-file" }
+! { dg-options "-pedantic" }
 !
 ! PR fortran/30668
 !

gcc/testsuite/gfortran.dg/whole_file_18.f90

 ! { dg-do compile }
-! { dg-options "-fwhole-file -Wno-unused-dummy-argument" }
+! { dg-options "-Wno-unused-dummy-argument" }
 !
 ! PR fortran/34260
 !

gcc/testsuite/gfortran.dg/whole_file_19.f90

 ! { dg-do compile }
-! { dg-options "-fwhole-file" }
 ! Test the fix for pr40011 comment #42, in which the subroutine
 ! would just get lost with -fwhole-file.
 !

gcc/testsuite/gfortran.dg/whole_file_2.f90

 ! { dg-do compile }
-! { dg-options "-fwhole-file" }
+! { dg-options "" }
 ! Tests the fix for PR26227 in which the interface mismatches
 ! below were not detected.
 !

gcc/testsuite/gfortran.dg/whole_file_20.f03

 ! { dg-do compile }
-! { dg-options "-fwhole-file -fcoarray=single" }
+! { dg-options "-fcoarray=single" }
 !
 ! Procedures with dummy arguments that are coarrays or polymorphic
 ! must have an explicit interface in the calling routine.

gcc/testsuite/gfortran.dg/whole_file_3.f90

 ! { dg-do compile }
-! { dg-options "-fwhole-file" }
+! { dg-options "" }
 ! Tests the fix for PR26227 in which the interface mismatches
 ! below were not detected.
 !

gcc/testsuite/gfortran.dg/whole_file_4.f90

 ! { dg-do compile }
-! { dg-options "-fwhole-file -std=legacy" }
+! { dg-options "-std=legacy" }
 ! Tests the fix for PR24886 in which the mismatch between the
 ! character lengths of the actual and formal arguments of
 ! 'foo' was not detected.

gcc/testsuite/gfortran.dg/whole_file_5.f90

 ! { dg-do compile }
-! { dg-options "-O3 -fwhole-file -fdump-tree-optimized" }
+! { dg-options "-O3 -fdump-tree-optimized" }
 ! { dg-add-options bind_pic_locally }
 !
 ! Check that inlining of functions declared BEFORE usage works.

gcc/testsuite/gfortran.dg/whole_file_6.f90

 ! { dg-do compile }
-! { dg-options "-O3 -fwhole-file -fdump-tree-optimized" }
+! { dg-options "-O3 -fdump-tree-optimized" }
 ! { dg-add-options bind_pic_locally }
 !
 ! Check that inlining of functions declared AFTER usage works.

gcc/testsuite/gfortran.dg/whole_file_7.f90

 ! { dg-do compile }
-! { dg-options "-fwhole-file" }
 ! Test the fixes for the first two problems in PR40011
 !
 ! Contributed by Dominique d'Humieres <dominiq@lps.ens.fr>

gcc/testsuite/gfortran.dg/whole_file_8.f90

 ! { dg-do compile }
-! { dg-options "-fwhole-file" }
 ! Test the fix for the third problem in PR40011, where false
 ! type/rank mismatches were found in the main program calls.
 !

gcc/testsuite/gfortran.dg/whole_file_9.f90

 ! { dg-do compile }
-! { dg-options "-fwhole-file" }
 ! Test the fix for the fourth problem in PR40011, where the
 ! entries were not resolved, resulting in a segfault.
 !