2009-08-02 Janus Weil <janus@gcc.gnu.org>

	PR fortran/40881
	* decl.c (match_char_length): Warn about old-style character length
	declarations.
	* match.c (match_arithmetic_if,gfc_match_if): Modify warning message
	for arithmetic if.
	(gfc_match_goto): Warn about computed gotos.
	(gfc_match_return): Warn about alternate return.
	(gfc_match_st_function): Warn about statement functions.
	* resolve.c (resolve_fl_procedure): Modify warning message for
	assumed-length character functions.


2009-08-02  Janus Weil  <janus@gcc.gnu.org>

	PR fortran/40881
	* gfortran.dg/aliasing_dummy_1.f90: Add -std=legacy.
	* gfortran.dg/altreturn_3.f90: Ditto.
	* gfortran.dg/altreturn_5.f90: Ditto.
	* gfortran.dg/altreturn_6.f90: Ditto.
	* gfortran.dg/altreturn_7.f90: Ditto.
	* gfortran.dg/array_constructor_13.f90: Ditto.
	* gfortran.dg/arrayio_7.f90: Ditto.
	* gfortran.dg/arrayio_8.f90: Ditto.
	* gfortran.dg/assumed_charlen_function_3.f90: Modified warning message.
	* gfortran.dg/assumed_charlen_function_4.f90: Add -std=legacy.
	* gfortran.dg/assumed_charlen_function_5.f90: Modified warning message.
	* gfortran.dg/backspace_8.f: Add -std=legacy.
	* gfortran.dg/backspace_9.f: Ditto.
	* gfortran.dg/char_comparison_1.f: Ditto.
	* gfortran.dg/char_decl_1.f90: Ditto.
	* gfortran.dg/char_initialiser_actual.f90: Ditto.
	* gfortran.dg/char_pointer_assign.f90: Ditto.
	* gfortran.dg/char_pointer_dependency.f90: Ditto.
	* gfortran.dg/char_pointer_dummy.f90: Ditto.
	* gfortran.dg/char_pointer_func.f90: Ditto.
	* gfortran.dg/common_8.f90: Ditto.
	* gfortran.dg/constant_substring.f: Ditto.
	* gfortran.dg/data_char_2.f90: Ditto.
	* gfortran.dg/der_array_io_1.f90: Ditto.
	* gfortran.dg/der_array_io_2.f90: Ditto.
	* gfortran.dg/der_array_io_3.f90: Ditto.
	* gfortran.dg/der_io_3.f90: Ditto.
	* gfortran.dg/dev_null.F90: Ditto.
	* gfortran.dg/direct_io_2.f90: Ditto.
	* gfortran.dg/do_iterator_2.f90: Ditto.
	* gfortran.dg/e_d_fmt.f90: Ditto.
	* gfortran.dg/empty_format_1.f90: Ditto.
	* gfortran.dg/entry_17.f90: Modified warning message.
	* gfortran.dg/entry_7.f90: Add -std=legacy.
	* gfortran.dg/eor_1.f90: Ditto.
	* gfortran.dg/equiv_2.f90: Ditto.
	* gfortran.dg/equiv_constraint_2.f90: Use new-style character length.
	* gfortran.dg/equiv_substr.f90: Add -std=legacy.
	* gfortran.dg/extended_char_comparison_1.f: Ditto.
	* gfortran.dg/fmt_bz_bn_err.f: Ditto.
	* gfortran.dg/fmt_error_2.f90: Ditto.
	* gfortran.dg/fmt_read_bz_bn.f90: Ditto.
	* gfortran.dg/fmt_tl.f: Ditto.
	* gfortran.dg/fmt_white.f: Ditto.
	* gfortran.dg/func_derived_1.f90: Ditto.
	* gfortran.dg/g77_intrinsics_funcs.f: Ditto.
	* gfortran.dg/g77_intrinsics_sub.f: Ditto.
	* gfortran.dg/global_references_2.f90: Ditto.
	* gfortran.dg/hollerith_1.f90: Ditto.
	* gfortran.dg/hollerith.f90: Use new-style character length.
	* gfortran.dg/hollerith_f95.f90: Ditto.
	* gfortran.dg/ichar_1.f90: Add -std=legacy.
	* gfortran.dg/implicit_6.f90: Ditto.
	* gfortran.dg/implicit_9.f90: Ditto.
	* gfortran.dg/inquire_13.f90: Ditto.
	* gfortran.dg/inquire_5.f90: Ditto.
	* gfortran.dg/inquire_6.f90: Ditto.
	* gfortran.dg/inquire.f90: Ditto.
	* gfortran.dg/io_constraints_1.f90: Use new-style character length.
	* gfortran.dg/io_constraints_2.f90: Ditto.
	* gfortran.dg/list_read_2.f90: Add -std=legacy.
	* gfortran.dg/loc_2.f90: Ditto.
	* gfortran.dg/logical_1.f90: Ditto.
	* gfortran.dg/longline.f: Ditto.
	* gfortran.dg/merge_char_1.f90: Ditto.
	* gfortran.dg/namelist_12.f: Ditto.
	* gfortran.dg/namelist_14.f90: Ditto.
	* gfortran.dg/namelist_18.f90: Ditto.
	* gfortran.dg/namelist_19.f90: Ditto.
	* gfortran.dg/namelist_21.f90: Ditto.
	* gfortran.dg/namelist_22.f90: Ditto.
	* gfortran.dg/namelist_37.f90: Ditto.
	* gfortran.dg/namelist_54.f90: Ditto.
	* gfortran.dg/namelist_55.f90: Ditto.
	* gfortran.dg/namelist_empty.f90: Ditto.
	* gfortran.dg/namelist_use.f90: Use new-style character length.
	* gfortran.dg/namelist_use_only.f90: Add -std=legacy.
	* gfortran.dg/nested_modules_4.f90: Ditto.
	* gfortran.dg/nested_modules_5.f90: Ditto.
	* gfortran.dg/open-options-blanks.f: Ditto.
	* gfortran.dg/output_exponents_1.f90: Ditto.
	* gfortran.dg/parens_5.f90: Ditto.
	* gfortran.dg/parens_6.f90: Ditto.
	* gfortran.dg/parent_result_ref_2.f90: Modified warning message.
	* gfortran.dg/pointer_function_actual_1.f90: Add -std=legacy.
	* gfortran.dg/pr15129.f90: Ditto.
	* gfortran.dg/pr15332.f: Ditto.
	* gfortran.dg/pr16597.f90: Ditto.
	* gfortran.dg/pr17143.f90: Ditto.
	* gfortran.dg/pr17164.f90: Ditto.
	* gfortran.dg/pr17229.f: Modified warning message.
	* gfortran.dg/pr18210.f90: Add -std=legacy.
	* gfortran.dg/pr19155.f: Ditto.
	* gfortran.dg/pr20086.f90: Ditto.
	* gfortran.dg/pr20124.f90: Ditto.
	* gfortran.dg/pr20755.f: Ditto.
	* gfortran.dg/pr20865.f90: Ditto.
	* gfortran.dg/pr20950.f: Ditto.
	* gfortran.dg/pr21730.f: Ditto.
	* gfortran.dg/pr22491.f: Ditto.
	* gfortran.dg/pr29713.f90: Ditto.
	* gfortran.dg/print_parentheses_1.f: Ditto.
	* gfortran.dg/print_parentheses_2.f90: Ditto.
	* gfortran.dg/proc_assign_1.f90: Ditto.
	* gfortran.dg/proc_decl_1.f90: Ditto.
	* gfortran.dg/proc_ptr_17.f90: Add dg-warning.
	* gfortran.dg/read_eor.f90: : Add -std=legacy.
	* gfortran.dg/read_float_1.f90: Ditto.
	* gfortran.dg/read_logical.f90: Ditto.
	* gfortran.dg/recursive_statement_functions.f90: Ditto.
	* gfortran.dg/return_1.f90: Ditto.
	* gfortran.dg/rewind_1.f90: Ditto.
	* gfortran.dg/runtime_warning_1.f90: Use new-style character length.
	* gfortran.dg/scalar_return_1.f90: Add -std=legacy.
	* gfortran.dg/stfunc_1.f90: Ditto.
	* gfortran.dg/stfunc_3.f90: Ditto.
	* gfortran.dg/stfunc_4.f90: Ditto.
	* gfortran.dg/stfunc_6.f90: Ditto.
	* gfortran.dg/streamio_2.f90: Ditto.
	* gfortran.dg/string_ctor_1.f90: Ditto.
	* gfortran.dg/string_null_compare_1.f: Ditto.
	* gfortran.dg/substr_6.f90: Ditto.
	* gfortran.dg/tl_editing.f90: Ditto.
	* gfortran.dg/unf_io_convert_1.f90: Use new-style character length.
	* gfortran.dg/warnings_are_errors_1.f90: Modified warning message.
	* gfortran.dg/x_slash_1.f: Add -std=legacy.
	* gfortran.dg/g77/1832.f: Ditto.
	* gfortran.dg/g77/19981216-0.f Ditto.
	* gfortran.dg/g77/19990525-0.f: Ditto.
	* gfortran.dg/g77/19990826-2.f: Ditto.
	* gfortran.dg/g77/20000630-2.f: Ditto.
	* gfortran.dg/g77/20010116.f: Ditto.
	* gfortran.dg/g77/20010519-1.f: Use new-style character length.
	* gfortran.dg/g77/980419-2.f: Add -std=legacy.
	* gfortran.dg/g77/980520-1.f: Ditto.
	* gfortran.dg/g77/check0.f: Ditto.
	* gfortran.dg/g77/cpp3.F: Ditto.
	* gfortran.dg/g77/cpp4.F: Use new-style character length.
	* gfortran.dg/g77/f77-edit-i-in.f: Add -std=legacy.
	* gfortran.dg/g77/f77-edit-t-in.f: Ditto.
	* gfortran.dg/g77/short.f: Ditto.




git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@150349 138bc75d-0d04-0410-961f-82ee72b054a4

142 files changed, 450 insertions, 55 deletions

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 477f37269db..d01a1a7b52a 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,148 @@
+2009-08-02  Janus Weil  <janus@gcc.gnu.org>
+
+	PR fortran/40881
+	* gfortran.dg/aliasing_dummy_1.f90: Add -std=legacy.
+	* gfortran.dg/altreturn_3.f90: Ditto.
+	* gfortran.dg/altreturn_5.f90: Ditto.
+	* gfortran.dg/altreturn_6.f90: Ditto.
+	* gfortran.dg/altreturn_7.f90: Ditto.
+	* gfortran.dg/array_constructor_13.f90: Ditto.
+	* gfortran.dg/arrayio_7.f90: Ditto.
+	* gfortran.dg/arrayio_8.f90: Ditto.
+	* gfortran.dg/assumed_charlen_function_3.f90: Modified warning message.
+	* gfortran.dg/assumed_charlen_function_4.f90: Add -std=legacy.
+	* gfortran.dg/assumed_charlen_function_5.f90: Modified warning message.
+	* gfortran.dg/backspace_8.f: Add -std=legacy.
+	* gfortran.dg/backspace_9.f: Ditto.
+	* gfortran.dg/char_comparison_1.f: Ditto.
+	* gfortran.dg/char_decl_1.f90: Ditto.
+	* gfortran.dg/char_initialiser_actual.f90: Ditto.
+	* gfortran.dg/char_pointer_assign.f90: Ditto.
+	* gfortran.dg/char_pointer_dependency.f90: Ditto.
+	* gfortran.dg/char_pointer_dummy.f90: Ditto.
+	* gfortran.dg/char_pointer_func.f90: Ditto.
+	* gfortran.dg/common_8.f90: Ditto.
+	* gfortran.dg/constant_substring.f: Ditto.
+	* gfortran.dg/data_char_2.f90: Ditto.
+	* gfortran.dg/der_array_io_1.f90: Ditto.
+	* gfortran.dg/der_array_io_2.f90: Ditto.
+	* gfortran.dg/der_array_io_3.f90: Ditto.
+	* gfortran.dg/der_io_3.f90: Ditto.
+	* gfortran.dg/dev_null.F90: Ditto.
+	* gfortran.dg/direct_io_2.f90: Ditto.
+	* gfortran.dg/do_iterator_2.f90: Ditto.
+	* gfortran.dg/e_d_fmt.f90: Ditto.
+	* gfortran.dg/empty_format_1.f90: Ditto.
+	* gfortran.dg/entry_17.f90: Modified warning message.
+	* gfortran.dg/entry_7.f90: Add -std=legacy.
+	* gfortran.dg/eor_1.f90: Ditto.
+	* gfortran.dg/equiv_2.f90: Ditto.
+	* gfortran.dg/equiv_constraint_2.f90: Use new-style character length.
+	* gfortran.dg/equiv_substr.f90: Add -std=legacy.
+	* gfortran.dg/extended_char_comparison_1.f: Ditto.
+	* gfortran.dg/fmt_bz_bn_err.f: Ditto.
+	* gfortran.dg/fmt_error_2.f90: Ditto.
+	* gfortran.dg/fmt_read_bz_bn.f90: Ditto.
+	* gfortran.dg/fmt_tl.f: Ditto.
+	* gfortran.dg/fmt_white.f: Ditto.
+	* gfortran.dg/func_derived_1.f90: Ditto.
+	* gfortran.dg/g77_intrinsics_funcs.f: Ditto.
+	* gfortran.dg/g77_intrinsics_sub.f: Ditto.
+	* gfortran.dg/global_references_2.f90: Ditto.
+	* gfortran.dg/hollerith_1.f90: Ditto.
+	* gfortran.dg/hollerith.f90: Use new-style character length.
+	* gfortran.dg/hollerith_f95.f90: Ditto.
+	* gfortran.dg/ichar_1.f90: Add -std=legacy.
+	* gfortran.dg/implicit_6.f90: Ditto.
+	* gfortran.dg/implicit_9.f90: Ditto.
+	* gfortran.dg/inquire_13.f90: Ditto.
+	* gfortran.dg/inquire_5.f90: Ditto.
+	* gfortran.dg/inquire_6.f90: Ditto.
+	* gfortran.dg/inquire.f90: Ditto.
+	* gfortran.dg/io_constraints_1.f90: Use new-style character length.
+	* gfortran.dg/io_constraints_2.f90: Ditto.
+	* gfortran.dg/list_read_2.f90: Add -std=legacy.
+	* gfortran.dg/loc_2.f90: Ditto.
+	* gfortran.dg/logical_1.f90: Ditto.
+	* gfortran.dg/longline.f: Ditto.
+	* gfortran.dg/merge_char_1.f90: Ditto.
+	* gfortran.dg/namelist_12.f: Ditto.
+	* gfortran.dg/namelist_14.f90: Ditto.
+	* gfortran.dg/namelist_18.f90: Ditto.
+	* gfortran.dg/namelist_19.f90: Ditto.
+	* gfortran.dg/namelist_21.f90: Ditto.
+	* gfortran.dg/namelist_22.f90: Ditto.
+	* gfortran.dg/namelist_37.f90: Ditto.
+	* gfortran.dg/namelist_54.f90: Ditto.
+	* gfortran.dg/namelist_55.f90: Ditto.
+	* gfortran.dg/namelist_empty.f90: Ditto.
+	* gfortran.dg/namelist_use.f90: Use new-style character length.
+	* gfortran.dg/namelist_use_only.f90: Add -std=legacy.
+	* gfortran.dg/nested_modules_4.f90: Ditto.
+	* gfortran.dg/nested_modules_5.f90: Ditto.
+	* gfortran.dg/open-options-blanks.f: Ditto.
+	* gfortran.dg/output_exponents_1.f90: Ditto.
+	* gfortran.dg/parens_5.f90: Ditto.
+	* gfortran.dg/parens_6.f90: Ditto.
+	* gfortran.dg/parent_result_ref_2.f90: Modified warning message.
+	* gfortran.dg/pointer_function_actual_1.f90: Add -std=legacy.
+	* gfortran.dg/pr15129.f90: Ditto.
+	* gfortran.dg/pr15332.f: Ditto.
+	* gfortran.dg/pr16597.f90: Ditto.
+	* gfortran.dg/pr17143.f90: Ditto.
+	* gfortran.dg/pr17164.f90: Ditto.
+	* gfortran.dg/pr17229.f: Modified warning message.
+	* gfortran.dg/pr18210.f90: Add -std=legacy.
+	* gfortran.dg/pr19155.f: Ditto.
+	* gfortran.dg/pr20086.f90: Ditto.
+	* gfortran.dg/pr20124.f90: Ditto.
+	* gfortran.dg/pr20755.f: Ditto.
+	* gfortran.dg/pr20865.f90: Ditto.
+	* gfortran.dg/pr20950.f: Ditto.
+	* gfortran.dg/pr21730.f: Ditto.
+	* gfortran.dg/pr22491.f: Ditto.
+	* gfortran.dg/pr29713.f90: Ditto.
+	* gfortran.dg/print_parentheses_1.f: Ditto.
+	* gfortran.dg/print_parentheses_2.f90: Ditto.
+	* gfortran.dg/proc_assign_1.f90: Ditto.
+	* gfortran.dg/proc_decl_1.f90: Ditto.
+	* gfortran.dg/proc_ptr_17.f90: Add dg-warning.
+	* gfortran.dg/read_eor.f90: : Add -std=legacy.
+	* gfortran.dg/read_float_1.f90: Ditto.
+	* gfortran.dg/read_logical.f90: Ditto.
+	* gfortran.dg/recursive_statement_functions.f90: Ditto.
+	* gfortran.dg/return_1.f90: Ditto.
+	* gfortran.dg/rewind_1.f90: Ditto.
+	* gfortran.dg/runtime_warning_1.f90: Use new-style character length.
+	* gfortran.dg/scalar_return_1.f90: Add -std=legacy.
+	* gfortran.dg/stfunc_1.f90: Ditto.
+	* gfortran.dg/stfunc_3.f90: Ditto.
+	* gfortran.dg/stfunc_4.f90: Ditto.
+	* gfortran.dg/stfunc_6.f90: Ditto.
+	* gfortran.dg/streamio_2.f90: Ditto.
+	* gfortran.dg/string_ctor_1.f90: Ditto.
+	* gfortran.dg/string_null_compare_1.f: Ditto.
+	* gfortran.dg/substr_6.f90: Ditto.
+	* gfortran.dg/tl_editing.f90: Ditto.
+	* gfortran.dg/unf_io_convert_1.f90: Use new-style character length.
+	* gfortran.dg/warnings_are_errors_1.f90: Modified warning message.
+	* gfortran.dg/x_slash_1.f: Add -std=legacy.
+	* gfortran.dg/g77/1832.f: Ditto.
+	* gfortran.dg/g77/19981216-0.f Ditto.
+	* gfortran.dg/g77/19990525-0.f: Ditto.
+	* gfortran.dg/g77/19990826-2.f: Ditto.
+	* gfortran.dg/g77/20000630-2.f: Ditto.
+	* gfortran.dg/g77/20010116.f: Ditto.
+	* gfortran.dg/g77/20010519-1.f: Use new-style character length.
+	* gfortran.dg/g77/980419-2.f: Add -std=legacy.
+	* gfortran.dg/g77/980520-1.f: Ditto.
+	* gfortran.dg/g77/check0.f: Ditto.
+	* gfortran.dg/g77/cpp3.F: Ditto.
+	* gfortran.dg/g77/cpp4.F: Use new-style character length.
+	* gfortran.dg/g77/f77-edit-i-in.f: Add -std=legacy.
+	* gfortran.dg/g77/f77-edit-t-in.f: Ditto.
+	* gfortran.dg/g77/short.f: Ditto.
+
 2009-08-01  Adam Nemet  <anemet@caviumnetworks.com>
 
 	* gcc.target/mips/ext-3.c: Add NOMIPS16.
diff --git a/gcc/testsuite/gfortran.dg/aliasing_dummy_1.f90 b/gcc/testsuite/gfortran.dg/aliasing_dummy_1.f90
index 0d0b588fc10..686853a1c08 100644
--- a/gcc/testsuite/gfortran.dg/aliasing_dummy_1.f90
+++ b/gcc/testsuite/gfortran.dg/aliasing_dummy_1.f90
@@ -1,4 +1,6 @@
 ! { dg-do run }
+! { dg-options "-std=legacy" }
+!
 ! This tests the fix for PR24276, which originated from the Loren P. Meissner example,
 ! Array_List.  The PR concerns dummy argument aliassing of components of arrays of derived
 ! types as arrays of the type of the component.  gfortran would compile and run this
@@ -61,4 +63,5 @@ contains
     write (slist(1,1), '(2hi=,i3)') i
   end subroutine foo3
 
-end program test_lex
\ No newline at end of file
+end program test_lex
+
diff --git a/gcc/testsuite/gfortran.dg/altreturn_3.f90 b/gcc/testsuite/gfortran.dg/altreturn_3.f90
index 999ada87a07..daa09017859 100644
--- a/gcc/testsuite/gfortran.dg/altreturn_3.f90
+++ b/gcc/testsuite/gfortran.dg/altreturn_3.f90
@@ -1,4 +1,6 @@
 ! { dg-do run }
+! { dg-options "-std=legacy" }
+!
 ! Tests the fix for PR30236, which was due to alternate returns
 ! in generic interfaces causing a segfault.  They now work
 ! correctly.
diff --git a/gcc/testsuite/gfortran.dg/altreturn_5.f90 b/gcc/testsuite/gfortran.dg/altreturn_5.f90
index ff1b82289f6..a8b6ff83cd1 100644
--- a/gcc/testsuite/gfortran.dg/altreturn_5.f90
+++ b/gcc/testsuite/gfortran.dg/altreturn_5.f90
@@ -1,4 +1,6 @@
 ! { dg-do run }
+! { dg-options "-std=legacy" }
+!
 ! Tests the fix for PR31483, in which dummy argument procedures
 ! produced an ICE if they had an alternate return.
 !
diff --git a/gcc/testsuite/gfortran.dg/altreturn_6.f90 b/gcc/testsuite/gfortran.dg/altreturn_6.f90
index 61f5f605990..19c851e5092 100644
--- a/gcc/testsuite/gfortran.dg/altreturn_6.f90
+++ b/gcc/testsuite/gfortran.dg/altreturn_6.f90
@@ -1,3 +1,6 @@
+! { dg-do compile }
+! { dg-options "-std=legacy" }
+!
 ! PR 32938
 subroutine r (*)
   integer(kind=8) :: i
diff --git a/gcc/testsuite/gfortran.dg/altreturn_7.f90 b/gcc/testsuite/gfortran.dg/altreturn_7.f90
index 6eb0c78bde7..d1786d038c8 100644
--- a/gcc/testsuite/gfortran.dg/altreturn_7.f90
+++ b/gcc/testsuite/gfortran.dg/altreturn_7.f90
@@ -1,4 +1,5 @@
 ! { dg-do compile }
+! { dg-options "-std=legacy" }
 !
 ! PR 40848: [4.5 Regression] ICE with alternate returns
 !
diff --git a/gcc/testsuite/gfortran.dg/array_constructor_13.f90 b/gcc/testsuite/gfortran.dg/array_constructor_13.f90
index bacc6fffc38..74f3d497a75 100644
--- a/gcc/testsuite/gfortran.dg/array_constructor_13.f90
+++ b/gcc/testsuite/gfortran.dg/array_constructor_13.f90
@@ -1,4 +1,6 @@
 ! { dg-do compile }
+! { dg-options "-std=legacy" }
+!
 ! Tests patch for PR29431, which arose from PR29373.
 !
 ! Contributed by Tobias Schlueter  <tobi@gcc.gnu.org>
diff --git a/gcc/testsuite/gfortran.dg/arrayio_7.f90 b/gcc/testsuite/gfortran.dg/arrayio_7.f90
index 69581763a64..68d1fbf97e6 100644
--- a/gcc/testsuite/gfortran.dg/arrayio_7.f90
+++ b/gcc/testsuite/gfortran.dg/arrayio_7.f90
@@ -1,4 +1,6 @@
 ! { dg-do run }
+! { dg-options "-std=legacy" }
+!
 ! PR24224 Test formatted input/output to/from character arrays with strides
 ! other than 1.  Test that reading stops at the end of the current record.
 ! Contributed by Jerry DeLisle <jvdelisle@verizon.net>.
diff --git a/gcc/testsuite/gfortran.dg/arrayio_8.f90 b/gcc/testsuite/gfortran.dg/arrayio_8.f90
index 9dc81f82da1..7b609bd061c 100644
--- a/gcc/testsuite/gfortran.dg/arrayio_8.f90
+++ b/gcc/testsuite/gfortran.dg/arrayio_8.f90
@@ -1,4 +1,6 @@
 ! { dg-do run }
+! { dg-options "-std=legacy" }
+!
 ! PR28339, This test checks that internal unit array I/O handles a full record
 ! and advances to the next record properly.  Test case derived from PR
 ! Submitted by Jerry DeLisle  <jvdelisle@gcc.gnu.org>
diff --git a/gcc/testsuite/gfortran.dg/assumed_charlen_function_3.f90 b/gcc/testsuite/gfortran.dg/assumed_charlen_function_3.f90
index 09c9be97c03..912126fe72a 100644
--- a/gcc/testsuite/gfortran.dg/assumed_charlen_function_3.f90
+++ b/gcc/testsuite/gfortran.dg/assumed_charlen_function_3.f90
@@ -5,13 +5,13 @@
 !

 ! Contributed by Paul Thomas  <pault@gcc.gnu.org>

 !

-function is_OK (ch)                ! { dg-warning "is obsolescent in fortran 95" }

+function is_OK (ch)                ! { dg-warning "Obsolescent feature" }

   character(*) is_OK, ch           ! OK in an external function

   is_OK = ch

 end function is_OK

 

 ! The warning occurs twice for the next line; for 'more_OK' and for 'fcn';

-function more_OK (ch, fcn)         ! { dg-warning "is obsolescent in fortran 95" }

+function more_OK (ch, fcn)         ! { dg-warning "Obsolescent feature" }

   character(*) more_OK, ch

   character (*), external :: fcn   ! OK as a dummy argument

   more_OK = fcn (ch)

diff --git a/gcc/testsuite/gfortran.dg/assumed_charlen_function_4.f90 b/gcc/testsuite/gfortran.dg/assumed_charlen_function_4.f90
index 9c96ba4d69f..c8f804465b7 100644
--- a/gcc/testsuite/gfortran.dg/assumed_charlen_function_4.f90
+++ b/gcc/testsuite/gfortran.dg/assumed_charlen_function_4.f90
@@ -1,4 +1,6 @@
 ! { dg-do compile }
+! { dg-options "-std=legacy" }
+!
 ! Tests the fix for PR28600 in which the declaration for the
 ! character length n, would be given the DECL_CONTEXT of 'gee'
 ! thus causing an ICE.
diff --git a/gcc/testsuite/gfortran.dg/assumed_charlen_function_5.f90 b/gcc/testsuite/gfortran.dg/assumed_charlen_function_5.f90
index cc7e0108db9..8a0788978af 100644
--- a/gcc/testsuite/gfortran.dg/assumed_charlen_function_5.f90
+++ b/gcc/testsuite/gfortran.dg/assumed_charlen_function_5.f90
@@ -5,14 +5,14 @@
 !
 ! Contributed by Paul Thomas  <pault@gcc.gnu.org>
 !
-character(*) function charrext (n)  ! { dg-warning "is obsolescent in fortran 95" }
+character(*) function charrext (n)  ! { dg-warning "Obsolescent feature" }
   character(26) :: alpha ="abcdefghijklmnopqrstuvwxyz"
   charrext = alpha (1:n)
 end function charrext
 
   character(26), external :: charrext
   interface
-    integer(4) function test(charr, i)  ! { dg-warning "is obsolescent in fortran 95" }
+    integer(4) function test(charr, i)  ! { dg-warning "Obsolescent feature" }
      character(*), external :: charr
      integer :: i
     end function test
@@ -23,7 +23,7 @@ end function charrext
     m = ctest (charrext, 27 - j)
   end do
 contains
-  integer(4) function ctest(charr, i)  ! { dg-warning "is obsolescent in fortran 95" }
+  integer(4) function ctest(charr, i)  ! { dg-warning "Obsolescent feature" }
     character(*) :: charr
     integer :: i
     print *, charr(i)
@@ -31,7 +31,7 @@ contains
   end function ctest
 end
 
-integer(4) function test(charr, i)  ! { dg-warning "is obsolescent in fortran 95" }
+integer(4) function test(charr, i)  ! { dg-warning "Obsolescent feature" }
   character(*) :: charr
   integer :: i
   print *, charr(i)
diff --git a/gcc/testsuite/gfortran.dg/backspace_8.f b/gcc/testsuite/gfortran.dg/backspace_8.f
index 8c8c96aacec..2dd6b72e9d9 100644
--- a/gcc/testsuite/gfortran.dg/backspace_8.f
+++ b/gcc/testsuite/gfortran.dg/backspace_8.f
@@ -1,4 +1,6 @@
 C { dg-do run }
+C { dg-options "-std=legacy" }
+C
 C PR libfortran/31618 - backspace after an error didn't work.
       program main
       character*78 msg
diff --git a/gcc/testsuite/gfortran.dg/backspace_9.f b/gcc/testsuite/gfortran.dg/backspace_9.f
index fe62ea5a6e0..851f518a2a9 100644
--- a/gcc/testsuite/gfortran.dg/backspace_9.f
+++ b/gcc/testsuite/gfortran.dg/backspace_9.f
@@ -1,4 +1,6 @@
 ! { dg-do run }
+! { dg-options "-std=legacy" }
+!
 ! PR32235 incorrectly position text file after backspace
 ! Test case from PR, prepared by Jerry DeLisle  <jvdelisle@gcc.gnu.org>
       program main
diff --git a/gcc/testsuite/gfortran.dg/char_comparison_1.f b/gcc/testsuite/gfortran.dg/char_comparison_1.f
index 9a316b74f7d..02f69e07661 100644
--- a/gcc/testsuite/gfortran.dg/char_comparison_1.f
+++ b/gcc/testsuite/gfortran.dg/char_comparison_1.f
@@ -1,4 +1,6 @@
 C { dg-do run }
+C { dg-options "-std=legacy" }
+C
 C     PR 30525 - comparisons with padded spaces were done
 C     signed.
       program main
diff --git a/gcc/testsuite/gfortran.dg/char_decl_1.f90 b/gcc/testsuite/gfortran.dg/char_decl_1.f90
index 7ce6974f688..3bef08342ee 100644
--- a/gcc/testsuite/gfortran.dg/char_decl_1.f90
+++ b/gcc/testsuite/gfortran.dg/char_decl_1.f90
@@ -1,4 +1,6 @@
 ! { dg-do compile }
+! { dg-options "-std=legacy" }
+!
 ! PR32644 "CHARACTER*1, c" produces "Unclassifiable statement"
 program f
 character*1, c
diff --git a/gcc/testsuite/gfortran.dg/char_initialiser_actual.f90 b/gcc/testsuite/gfortran.dg/char_initialiser_actual.f90
index 920e1066014..d123aca136d 100644
--- a/gcc/testsuite/gfortran.dg/char_initialiser_actual.f90
+++ b/gcc/testsuite/gfortran.dg/char_initialiser_actual.f90
@@ -1,4 +1,6 @@
 ! { dg-do run }
+! { dg-options "-std=legacy" }
+!
 ! Tests passing of character array initialiser as actual argument.
 ! Fixes PR18109.
 ! Contributed by Paul Thomas pault@gcc.gnu.org  
diff --git a/gcc/testsuite/gfortran.dg/char_pointer_assign.f90 b/gcc/testsuite/gfortran.dg/char_pointer_assign.f90
index ee3da524528..62fcf0360a3 100644
--- a/gcc/testsuite/gfortran.dg/char_pointer_assign.f90
+++ b/gcc/testsuite/gfortran.dg/char_pointer_assign.f90
@@ -1,4 +1,6 @@
 ! { dg-do run }
+! { dg-options "-std=legacy" }
+!
 program char_pointer_assign

 ! Test character pointer assignments, required

 ! to fix PR18890 and PR21297

@@ -38,4 +40,5 @@ program char_pointer_assign
   if (any (t2 /= "lnmo")) call abort ()

   if (any (c2 /= "onml")) call abort ()

   deallocate (c3, c4)

-end program char_pointer_assign
\ No newline at end of file
+end program char_pointer_assign
+
diff --git a/gcc/testsuite/gfortran.dg/char_pointer_dependency.f90 b/gcc/testsuite/gfortran.dg/char_pointer_dependency.f90
index 94976cbb33c..ef2d783e1ff 100644
--- a/gcc/testsuite/gfortran.dg/char_pointer_dependency.f90
+++ b/gcc/testsuite/gfortran.dg/char_pointer_dependency.f90
@@ -1,4 +1,6 @@
 ! { dg-do run }
+! { dg-options "-std=legacy" }
+!
 ! Test assignments from character pointer functions with dependencies
 ! are correctly resolved.
 ! Provided by Paul Thomas pault@gcc.gnu.org
diff --git a/gcc/testsuite/gfortran.dg/char_pointer_dummy.f90 b/gcc/testsuite/gfortran.dg/char_pointer_dummy.f90
index 1935de51113..b533a1cb98c 100644
--- a/gcc/testsuite/gfortran.dg/char_pointer_dummy.f90
+++ b/gcc/testsuite/gfortran.dg/char_pointer_dummy.f90
@@ -1,4 +1,6 @@
 ! { dg-do run }
+! { dg-options "-std=legacy" }
+!
 program char_pointer_dummy

 ! Test character pointer dummy arguments, required

 ! to fix PR16939 and PR18689

@@ -30,4 +32,5 @@ contains
     character*4, pointer       :: ac1(:)

     if (ac1(1) /= "wxyz") call abort ()

   end subroutine afoo

-end program char_pointer_dummy
\ No newline at end of file
+end program char_pointer_dummy
+
diff --git a/gcc/testsuite/gfortran.dg/char_pointer_func.f90 b/gcc/testsuite/gfortran.dg/char_pointer_func.f90
index ddca76f40b2..23f867eeb45 100644
--- a/gcc/testsuite/gfortran.dg/char_pointer_func.f90
+++ b/gcc/testsuite/gfortran.dg/char_pointer_func.f90
@@ -1,4 +1,6 @@
 ! { dg-do run }
+! { dg-options "-std=legacy" }
+!
 program char_pointer_func
 ! Test assignments from character pointer functions, required
 ! to fix PR17192 and PR17202
diff --git a/gcc/testsuite/gfortran.dg/common_8.f90 b/gcc/testsuite/gfortran.dg/common_8.f90
index 5d08fcdee22..ada4408f5d6 100644
--- a/gcc/testsuite/gfortran.dg/common_8.f90
+++ b/gcc/testsuite/gfortran.dg/common_8.f90
@@ -1,4 +1,5 @@
 ! { dg-do compile }
+! { dg-options "-std=legacy" }
 !
 ! PR fortran/25062
 !
diff --git a/gcc/testsuite/gfortran.dg/constant_substring.f b/gcc/testsuite/gfortran.dg/constant_substring.f
index c3aff4848e1..4ca11bc160a 100644
--- a/gcc/testsuite/gfortran.dg/constant_substring.f
+++ b/gcc/testsuite/gfortran.dg/constant_substring.f
@@ -1,5 +1,7 @@
 ! Simplify constant substring
 ! { dg-do run }
+! { dg-options "-std=legacy" }
+!
       character*2 a
       character*4 b
       character*6 c
diff --git a/gcc/testsuite/gfortran.dg/data_char_2.f90 b/gcc/testsuite/gfortran.dg/data_char_2.f90
index 3e021b165f7..26e31a14f08 100644
--- a/gcc/testsuite/gfortran.dg/data_char_2.f90
+++ b/gcc/testsuite/gfortran.dg/data_char_2.f90
@@ -1,4 +1,6 @@
 ! { dg-do run }
+! { dg-options "-std=legacy" }
+!
 !  Test that getting a character from a
 ! string data works.
 
diff --git a/gcc/testsuite/gfortran.dg/der_array_io_1.f90 b/gcc/testsuite/gfortran.dg/der_array_io_1.f90
index b43864d6e14..244b600746c 100644
--- a/gcc/testsuite/gfortran.dg/der_array_io_1.f90
+++ b/gcc/testsuite/gfortran.dg/der_array_io_1.f90
@@ -1,5 +1,7 @@
 ! Test IO of arrays of integers in derived types
 ! { dg-do run }
+! { dg-options "-std=legacy" }
+!
 program main
 
   character* 10000 :: buf1, buf2
diff --git a/gcc/testsuite/gfortran.dg/der_array_io_2.f90 b/gcc/testsuite/gfortran.dg/der_array_io_2.f90
index c62fd1eb1a0..21e10d21306 100644
--- a/gcc/testsuite/gfortran.dg/der_array_io_2.f90
+++ b/gcc/testsuite/gfortran.dg/der_array_io_2.f90
@@ -1,5 +1,7 @@
 ! Test IO of arrays in derived type arrays
 ! { dg-do run }
+! { dg-options "-std=legacy" }
+!
 program main
 
   character *1000 buf1, buf2
diff --git a/gcc/testsuite/gfortran.dg/der_array_io_3.f90 b/gcc/testsuite/gfortran.dg/der_array_io_3.f90
index ae89b3dce78..de562152c49 100644
--- a/gcc/testsuite/gfortran.dg/der_array_io_3.f90
+++ b/gcc/testsuite/gfortran.dg/der_array_io_3.f90
@@ -1,5 +1,7 @@
 ! Test IO of character arrays in derived types.
 ! { dg-do run }
+! { dg-options "-std=legacy" }
+!
 program main
  character*1000 buf1, buf2
  type :: foo_type
diff --git a/gcc/testsuite/gfortran.dg/der_io_3.f90 b/gcc/testsuite/gfortran.dg/der_io_3.f90
index 01066cf56e4..1cb370ce17c 100644
--- a/gcc/testsuite/gfortran.dg/der_io_3.f90
+++ b/gcc/testsuite/gfortran.dg/der_io_3.f90
@@ -1,3 +1,6 @@
+! { dg-do compile }
+! { dg-options "-std=legacy" }
+!
 ! PR23843
 ! Make sure derived type I/O with PRIVATE components works where it's allowed
 module m1
diff --git a/gcc/testsuite/gfortran.dg/dev_null.F90 b/gcc/testsuite/gfortran.dg/dev_null.F90
index 2385e19ee6c..b8ba5748593 100644
--- a/gcc/testsuite/gfortran.dg/dev_null.F90
+++ b/gcc/testsuite/gfortran.dg/dev_null.F90
@@ -1,4 +1,6 @@
 ! { dg-do run }
+! { dg-options "-std=legacy" }
+!
 ! pr19478 read from /dev/null
 ! Thomas.Koenig@online.de
 #if defined  _WIN32
diff --git a/gcc/testsuite/gfortran.dg/direct_io_2.f90 b/gcc/testsuite/gfortran.dg/direct_io_2.f90
index cc20f96eedd..8e18052ff01 100644
--- a/gcc/testsuite/gfortran.dg/direct_io_2.f90
+++ b/gcc/testsuite/gfortran.dg/direct_io_2.f90
@@ -1,4 +1,5 @@
 ! { dg-do run }
+! { dg-options "-std=legacy" }
 !
 ! this testcase derived from NIST test FM413.FOR
 ! tests writing direct access files in ascending and descending
diff --git a/gcc/testsuite/gfortran.dg/do_iterator_2.f90 b/gcc/testsuite/gfortran.dg/do_iterator_2.f90
index 38f59b5e034..7422b9eb575 100644
--- a/gcc/testsuite/gfortran.dg/do_iterator_2.f90
+++ b/gcc/testsuite/gfortran.dg/do_iterator_2.f90
@@ -1,4 +1,6 @@
 ! { dg-do run }
+! { dg-options "-std=legacy" }
+!
 ! Tests the fix for pr32613 - see:
 ! http://groups.google.com/group/comp.lang.fortran/browse_thread/thread/495c154ee188d7f1/ea292134fe68b1d0#ea292134fe68b1d0
 !
diff --git a/gcc/testsuite/gfortran.dg/e_d_fmt.f90 b/gcc/testsuite/gfortran.dg/e_d_fmt.f90
index d463d89d6f1..f2a3a5fc553 100644
--- a/gcc/testsuite/gfortran.dg/e_d_fmt.f90
+++ b/gcc/testsuite/gfortran.dg/e_d_fmt.f90
@@ -1,4 +1,6 @@
 ! { dg-do run }
+! { dg-options "-std=legacy" }
+!
 ! Verify that the D format uses 'D' as the exponent character.
 !   "     "    "  E   "     "   'E' "   "     "         " 
 CHARACTER*10 c1, c2
diff --git a/gcc/testsuite/gfortran.dg/empty_format_1.f90 b/gcc/testsuite/gfortran.dg/empty_format_1.f90
index 79a2d0c17d7..ad60afa3f47 100644
--- a/gcc/testsuite/gfortran.dg/empty_format_1.f90
+++ b/gcc/testsuite/gfortran.dg/empty_format_1.f90
@@ -1,4 +1,6 @@
 ! { dg-do run }
+! { dg-options "-std=legacy" }
+!
 ! PR 17709
 ! We weren't resetting the internal EOR flag correctly, so the second read
 ! wasn't advancing to the next line.
diff --git a/gcc/testsuite/gfortran.dg/entry_17.f90 b/gcc/testsuite/gfortran.dg/entry_17.f90
index d466266cec3..22aabb3a88f 100644
--- a/gcc/testsuite/gfortran.dg/entry_17.f90
+++ b/gcc/testsuite/gfortran.dg/entry_17.f90
@@ -17,19 +17,19 @@ entry bar2()
   bar2 = ""
 end function test2
 
-function test3() ! { dg-warning "is obsolescent" }
+function test3() ! { dg-warning "Obsolescent feature" }
   character(*) :: test3
-  character(*) :: bar3 ! { dg-warning "is obsolescent" }
+  character(*) :: bar3 ! { dg-warning "Obsolescent feature" }
   test3 = ""
   return
 entry bar3()
   bar3 = ""
-end function test3 ! { dg-warning "is obsolescent" }
+end function test3 ! { dg-warning "Obsolescent feature" }
 
 function test4(n) ! { dg-error "returning variables of different string lengths" }
   integer  :: n
   character(n) :: test4
-  character(*) :: bar4 ! { dg-warning "is obsolescent" }
+  character(*) :: bar4 ! { dg-warning "Obsolescent feature" }
   test4 = ""
   return
 entry bar4()
@@ -45,11 +45,11 @@ entry bar5()
   bar5 = ""
 end function test5
 
-function test6() ! { dg-warning "is obsolescent|returning variables of different string lengths" }
+function test6() ! { dg-warning "Obsolescent feature|returning variables of different string lengths" }
   character(*) :: test6
   character(2) :: bar6
   test6 = ""
   return
 entry bar6()
   bar6 = ""
-end function test6 ! { dg-warning "is obsolescent" }
+end function test6 ! { dg-warning "Obsolescent feature" }
diff --git a/gcc/testsuite/gfortran.dg/entry_7.f90 b/gcc/testsuite/gfortran.dg/entry_7.f90
index 52940984551..b011fe63bfd 100644
--- a/gcc/testsuite/gfortran.dg/entry_7.f90
+++ b/gcc/testsuite/gfortran.dg/entry_7.f90
@@ -1,4 +1,6 @@
 ! { dg-do compile }
+! { dg-options "-std=legacy" }
+!
 ! Check that PR20877 and PR25047 are fixed by the patch for
 ! PR24558. Both modules would emit the error:
 ! insert_bbt(): Duplicate key found!
diff --git a/gcc/testsuite/gfortran.dg/eor_1.f90 b/gcc/testsuite/gfortran.dg/eor_1.f90
index dd3b5e98f70..cd0004bb2a7 100644
--- a/gcc/testsuite/gfortran.dg/eor_1.f90
+++ b/gcc/testsuite/gfortran.dg/eor_1.f90
@@ -1,4 +1,6 @@
 ! { dg-do run }
+! { dg-options "-std=legacy" }
+!
 ! PR 19451: The test for advance='NO' with eor used to be reversed.
 program main
   character*2 c
diff --git a/gcc/testsuite/gfortran.dg/equiv_2.f90 b/gcc/testsuite/gfortran.dg/equiv_2.f90
index 8bc7fb14ac7..ee671f964fd 100644
--- a/gcc/testsuite/gfortran.dg/equiv_2.f90
+++ b/gcc/testsuite/gfortran.dg/equiv_2.f90
@@ -1,3 +1,6 @@
+! { dg-do compile }
+! { dg-options "-std=legacy" }
+!
       subroutine broken_equiv1
       character*4 h
       character*3 i
diff --git a/gcc/testsuite/gfortran.dg/equiv_constraint_2.f90 b/gcc/testsuite/gfortran.dg/equiv_constraint_2.f90
index d721f967137..8a4e0b5ff85 100644
--- a/gcc/testsuite/gfortran.dg/equiv_constraint_2.f90
+++ b/gcc/testsuite/gfortran.dg/equiv_constraint_2.f90
@@ -30,8 +30,8 @@
 
   type       :: char_type
     sequence
-    character*4 :: ch
-    character*4 :: cha (6)
+    character(4) :: ch
+    character(4) :: cha (6)
   end type char_type
 
   type (char_type) ::  my_char
@@ -39,7 +39,7 @@
   type       :: mixed_type
     sequence
     integer     :: i(4)
-    character*4 :: cha (6)
+    character(4) :: cha (6)
   end type mixed_type
 
   type (mixed_type) ::  my_mixed, thy_mixed
diff --git a/gcc/testsuite/gfortran.dg/equiv_substr.f90 b/gcc/testsuite/gfortran.dg/equiv_substr.f90
index cd186cf0015..bad3a3a20e8 100644
--- a/gcc/testsuite/gfortran.dg/equiv_substr.f90
+++ b/gcc/testsuite/gfortran.dg/equiv_substr.f90
@@ -1,4 +1,5 @@
 ! { dg-do compile }
+! { dg-options "-std=legacy" }
 !
 ! PR fortran/34557
 !
diff --git a/gcc/testsuite/gfortran.dg/extended_char_comparison_1.f b/gcc/testsuite/gfortran.dg/extended_char_comparison_1.f
index 311567dceb0..b3d7c045620 100644
--- a/gcc/testsuite/gfortran.dg/extended_char_comparison_1.f
+++ b/gcc/testsuite/gfortran.dg/extended_char_comparison_1.f
@@ -1,4 +1,6 @@
 ! { dg-do run }
+! { dg-options "-std=legacy" }
+!
 ! PR 27715 - the front end and the library used to have different ideas
 ! about ordering for characters whose encoding is above 127.
 
diff --git a/gcc/testsuite/gfortran.dg/fmt_bz_bn_err.f b/gcc/testsuite/gfortran.dg/fmt_bz_bn_err.f
index 36881f85dc7..579ab26f4d9 100644
--- a/gcc/testsuite/gfortran.dg/fmt_bz_bn_err.f
+++ b/gcc/testsuite/gfortran.dg/fmt_bz_bn_err.f
@@ -1,4 +1,6 @@
 ! { dg-do run }
+! { dg-options "-std=legacy" }
+!
 ! PR38772 r143102 reveals missed error checking on floating point reads.
 ! Test case contributed by Jack Howarth.
       program badread
diff --git a/gcc/testsuite/gfortran.dg/fmt_error_2.f90 b/gcc/testsuite/gfortran.dg/fmt_error_2.f90
index 8fdaf9e3f21..ae818da7f04 100644
--- a/gcc/testsuite/gfortran.dg/fmt_error_2.f90
+++ b/gcc/testsuite/gfortran.dg/fmt_error_2.f90
@@ -1,4 +1,6 @@
 ! { dg-do compile }
+! { dg-options "-std=legacy" }
+!
 ! PR 33269: we used to not simplify format strings before checking if
 ! they were valid, leading to a missed error.
 
diff --git a/gcc/testsuite/gfortran.dg/fmt_read_bz_bn.f90 b/gcc/testsuite/gfortran.dg/fmt_read_bz_bn.f90
index d0d01937ea2..5eea29a6c14 100644
--- a/gcc/testsuite/gfortran.dg/fmt_read_bz_bn.f90
+++ b/gcc/testsuite/gfortran.dg/fmt_read_bz_bn.f90
@@ -1,4 +1,6 @@
 ! { dg-do run }
+! { dg-options "-std=legacy" }
+!
 ! Test various uses of BZ and BN format specifiers.
 ! Portions inspired by NIST F77 testsuite FM711.f
 ! Contributed by jvdelisle@verizon.net
diff --git a/gcc/testsuite/gfortran.dg/fmt_tl.f b/gcc/testsuite/gfortran.dg/fmt_tl.f
index d79146ff02f..656499ed05e 100644
--- a/gcc/testsuite/gfortran.dg/fmt_tl.f
+++ b/gcc/testsuite/gfortran.dg/fmt_tl.f
@@ -1,4 +1,6 @@
 ! { dg-do run }
+! { dg-options "-std=legacy" }
+!
 ! PR25631 Check that TL editing works for special case of no bytes written yet.
 ! Contributed by Jerry DeLisle  <jvdelisle@gcc.gnu.org>
       real x
diff --git a/gcc/testsuite/gfortran.dg/fmt_white.f b/gcc/testsuite/gfortran.dg/fmt_white.f
index bcd056f7fb9..6921a722f6a 100644
--- a/gcc/testsuite/gfortran.dg/fmt_white.f
+++ b/gcc/testsuite/gfortran.dg/fmt_white.f
@@ -1,4 +1,6 @@
 ! { dg-do run }
+! { dg-options "-std=legacy" }
+!
 ! PR24268 Test case derived from example given by Iwan Kawrakow
 ! Embedded spaces in format strings should be ignored.
 ! Prepared by Jerry DeLisle  <jvdelisle@gcc.gnu.org>
diff --git a/gcc/testsuite/gfortran.dg/func_derived_1.f90 b/gcc/testsuite/gfortran.dg/func_derived_1.f90
index 496d2905c39..2cf8e449c7e 100644
--- a/gcc/testsuite/gfortran.dg/func_derived_1.f90
+++ b/gcc/testsuite/gfortran.dg/func_derived_1.f90
@@ -1,4 +1,6 @@
 ! { dg-do run }
+! { dg-options "-std=legacy" }
+!
 ! PR 17244
 ! verifies that functions returning derived type work
 module m
diff --git a/gcc/testsuite/gfortran.dg/g77/1832.f b/gcc/testsuite/gfortran.dg/g77/1832.f
index 1d2ad92add4..6b7617d62e0 100644
--- a/gcc/testsuite/gfortran.dg/g77/1832.f
+++ b/gcc/testsuite/gfortran.dg/g77/1832.f
@@ -1,4 +1,6 @@
 c { dg-do run }
+! { dg-options "-std=legacy" }
+!
       character*5   string
       write(string, *) "a "
       if (string .ne. ' a') call abort
diff --git a/gcc/testsuite/gfortran.dg/g77/19981216-0.f b/gcc/testsuite/gfortran.dg/g77/19981216-0.f
index 1e5db3c3b5c..82d259d3cb5 100644
--- a/gcc/testsuite/gfortran.dg/g77/19981216-0.f
+++ b/gcc/testsuite/gfortran.dg/g77/19981216-0.f
@@ -1,4 +1,6 @@
 c { dg-do compile }
+c { dg-options "-std=legacy" }
+c
 * Resent-From: Craig Burley <burley@gnu.org>
 * Resent-To: craig@jcb-sc.com
 * X-Delivered: at request of burley on mescaline.gnu.org
diff --git a/gcc/testsuite/gfortran.dg/g77/19990525-0.f b/gcc/testsuite/gfortran.dg/g77/19990525-0.f
index 589fb8ebfd1..4eb104cdbe2 100644
--- a/gcc/testsuite/gfortran.dg/g77/19990525-0.f
+++ b/gcc/testsuite/gfortran.dg/g77/19990525-0.f
@@ -1,4 +1,6 @@
 c { dg-do compile }
+c { dg-options "-std=legacy" }
+c
 * Mailing-List: contact egcs-bugs-help@egcs.cygnus.com; run by ezmlm
 * Precedence: bulk
 * Sender: owner-egcs-bugs@egcs.cygnus.com
diff --git a/gcc/testsuite/gfortran.dg/g77/19990826-2.f b/gcc/testsuite/gfortran.dg/g77/19990826-2.f
index b8384f8d25a..8870c2588d4 100644
--- a/gcc/testsuite/gfortran.dg/g77/19990826-2.f
+++ b/gcc/testsuite/gfortran.dg/g77/19990826-2.f
@@ -1,4 +1,6 @@
 c { dg-do run }
+c { dg-options "-std=legacy" }
+c
 * From: "Billinghurst, David (RTD)" <David.Billinghurst@riotinto.com.au>
 * Subject: RE: single precision complex bug in g77 - was Testing g77 with LA
 * PACK 3.0
diff --git a/gcc/testsuite/gfortran.dg/g77/20000630-2.f b/gcc/testsuite/gfortran.dg/g77/20000630-2.f
index b2776bf6bed..4948c49e494 100644
--- a/gcc/testsuite/gfortran.dg/g77/20000630-2.f
+++ b/gcc/testsuite/gfortran.dg/g77/20000630-2.f
@@ -1,4 +1,6 @@
 c { dg-do compile }
+c { dg-options "-std=legacy" }
+c
       SUBROUTINE CHOUT(CHR,ICNT)
 C ICE: failed assertion `expr != NULL'
 C Reduced version of GNATS PR fortran/329 from trond.bo@dnmi.no
diff --git a/gcc/testsuite/gfortran.dg/g77/20010116.f b/gcc/testsuite/gfortran.dg/g77/20010116.f
index dd8ee931297..ca7375d0f68 100644
--- a/gcc/testsuite/gfortran.dg/g77/20010116.f
+++ b/gcc/testsuite/gfortran.dg/g77/20010116.f
@@ -1,4 +1,6 @@
 c { dg-do run }
+c { dg-options "-std=legacy" }
+c
 *
 *  Derived from LAPACK 3.0 routine CHGEQZ
 *  Fails on i686-pc-cygwin with gcc-2.97 snapshots at -O2 and higher
diff --git a/gcc/testsuite/gfortran.dg/g77/20010519-1.f b/gcc/testsuite/gfortran.dg/g77/20010519-1.f
index beead98c7b9..c268bf03eb5 100644
--- a/gcc/testsuite/gfortran.dg/g77/20010519-1.f
+++ b/gcc/testsuite/gfortran.dg/g77/20010519-1.f
@@ -340,10 +340,10 @@ C..##IF ACE
 C..##ENDIF
 C..##IF ADUMB
 C..##ENDIF
-      CHARACTER*4 GTRMA, NEXTA4, CURRA4
-      CHARACTER*6 NEXTA6
-      CHARACTER*8 NEXTA8
-      CHARACTER*20 NEXT20
+      CHARACTER(4) GTRMA, NEXTA4, CURRA4
+      CHARACTER(6) NEXTA6
+      CHARACTER(8) NEXTA8
+      CHARACTER(20) NEXT20
       INTEGER     ALLCHR, ALLSTK, ALLHP, DECODI, FIND52,
      *            GETATN, GETRES, GETRSN, GETSEG, GTRMI, I4VAL,
      *            ICHAR4, ICMP16, ILOGI4, INDX, INDXA, INDXAF,
@@ -390,11 +390,11 @@ C..##ENDIF
 C..##IF MMFF
       INTEGER LEN_TRIM
       EXTERNAL LEN_TRIM
-      CHARACTER*4 AtName
+      CHARACTER(4) AtName
       external AtName
-      CHARACTER*8 ElementName
+      CHARACTER(8) ElementName
       external ElementName
-      CHARACTER*10 QNAME
+      CHARACTER(10) QNAME
       external QNAME
       integer  IATTCH, IBORDR, CONN12, CONN13, CONN14
       integer  LEQUIV, LPATH
@@ -576,7 +576,7 @@ C..##ENDIF
      &            PIXX = 28, PIXY = 29, PIXZ = 30, PIYX = 31,
      &            PIYY = 32, PIYZ = 33, PIZX = 34, PIZY = 35,
      &            PIZZ = 36)
-      CHARACTER*4  CEPROP, CETERM, CEPRSS
+      CHARACTER(4)  CEPROP, CETERM, CEPRSS
       COMMON /ANER/ CEPROP(LENENP), CETERM(LENENT), CEPRSS(LENENV)
       LOGICAL  QEPROP, QETERM, QEPRSS
       COMMON /QENER/ QEPROP(LENENP), QETERM(LENENT), QEPRSS(LENENV)
@@ -653,7 +653,7 @@ C:::##INCLUDE '~/charmm_fcm/ctitla.fcm'
       INTEGER MAXTIT
       PARAMETER (MAXTIT=32)
       INTEGER NTITLA,NTITLB
-      CHARACTER*80 TITLEA,TITLEB
+      CHARACTER(80) TITLEA,TITLEB
       COMMON /NTITLA/ NTITLA,NTITLB
       COMMON /CTITLA/ TITLEA(MAXTIT),TITLEB(MAXTIT)
 C..##IF SAVEFCM
diff --git a/gcc/testsuite/gfortran.dg/g77/980419-2.f b/gcc/testsuite/gfortran.dg/g77/980419-2.f
index defda413eb7..bb02862e30c 100644
--- a/gcc/testsuite/gfortran.dg/g77/980419-2.f
+++ b/gcc/testsuite/gfortran.dg/g77/980419-2.f
@@ -1,4 +1,6 @@
 c { dg-do compile }
+c { dg-options "-std=legacy" }
+c
 c     SEGVs in loop.c with -O2.
 
       character*80 function nxtlin(lun,ierr,itok)
diff --git a/gcc/testsuite/gfortran.dg/g77/980520-1.f b/gcc/testsuite/gfortran.dg/g77/980520-1.f
index edf7241b997..855b9a442d7 100644
--- a/gcc/testsuite/gfortran.dg/g77/980520-1.f
+++ b/gcc/testsuite/gfortran.dg/g77/980520-1.f
@@ -1,4 +1,6 @@
 c { dg-do run }
+c { dg-options "-std=legacy" }
+c
 c     Produced a link error through not eliminating the unused statement
 c     function after 1998-05-15 change to gcc/toplev.c.  It's in
 c     `execute' since it needs to link.
diff --git a/gcc/testsuite/gfortran.dg/g77/check0.f b/gcc/testsuite/gfortran.dg/g77/check0.f
index 3febba9d02a..f0a14f826cf 100644
--- a/gcc/testsuite/gfortran.dg/g77/check0.f
+++ b/gcc/testsuite/gfortran.dg/g77/check0.f
@@ -1,4 +1,6 @@
 c { dg-do compile }
+c { dg-options "-std=legacy" }
+c
 CCC Abort fixed by:
 CCC1998-04-21  Jim Wilson  <wilson@cygnus.com>
 CCC
diff --git a/gcc/testsuite/gfortran.dg/g77/cpp3.F b/gcc/testsuite/gfortran.dg/g77/cpp3.F
index 38387737092..ab25b532945 100644
--- a/gcc/testsuite/gfortran.dg/g77/cpp3.F
+++ b/gcc/testsuite/gfortran.dg/g77/cpp3.F
@@ -1,4 +1,6 @@
 c { dg-do run }
+c { dg-options "-std=legacy" }
+c
 !  Some versions of cpp will delete "//'World' as a C++ comment.
       character*40    title
       title = 'Hello '//'World'
diff --git a/gcc/testsuite/gfortran.dg/g77/cpp4.F b/gcc/testsuite/gfortran.dg/g77/cpp4.F
index 0dd5c99edc2..bc14e0469ea 100644
--- a/gcc/testsuite/gfortran.dg/g77/cpp4.F
+++ b/gcc/testsuite/gfortran.dg/g77/cpp4.F
@@ -1,8 +1,8 @@
-      ! { dg-do run }
+c { dg-do run }
 C The preprocessor must not mangle Hollerith constants
 C which contain apostrophes.
       integer i
-      character*4 j
+      character(4) j
       data i /4hbla'/
       write (j, '(4a)') i
       if (j .ne. "bla'") call abort
diff --git a/gcc/testsuite/gfortran.dg/g77/f77-edit-i-in.f b/gcc/testsuite/gfortran.dg/g77/f77-edit-i-in.f
index 49eb41608bb..0369b79db33 100644
--- a/gcc/testsuite/gfortran.dg/g77/f77-edit-i-in.f
+++ b/gcc/testsuite/gfortran.dg/g77/f77-edit-i-in.f
@@ -4,6 +4,8 @@ C
 C Origin: David Billinghurst <David.Billinghurst@riotinto.com>
 C
 C { dg-do run }
+C { dg-options "-std=legacy" }
+C
 
       integer i,j
       character*10 buf
diff --git a/gcc/testsuite/gfortran.dg/g77/f77-edit-t-in.f b/gcc/testsuite/gfortran.dg/g77/f77-edit-t-in.f
index 2314080d708..524b18e3179 100644
--- a/gcc/testsuite/gfortran.dg/g77/f77-edit-t-in.f
+++ b/gcc/testsuite/gfortran.dg/g77/f77-edit-t-in.f
@@ -4,6 +4,8 @@ C
 C Origin: David Billinghurst <David.Billinghurst@riotinto.com>
 C
 C { dg-do run }
+C { dg-options "-std=legacy" }
+C
       integer i,j
       real a,b,c,d,e
       character*32 in
diff --git a/gcc/testsuite/gfortran.dg/g77/short.f b/gcc/testsuite/gfortran.dg/g77/short.f
index e9a18a1315b..330f0ac52b1 100644
--- a/gcc/testsuite/gfortran.dg/g77/short.f
+++ b/gcc/testsuite/gfortran.dg/g77/short.f
@@ -1,4 +1,6 @@
 c { dg-do run }
+c { dg-options "-std=legacy" }
+c
       program short
 
       parameter   (   N=2  )
diff --git a/gcc/testsuite/gfortran.dg/g77_intrinsics_funcs.f b/gcc/testsuite/gfortran.dg/g77_intrinsics_funcs.f
index 551bd61cd65..f9e0195bcdb 100644
--- a/gcc/testsuite/gfortran.dg/g77_intrinsics_funcs.f
+++ b/gcc/testsuite/gfortran.dg/g77_intrinsics_funcs.f
@@ -1,4 +1,6 @@
 ! { dg-do compile }
+! { dg-options "-std=legacy" }
+!
 ! Testing g77 intrinsics as subroutines
       integer(kind=8) i8
       integer i4
diff --git a/gcc/testsuite/gfortran.dg/g77_intrinsics_sub.f b/gcc/testsuite/gfortran.dg/g77_intrinsics_sub.f
index d1591e04bef..6ee5f837cc4 100644
--- a/gcc/testsuite/gfortran.dg/g77_intrinsics_sub.f
+++ b/gcc/testsuite/gfortran.dg/g77_intrinsics_sub.f
@@ -1,4 +1,6 @@
 ! { dg-do compile }
+! { dg-options "-std=legacy" }
+!
 ! Testing g77 intrinsics as subroutines
       integer(kind=8) i8, j8
       integer i4, j4
diff --git a/gcc/testsuite/gfortran.dg/global_references_2.f90 b/gcc/testsuite/gfortran.dg/global_references_2.f90
index 95666981ac0..bf2528006a0 100644
--- a/gcc/testsuite/gfortran.dg/global_references_2.f90
+++ b/gcc/testsuite/gfortran.dg/global_references_2.f90
@@ -1,4 +1,6 @@
 ! { dg-do compile }
+! { dg-options "-std=legacy" }
+!
 ! This program tests the patch for PR25964. This is a
 ! regression that would not allow a common block and a statement
 ! to share the same name.
@@ -7,4 +9,5 @@
   common /foo/ a, b, c
   foo (x) = x + 1.0
   print *, foo (0.0)
-  end
\ No newline at end of file
+  end
+
diff --git a/gcc/testsuite/gfortran.dg/hollerith.f90 b/gcc/testsuite/gfortran.dg/hollerith.f90
index 21cbf66bdf6..697ed22d892 100644
--- a/gcc/testsuite/gfortran.dg/hollerith.f90
+++ b/gcc/testsuite/gfortran.dg/hollerith.f90
@@ -3,14 +3,14 @@
 implicit none
 complex(kind=8) x(2) 
 complex a(2,2)
-character*4 z
+character(4) z
 character z1(4)
-character*4 z2(2,2)
-character*80 line
+character(4) z2(2,2)
+character(80) line
 integer i
 integer j
 real r
-character*8 c
+character(8) c
 
 data x /16Habcdefghijklmnop, 16Hqrstuvwxyz012345/
 data a /8H(i3),abc, 0, 4H(i4), 8H    (i9)/
@@ -53,7 +53,7 @@ end
 
 subroutine test (h)
 integer(kind=8) h
-character*80 line
+character(80) line
 
 write (line, '(8a)') h
 if (line .ne. '   hello') call abort
diff --git a/gcc/testsuite/gfortran.dg/hollerith_1.f90 b/gcc/testsuite/gfortran.dg/hollerith_1.f90
index d6732d40b69..829ca7f99c2 100644
--- a/gcc/testsuite/gfortran.dg/hollerith_1.f90
+++ b/gcc/testsuite/gfortran.dg/hollerith_1.f90
@@ -1,4 +1,6 @@
 ! { dg-do run }
+! { dg-options "-std=legacy" }
+!
 ! PR 21260
 ! We wrongly interpreted the '!' as the beginning of a comment.
 ! Also verifies the functioning of hollerith formatting.
diff --git a/gcc/testsuite/gfortran.dg/hollerith_f95.f90 b/gcc/testsuite/gfortran.dg/hollerith_f95.f90
index 4d7fda8c72e..dc52187adb9 100644
--- a/gcc/testsuite/gfortran.dg/hollerith_f95.f90
+++ b/gcc/testsuite/gfortran.dg/hollerith_f95.f90
@@ -4,14 +4,14 @@
 implicit none
 complex(kind=8) x(2) 
 complex a(2,2)
-character*4 z
+character(4) z
 character z1(4)
-character*4 z2(2,2)
-character*80 line
+character(4) z2(2,2)
+character(80) line
 integer i
 logical l
 real r
-character*8 c
+character(8) c
 
 data x /16Habcdefghijklmnop, 16Hqrstuvwxyz012345/
 data a /8H(i3),abc, 0, 4H(i4), 8H    (i9)/
@@ -54,7 +54,7 @@ end
 
 subroutine test (h)
 integer(kind=8) h
-character*80 line
+character(80) line
 
 write (line, '(8a)') h
 if (line .ne. '   hello') call abort
diff --git a/gcc/testsuite/gfortran.dg/ichar_1.f90 b/gcc/testsuite/gfortran.dg/ichar_1.f90
index 104c5d166af..362cd2f453b 100644
--- a/gcc/testsuite/gfortran.dg/ichar_1.f90
+++ b/gcc/testsuite/gfortran.dg/ichar_1.f90
@@ -1,4 +1,6 @@
 ! { dg-do compile }
+! { dg-options "-std=legacy" }
+!
 ! PR20879
 ! Check that we reject expressions longer than one character for the
 ! ICHAR and IACHAR intrinsics.
diff --git a/gcc/testsuite/gfortran.dg/implicit_6.f90 b/gcc/testsuite/gfortran.dg/implicit_6.f90
index bb7fe3221ab..a74ecc29ba5 100644
--- a/gcc/testsuite/gfortran.dg/implicit_6.f90
+++ b/gcc/testsuite/gfortran.dg/implicit_6.f90
@@ -1,4 +1,6 @@
 ! { dg-do compile }
+! { dg-options "-std=legacy" }
+!
 ! PR 24643
 ! substring references on implicitly typed CHARACTER variables didn't work
         PROGRAM P
diff --git a/gcc/testsuite/gfortran.dg/implicit_9.f90 b/gcc/testsuite/gfortran.dg/implicit_9.f90
index 335c85bffb1..04b7afa4ed8 100644
--- a/gcc/testsuite/gfortran.dg/implicit_9.f90
+++ b/gcc/testsuite/gfortran.dg/implicit_9.f90
@@ -1,4 +1,6 @@
 ! { dg-do compile }
+! { dg-options "-std=legacy" }
+!
 ! Tests patch for PR29373, in which the implicit character
 ! statement messes up the function declaration because the
 ! requisite functions in decl.c were told nothing about
diff --git a/gcc/testsuite/gfortran.dg/inquire.f90 b/gcc/testsuite/gfortran.dg/inquire.f90
index 9f3b72532af..7115913c6c6 100644
--- a/gcc/testsuite/gfortran.dg/inquire.f90
+++ b/gcc/testsuite/gfortran.dg/inquire.f90
@@ -1,4 +1,6 @@
 ! { dg-do run }
+! { dg-options "-std=legacy" }
+!
 ! check to see that you cannot open a direct access file
 ! for sequential i/o.
 ! derived from NIST test fm910.for
diff --git a/gcc/testsuite/gfortran.dg/inquire_13.f90 b/gcc/testsuite/gfortran.dg/inquire_13.f90
index 366e383327f..d074861a97b 100644
--- a/gcc/testsuite/gfortran.dg/inquire_13.f90
+++ b/gcc/testsuite/gfortran.dg/inquire_13.f90
@@ -1,4 +1,6 @@
 ! { dg-do run }
+! { dg-options "-std=legacy" }
+!
 ! PR34795 inquire statement , direct= specifier incorrectly returns YES
 ! Test case from PR, modified by Jerry DeLisle  <jvdelisle@gcc.gnu.org
 program testinquire
diff --git a/gcc/testsuite/gfortran.dg/inquire_5.f90 b/gcc/testsuite/gfortran.dg/inquire_5.f90
index b2e07be9319..fe107a19863 100644
--- a/gcc/testsuite/gfortran.dg/inquire_5.f90
+++ b/gcc/testsuite/gfortran.dg/inquire_5.f90
@@ -1,4 +1,6 @@
 ! { dg-do run { target fd_truncate } }
+! { dg-options "-std=legacy" }
+!
 ! pr19314 inquire(..position=..) segfaults
 ! test by Thomas.Koenig@online.de
 !         bdavis9659@comcast.net
diff --git a/gcc/testsuite/gfortran.dg/inquire_6.f90 b/gcc/testsuite/gfortran.dg/inquire_6.f90
index 7575b6e67b3..b657df831d9 100644
--- a/gcc/testsuite/gfortran.dg/inquire_6.f90
+++ b/gcc/testsuite/gfortran.dg/inquire_6.f90
@@ -1,4 +1,6 @@
 ! { dg-do run }
+! { dg-options "-std=legacy" }
+!
 !pr19313 - inquire(..pad=..)
       implicit none
 !     logical debug
diff --git a/gcc/testsuite/gfortran.dg/io_constraints_1.f90 b/gcc/testsuite/gfortran.dg/io_constraints_1.f90
index 5f2c776b128..db1e949e7a5 100644
--- a/gcc/testsuite/gfortran.dg/io_constraints_1.f90
+++ b/gcc/testsuite/gfortran.dg/io_constraints_1.f90
@@ -29,7 +29,7 @@ end module global
  use global
  integer :: a,b, c(20)
  integer(8) :: ierr
- character*80 :: buffer(3)
+ character(80) :: buffer(3)
 
 ! Appending to a USE associated namelist is an extension.
 
diff --git a/gcc/testsuite/gfortran.dg/io_constraints_2.f90 b/gcc/testsuite/gfortran.dg/io_constraints_2.f90
index 8bf48d72ff2..8d3ae6b45f4 100644
--- a/gcc/testsuite/gfortran.dg/io_constraints_2.f90
+++ b/gcc/testsuite/gfortran.dg/io_constraints_2.f90
@@ -25,7 +25,7 @@ end module global
  use global
  integer :: a,b, c(20)
  integer(8) :: ierr
- character*80 :: buffer(3)
+ character(80) :: buffer(3)
 
 
 ! Appending to a USE associated namelist is an extension.
diff --git a/gcc/testsuite/gfortran.dg/list_read_2.f90 b/gcc/testsuite/gfortran.dg/list_read_2.f90
index e757f613e44..3e6c233c09a 100644
--- a/gcc/testsuite/gfortran.dg/list_read_2.f90
+++ b/gcc/testsuite/gfortran.dg/list_read_2.f90
@@ -1,4 +1,6 @@
 ! { dg-do run }
+! { dg-options "-std=legacy" }
+!
 ! PR16805
 ! Test list directed reads from character substrings
 ! The IO library was reporting an error rather the end-of-record when it
diff --git a/gcc/testsuite/gfortran.dg/loc_2.f90 b/gcc/testsuite/gfortran.dg/loc_2.f90
index 196dcc6db74..d905fc0f74b 100644
--- a/gcc/testsuite/gfortran.dg/loc_2.f90
+++ b/gcc/testsuite/gfortran.dg/loc_2.f90
@@ -1,4 +1,6 @@
 ! { dg-do run }
+! { dg-options "-std=legacy" }
+!
 ! Series of routines for testing a loc() implementation
 program test
   common /errors/errors(12)
diff --git a/gcc/testsuite/gfortran.dg/logical_1.f90 b/gcc/testsuite/gfortran.dg/logical_1.f90
index 3edc74441b2..69d9e6a437e 100644
--- a/gcc/testsuite/gfortran.dg/logical_1.f90
+++ b/gcc/testsuite/gfortran.dg/logical_1.f90
@@ -1,4 +1,6 @@
 ! { dg-do run }
+! { dg-options "-std=legacy" }
+!
 ! PR middle-end/19543
 program logical_1
   implicit none
diff --git a/gcc/testsuite/gfortran.dg/longline.f b/gcc/testsuite/gfortran.dg/longline.f
index ffd5a4bb2af..c2a5f5afd70 100644
--- a/gcc/testsuite/gfortran.dg/longline.f
+++ b/gcc/testsuite/gfortran.dg/longline.f
@@ -1,5 +1,6 @@
 # 1 "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.f"
 ! { dg-do compile }
+! { dg-options "-std=legacy" }
 
       subroutine foo
       character*10 cpnam
diff --git a/gcc/testsuite/gfortran.dg/merge_char_1.f90 b/gcc/testsuite/gfortran.dg/merge_char_1.f90
index 0a8036d62df..5974e8c06c3 100644
--- a/gcc/testsuite/gfortran.dg/merge_char_1.f90
+++ b/gcc/testsuite/gfortran.dg/merge_char_1.f90
@@ -1,4 +1,6 @@
 ! { dg-do run }
+! { dg-options "-std=legacy" }
+!
 ! PR 15327
 ! The merge intrinsic didn't work for strings
 character*2 :: c(2)
diff --git a/gcc/testsuite/gfortran.dg/namelist_12.f b/gcc/testsuite/gfortran.dg/namelist_12.f
index dca96452e21..1752bfa07df 100644
--- a/gcc/testsuite/gfortran.dg/namelist_12.f
+++ b/gcc/testsuite/gfortran.dg/namelist_12.f
@@ -1,4 +1,6 @@
 c{ dg-do run { target fd_truncate } }
+c{ dg-options "-std=legacy" }
+c
 c This program repeats many of the same tests as test_nml_1 but for integer
 c instead of real. It also tests repeat nulls, comma delimited character read,
 c a triplet qualifier, a range with an assumed start, a quote delimited string,
diff --git a/gcc/testsuite/gfortran.dg/namelist_14.f90 b/gcc/testsuite/gfortran.dg/namelist_14.f90
index 729f1b2d5c4..478e07fe67f 100644
--- a/gcc/testsuite/gfortran.dg/namelist_14.f90
+++ b/gcc/testsuite/gfortran.dg/namelist_14.f90
@@ -1,4 +1,6 @@
 !{ dg-do run }
+!{ dg-options "-std=legacy" }
+!
 ! Tests various combinations of intrinsic types, derived types, arrays,
 ! dummy arguments and common to check nml_get_addr_expr in trans-io.c.
 ! See comments below for selection.
diff --git a/gcc/testsuite/gfortran.dg/namelist_18.f90 b/gcc/testsuite/gfortran.dg/namelist_18.f90
index d54d91f9a05..87b66012d4c 100644
--- a/gcc/testsuite/gfortran.dg/namelist_18.f90
+++ b/gcc/testsuite/gfortran.dg/namelist_18.f90
@@ -1,4 +1,6 @@
 !{ dg-do run }
+!{ dg-options "-std=legacy" }
+!
 ! Tests character delimiters for namelist write 
 ! provided by Paul Thomas - pault@gcc.gnu.org
 
diff --git a/gcc/testsuite/gfortran.dg/namelist_19.f90 b/gcc/testsuite/gfortran.dg/namelist_19.f90
index c06abf5295b..4821033ecd7 100644
--- a/gcc/testsuite/gfortran.dg/namelist_19.f90
+++ b/gcc/testsuite/gfortran.dg/namelist_19.f90
@@ -1,4 +1,6 @@
 !{ dg-do run }
+!{ dg-options "-std=legacy" }
+!
 ! Test namelist error trapping.
 ! provided by Paul Thomas - pault@gcc.gnu.org
 
diff --git a/gcc/testsuite/gfortran.dg/namelist_21.f90 b/gcc/testsuite/gfortran.dg/namelist_21.f90
index 8d2852d2cca..de88200c167 100644
--- a/gcc/testsuite/gfortran.dg/namelist_21.f90
+++ b/gcc/testsuite/gfortran.dg/namelist_21.f90
@@ -1,4 +1,6 @@
 !{ dg-do run { target fd_truncate } }
+!{ dg-options "-std=legacy" }
+!
 ! Tests filling arrays from a namelist read when object list is not complete.
 ! Developed from a test case provided by Christoph Jacob.
 ! Contributed by Jerry DeLisle  <jvdelisle@gcc.gnu.org>.
diff --git a/gcc/testsuite/gfortran.dg/namelist_22.f90 b/gcc/testsuite/gfortran.dg/namelist_22.f90
index 3119e808640..e877b5beeae 100644
--- a/gcc/testsuite/gfortran.dg/namelist_22.f90
+++ b/gcc/testsuite/gfortran.dg/namelist_22.f90
@@ -1,4 +1,6 @@
 !{ dg-do run { target fd_truncate } }
+!{ dg-options "-std=legacy" }
+!
 ! Tests filling arrays from a namelist read when object list is not complete.
 ! This is the same as namelist_21.f90 except using spaces as seperators instead
 ! of commas. Developed from a test case provided by Christoph Jacob.
diff --git a/gcc/testsuite/gfortran.dg/namelist_37.f90 b/gcc/testsuite/gfortran.dg/namelist_37.f90
index 9ff62977710..4a46b534f67 100644
--- a/gcc/testsuite/gfortran.dg/namelist_37.f90
+++ b/gcc/testsuite/gfortran.dg/namelist_37.f90
@@ -1,4 +1,6 @@
 ! { dg-do run }
+! { dg-options "-std=legacy" }
+!
 ! PR33039 Read NAMELIST:  reads wrong namelist name
 ! Test case from PR modified by Jerry DeLisle <jvdelisle@gcc.gnu.org>

 PROGRAM namelist

diff --git a/gcc/testsuite/gfortran.dg/namelist_54.f90 b/gcc/testsuite/gfortran.dg/namelist_54.f90
index 25061c48fc5..01332689340 100644
--- a/gcc/testsuite/gfortran.dg/namelist_54.f90
+++ b/gcc/testsuite/gfortran.dg/namelist_54.f90
@@ -1,4 +1,6 @@
 ! { dg-do run }
+! { dg-options "-std=legacy" }
+!
 ! PR37707 Namelist read of array of derived type incorrect.
 type s
    integer m
diff --git a/gcc/testsuite/gfortran.dg/namelist_55.f90 b/gcc/testsuite/gfortran.dg/namelist_55.f90
index 20c7a219cd6..9690d858d07 100644
--- a/gcc/testsuite/gfortran.dg/namelist_55.f90
+++ b/gcc/testsuite/gfortran.dg/namelist_55.f90
@@ -1,4 +1,6 @@
 ! { dg-do run }
+! { dg-options "-std=legacy" }
+!
 ! PR37707 Namelist read of array of derived type incorrect
 ! Test case from PR, prepared by Jerry DeLisle  <jvdelisle@gcc.gnu.org>
 TYPE geometry
diff --git a/gcc/testsuite/gfortran.dg/namelist_empty.f90 b/gcc/testsuite/gfortran.dg/namelist_empty.f90
index 12e72ae7e4d..89493a84b34 100644
--- a/gcc/testsuite/gfortran.dg/namelist_empty.f90
+++ b/gcc/testsuite/gfortran.dg/namelist_empty.f90
@@ -1,3 +1,6 @@
+! { dg-do compile }
+! { dg-options "-std=legacy" }
+!
 ! pr24584, segfault on namelist reading an empty string
 ! Contributed by Jerry DeLisle  <jvdelisle@verizon.net> 
       implicit none 
diff --git a/gcc/testsuite/gfortran.dg/namelist_use.f90 b/gcc/testsuite/gfortran.dg/namelist_use.f90
index 0460630dd33..d550e00aa6d 100644
--- a/gcc/testsuite/gfortran.dg/namelist_use.f90
+++ b/gcc/testsuite/gfortran.dg/namelist_use.f90
@@ -6,7 +6,7 @@
 ! Contributed by Paul Thomas  pault@gcc.gnu.org
 !
 module global
-  character*4 :: aa
+  character(4) :: aa
   integer :: ii
   real    :: rr
   namelist /nml1/ aa, ii, rr
diff --git a/gcc/testsuite/gfortran.dg/namelist_use_only.f90 b/gcc/testsuite/gfortran.dg/namelist_use_only.f90
index a9adf015ded..d9a28a8567b 100644
--- a/gcc/testsuite/gfortran.dg/namelist_use_only.f90
+++ b/gcc/testsuite/gfortran.dg/namelist_use_only.f90
@@ -1,4 +1,6 @@
 ! { dg-do run }
+! { dg-options "-std=legacy" }
+!
 ! This tests the fix for PR22010, where namelists were not being written to
 ! and read back from modules.  It checks that namelists from modules that are
 ! selected by an ONLY declaration work correctly, even when the variables in
diff --git a/gcc/testsuite/gfortran.dg/nested_modules_4.f90 b/gcc/testsuite/gfortran.dg/nested_modules_4.f90
index dde171c7ed9..6be77b36760 100644
--- a/gcc/testsuite/gfortran.dg/nested_modules_4.f90
+++ b/gcc/testsuite/gfortran.dg/nested_modules_4.f90
@@ -1,4 +1,5 @@
 ! { dg-do compile }
+! { dg-options "-std=legacy" }
 !
 ! Test for the fix to PR24409 - the name clash between the module
 ! name and the interface formal argument would cause an ICE.
diff --git a/gcc/testsuite/gfortran.dg/nested_modules_5.f90 b/gcc/testsuite/gfortran.dg/nested_modules_5.f90
index 86b43fd7b36..2ed68244ede 100644
--- a/gcc/testsuite/gfortran.dg/nested_modules_5.f90
+++ b/gcc/testsuite/gfortran.dg/nested_modules_5.f90
@@ -1,4 +1,5 @@
 ! { dg-do compile }
+! { dg-options "-std=legacy" }
 !
 ! Test for supplementary fix to PR24409 - the name clash between the module
 ! variable and the interface formal argument would cause an ICE.
diff --git a/gcc/testsuite/gfortran.dg/open-options-blanks.f b/gcc/testsuite/gfortran.dg/open-options-blanks.f
index 8f5faa41629..4db31b9e31a 100644
--- a/gcc/testsuite/gfortran.dg/open-options-blanks.f
+++ b/gcc/testsuite/gfortran.dg/open-options-blanks.f
@@ -1,4 +1,6 @@
 ! { dg-do run }
+! { dg-options "-std=legacy" }
+!
 ! PR 20163, first half:  Trailing blanks on an option to
 !                        open used to cause an error
       CHARACTER*8 ST
diff --git a/gcc/testsuite/gfortran.dg/output_exponents_1.f90 b/gcc/testsuite/gfortran.dg/output_exponents_1.f90
index b645e6231a3..db47b0bfc62 100644
--- a/gcc/testsuite/gfortran.dg/output_exponents_1.f90
+++ b/gcc/testsuite/gfortran.dg/output_exponents_1.f90
@@ -1,4 +1,6 @@
 ! { dg-do run }
+! { dg-options "-std=legacy" }
+!
 ! PR 21376
 ! we used to take the logarithm of zero in this special case
   character*10 c
diff --git a/gcc/testsuite/gfortran.dg/parens_5.f90 b/gcc/testsuite/gfortran.dg/parens_5.f90
index a6e64b4112a..ac631ef08af 100644
--- a/gcc/testsuite/gfortran.dg/parens_5.f90
+++ b/gcc/testsuite/gfortran.dg/parens_5.f90
@@ -1,4 +1,6 @@
 ! { dg-do run }
+! { dg-options "-std=legacy" }
+!
 ! Another case of fallout from the original patch for PR14771
 ! Testcase by Erik Zeek
 module para
diff --git a/gcc/testsuite/gfortran.dg/parens_6.f90 b/gcc/testsuite/gfortran.dg/parens_6.f90
index 5a888a60056..6d5ee3b520f 100644
--- a/gcc/testsuite/gfortran.dg/parens_6.f90
+++ b/gcc/testsuite/gfortran.dg/parens_6.f90
@@ -1,4 +1,6 @@
 ! { dg-do run }
+! { dg-options "-std=legacy" }
+!
 ! PR fortran/33626
 ! Types were not always propagated correctly
   logical(kind=1) :: i, j
diff --git a/gcc/testsuite/gfortran.dg/parent_result_ref_2.f90 b/gcc/testsuite/gfortran.dg/parent_result_ref_2.f90
index 2409cb4685f..38a5fdc7b2c 100644
--- a/gcc/testsuite/gfortran.dg/parent_result_ref_2.f90
+++ b/gcc/testsuite/gfortran.dg/parent_result_ref_2.f90
@@ -16,7 +16,7 @@ contains
   end subroutine sub
 end function f
 
-function g()              ! { dg-warning "is obsolescent in fortran 95" }
+function g()              ! { dg-warning "Obsolescent feature" }
   character(*) :: g
   g = "efgh"
   call sub ()
diff --git a/gcc/testsuite/gfortran.dg/pointer_function_actual_1.f90 b/gcc/testsuite/gfortran.dg/pointer_function_actual_1.f90
index b3cb2727007..0924117080c 100644
--- a/gcc/testsuite/gfortran.dg/pointer_function_actual_1.f90
+++ b/gcc/testsuite/gfortran.dg/pointer_function_actual_1.f90
@@ -1,4 +1,6 @@
 ! { dg-do run }
+! { dg-options "-std=legacy" }
+!
 ! Tests the fix for PR31209, in which an ICE would result because
 ! the reference to the pointer function f would be indirected, as
 ! if it were the result that is being passed.
diff --git a/gcc/testsuite/gfortran.dg/pr15129.f90 b/gcc/testsuite/gfortran.dg/pr15129.f90
index f9a277cb7e8..df3854d7a5f 100644
--- a/gcc/testsuite/gfortran.dg/pr15129.f90
+++ b/gcc/testsuite/gfortran.dg/pr15129.f90
@@ -1,4 +1,6 @@
 ! { dg-do run }
+! { dg-options "-std=legacy" }
+!
 ! PR 15129: we used to share the character length between A and B in the 
 ! subroutine.
 CHARACTER*10 A
diff --git a/gcc/testsuite/gfortran.dg/pr15332.f b/gcc/testsuite/gfortran.dg/pr15332.f
index 309b59eabf0..813e3018839 100644
--- a/gcc/testsuite/gfortran.dg/pr15332.f
+++ b/gcc/testsuite/gfortran.dg/pr15332.f
@@ -1,5 +1,7 @@
 ! PR libfortran/15332
 ! { dg-do run }
+! { dg-options "-std=legacy" }
+!
       character*12 c
 
       write (c,100) 0, 1
diff --git a/gcc/testsuite/gfortran.dg/pr16597.f90 b/gcc/testsuite/gfortran.dg/pr16597.f90
index 071bf86d613..c29147411a8 100644
--- a/gcc/testsuite/gfortran.dg/pr16597.f90
+++ b/gcc/testsuite/gfortran.dg/pr16597.f90
@@ -1,4 +1,6 @@
 ! { dg-do run }
+! { dg-options "-std=legacy" }
+!
 ! pr 16597
 ! libgfortran
 ! reading a direct access record after it was written did
diff --git a/gcc/testsuite/gfortran.dg/pr17143.f90 b/gcc/testsuite/gfortran.dg/pr17143.f90
index 1c171a3c902..4423eab7354 100644
--- a/gcc/testsuite/gfortran.dg/pr17143.f90
+++ b/gcc/testsuite/gfortran.dg/pr17143.f90
@@ -1,4 +1,6 @@
 ! { dg-do run }
+! { dg-options "-std=legacy" }
+!
 ! pr17143
 ! does not print 2*63 correctly
        character*25 l
diff --git a/gcc/testsuite/gfortran.dg/pr17164.f90 b/gcc/testsuite/gfortran.dg/pr17164.f90
index a0dfff9aa00..c9b4d4537d7 100644
--- a/gcc/testsuite/gfortran.dg/pr17164.f90
+++ b/gcc/testsuite/gfortran.dg/pr17164.f90
@@ -1,4 +1,6 @@
 ! { dg-do run }
+! { dg-options "-std=legacy" }
+!
 ! pr17164
 ! index aborts when substring is longer than string
       implicit none
diff --git a/gcc/testsuite/gfortran.dg/pr17229.f b/gcc/testsuite/gfortran.dg/pr17229.f
index da780d7feef..65f72b04d10 100644
--- a/gcc/testsuite/gfortran.dg/pr17229.f
+++ b/gcc/testsuite/gfortran.dg/pr17229.f
@@ -1,22 +1,23 @@
 ! PR fortran/17229
 ! { dg-do run }
+
       integer i
       logical l
 
       l = .false.
       i = -1
-      if (l) if (i) 999,999,999 ! { dg-warning "Obsolescent: arithmetic IF statement" }
+      if (l) if (i) 999,999,999 ! { dg-warning "Obsolescent feature" }
 
       l = .true.
-      if (l) if (i) 10,999,999 ! { dg-warning "Obsolescent: arithmetic IF statement" }
+      if (l) if (i) 10,999,999 ! { dg-warning "Obsolescent feature" }
       go to 999
 
    10 i = 0
-      if (l) if (i) 999,20,999 ! { dg-warning "Obsolescent: arithmetic IF statement" }
+      if (l) if (i) 999,20,999 ! { dg-warning "Obsolescent feature" }
       go to 999
 
    20 i = 1
-      if (l) if (i) 999,999,30 ! { dg-warning "Obsolescent: arithmetic IF statement" }
+      if (l) if (i) 999,999,30 ! { dg-warning "Obsolescent feature" }
       go to 999
 
   999 call abort
diff --git a/gcc/testsuite/gfortran.dg/pr18210.f90 b/gcc/testsuite/gfortran.dg/pr18210.f90
index 60959841378..85c5afa3e95 100644
--- a/gcc/testsuite/gfortran.dg/pr18210.f90
+++ b/gcc/testsuite/gfortran.dg/pr18210.f90
@@ -1,4 +1,6 @@
 ! { dg-do run }
+! { dg-options "-std=legacy" }
+!
 ! Names in upper case and object names starting column 2
 ! Based on example provided by thomas.koenig@online.de
 
diff --git a/gcc/testsuite/gfortran.dg/pr19155.f b/gcc/testsuite/gfortran.dg/pr19155.f
index 6387c3f9ce3..770b008f9d9 100644
--- a/gcc/testsuite/gfortran.dg/pr19155.f
+++ b/gcc/testsuite/gfortran.dg/pr19155.f
@@ -1,4 +1,5 @@
 ! { dg-do run }
+! { dg-options "-std=legacy" }
 !
 ! PR libfortran/19155
 ! We accept 'E+00' as a valid real number. The standard says it is not,
diff --git a/gcc/testsuite/gfortran.dg/pr20086.f90 b/gcc/testsuite/gfortran.dg/pr20086.f90
index e5759da3dc1..26b53276dc3 100644
--- a/gcc/testsuite/gfortran.dg/pr20086.f90
+++ b/gcc/testsuite/gfortran.dg/pr20086.f90
@@ -1,4 +1,6 @@
 ! { dg-do run }     
+! { dg-options "-std=legacy" }
+!
 ! PR 20086 - Missing characters in output with hollerith strings
       implicit none
       character*80 line
diff --git a/gcc/testsuite/gfortran.dg/pr20124.f90 b/gcc/testsuite/gfortran.dg/pr20124.f90
index 69f4f18b29c..5d05abf6eb1 100644
--- a/gcc/testsuite/gfortran.dg/pr20124.f90
+++ b/gcc/testsuite/gfortran.dg/pr20124.f90
@@ -1,4 +1,6 @@
 ! { dg-do run }
+! { dg-options "-std=legacy" }
+!
 ! pr 20124
       character*80 line
       x = -.01
diff --git a/gcc/testsuite/gfortran.dg/pr20755.f b/gcc/testsuite/gfortran.dg/pr20755.f
index e2bac5a7dcc..4a9b69cad57 100644
--- a/gcc/testsuite/gfortran.dg/pr20755.f
+++ b/gcc/testsuite/gfortran.dg/pr20755.f
@@ -1,5 +1,7 @@
 ! PR libfortran/20755
 ! { dg-do run }
+! { dg-options "-std=legacy" }
+!
       character*30 s
       
       write (s,2000) 0.0, 0.02
diff --git a/gcc/testsuite/gfortran.dg/pr20865.f90 b/gcc/testsuite/gfortran.dg/pr20865.f90
index 96d0d791cb0..5c26965ccc5 100644
--- a/gcc/testsuite/gfortran.dg/pr20865.f90
+++ b/gcc/testsuite/gfortran.dg/pr20865.f90
@@ -1,4 +1,6 @@
 ! { dg-do compile }
+! { dg-options "-std=legacy" }
+!
 ! PR fortran/20865
   subroutine tt(j)
    integer :: j
diff --git a/gcc/testsuite/gfortran.dg/pr20950.f b/gcc/testsuite/gfortran.dg/pr20950.f
index c132548c829..942696c618f 100644
--- a/gcc/testsuite/gfortran.dg/pr20950.f
+++ b/gcc/testsuite/gfortran.dg/pr20950.f
@@ -1,6 +1,8 @@
 ! PR libfortran/20950
 ! Original bug-report by Walt Brainerd, The Fortran Company
 ! { dg-do run }
+! { dg-options "-std=legacy" }
+!
       character*20 c
       inquire (33, sequential = c)
       if (c .ne. "UNKNOWN") call abort
diff --git a/gcc/testsuite/gfortran.dg/pr21730.f b/gcc/testsuite/gfortran.dg/pr21730.f
index 9542c023420..1fe19edfae4 100644
--- a/gcc/testsuite/gfortran.dg/pr21730.f
+++ b/gcc/testsuite/gfortran.dg/pr21730.f
@@ -1,5 +1,7 @@
 ! PR fortran/21730
 ! { dg-do run }
+! { dg-options "-std=legacy" }
+!
       character*2 a
       character*4 b
       character*6 c
diff --git a/gcc/testsuite/gfortran.dg/pr22491.f b/gcc/testsuite/gfortran.dg/pr22491.f
index 1cd35577022..70210f6b095 100644
--- a/gcc/testsuite/gfortran.dg/pr22491.f
+++ b/gcc/testsuite/gfortran.dg/pr22491.f
@@ -1,5 +1,7 @@
 ! PR fortran/21730
 ! { dg-do run }
+! { dg-options "-std=legacy" }
+!
       character*2 a (1)
       character*4 b (1)
       character*6 c
diff --git a/gcc/testsuite/gfortran.dg/pr29713.f90 b/gcc/testsuite/gfortran.dg/pr29713.f90
index be4accd6edd..e60904395ae 100644
--- a/gcc/testsuite/gfortran.dg/pr29713.f90
+++ b/gcc/testsuite/gfortran.dg/pr29713.f90
@@ -1,4 +1,6 @@
 ! { dg-do compile }
+! { dg-options "-std=legacy" }
+!
       character*2 a
       character*4 b
       parameter (a="12")
diff --git a/gcc/testsuite/gfortran.dg/print_parentheses_1.f b/gcc/testsuite/gfortran.dg/print_parentheses_1.f
index 26041c7f1d6..d644483232a 100644
--- a/gcc/testsuite/gfortran.dg/print_parentheses_1.f
+++ b/gcc/testsuite/gfortran.dg/print_parentheses_1.f
@@ -1,4 +1,6 @@
 ! { dg-do compile }
+! { dg-options "-std=legacy" }
+!
       program main
       character*80 line
       print (line,'(A)'), 'hello' ! { dg-error "Syntax error" }
diff --git a/gcc/testsuite/gfortran.dg/print_parentheses_2.f90 b/gcc/testsuite/gfortran.dg/print_parentheses_2.f90
index 699f507dafb..520973ed160 100644
--- a/gcc/testsuite/gfortran.dg/print_parentheses_2.f90
+++ b/gcc/testsuite/gfortran.dg/print_parentheses_2.f90
@@ -1,4 +1,6 @@
 ! { dg-do compile }
+! { dg-options "-std=legacy" }
+!
 program main
   character*80 line
   print (line,'(A)'), 'hello' ! { dg-error "Syntax error" }
diff --git a/gcc/testsuite/gfortran.dg/proc_assign_1.f90 b/gcc/testsuite/gfortran.dg/proc_assign_1.f90
index 919089acb42..e85df7635de 100644
--- a/gcc/testsuite/gfortran.dg/proc_assign_1.f90
+++ b/gcc/testsuite/gfortran.dg/proc_assign_1.f90
@@ -1,4 +1,6 @@
-! { dg-do compile }

+! { dg-do compile }
+! { dg-options "-std=legacy" }
+!

 ! This tests the patch for PR26787 in which it was found that setting

 ! the result of one module procedure from within another produced an

 ! ICE rather than an error.

diff --git a/gcc/testsuite/gfortran.dg/proc_decl_1.f90 b/gcc/testsuite/gfortran.dg/proc_decl_1.f90
index c7ec4f2f3fc..de7cb4159c1 100644
--- a/gcc/testsuite/gfortran.dg/proc_decl_1.f90
+++ b/gcc/testsuite/gfortran.dg/proc_decl_1.f90
@@ -1,4 +1,6 @@
 ! { dg-do compile }
+! { dg-options "-std=legacy" }
+!
 ! This tests various error messages for PROCEDURE declarations.
 ! Contributed by Janus Weil <jaydub66@gmail.com>
 
diff --git a/gcc/testsuite/gfortran.dg/proc_ptr_17.f90 b/gcc/testsuite/gfortran.dg/proc_ptr_17.f90
index 20e059fca3a..55b8bce24d9 100644
--- a/gcc/testsuite/gfortran.dg/proc_ptr_17.f90
+++ b/gcc/testsuite/gfortran.dg/proc_ptr_17.f90
@@ -6,7 +6,7 @@
 ! Contributed by Tobias Burnus <burnus@net-b.de>
 
   procedure(), pointer :: p
-  f(x) = x**2
+  f(x) = x**2  ! { dg-warning "Obsolescent feature" }
   p => f  ! { dg-error "invalid in procedure pointer assignment" }
   p => sub  ! { dg-error "invalid in procedure pointer assignment" }
 contains
diff --git a/gcc/testsuite/gfortran.dg/read_eor.f90 b/gcc/testsuite/gfortran.dg/read_eor.f90
index f3327550297..e6c849eab76 100644
--- a/gcc/testsuite/gfortran.dg/read_eor.f90
+++ b/gcc/testsuite/gfortran.dg/read_eor.f90
@@ -1,4 +1,6 @@
 ! { dg-do run }
+! { dg-options "-std=legacy" }
+!
 ! PR24489 Assure that read does not go past the end of record. The width of
 ! the format specifier is 8, but the internal unit record length is 4 so only
 ! the first 4 characters should be read.
diff --git a/gcc/testsuite/gfortran.dg/read_float_1.f90 b/gcc/testsuite/gfortran.dg/read_float_1.f90
index 86589c053b6..0848ee67590 100644
--- a/gcc/testsuite/gfortran.dg/read_float_1.f90
+++ b/gcc/testsuite/gfortran.dg/read_float_1.f90
@@ -1,4 +1,6 @@
 ! { dg-do run }
+! { dg-options "-std=legacy" }
+!
 ! PR18218
 ! The IO library has an algorithm that involved repeated multiplication by 10,
 ! resulting in introducing large cumulative floating point errors.
diff --git a/gcc/testsuite/gfortran.dg/read_logical.f90 b/gcc/testsuite/gfortran.dg/read_logical.f90
index 1e74c8e1a1b..7b7ba8c3a25 100644
--- a/gcc/testsuite/gfortran.dg/read_logical.f90
+++ b/gcc/testsuite/gfortran.dg/read_logical.f90
@@ -1,4 +1,6 @@
 ! { dg-do run }
+! { dg-options "-std=legacy" }
+!
 ! PR 26554 : Test logical read from string. Test case derived from PR.
 ! Submitted by Jerry DeLisle <jvdelisle@verizon.net>.
 program bug
@@ -13,4 +15,4 @@ program bug
   read (strg,*) l
   if (.not.l) call abort()
   end
-      
\ No newline at end of file
+
diff --git a/gcc/testsuite/gfortran.dg/recursive_statement_functions.f90 b/gcc/testsuite/gfortran.dg/recursive_statement_functions.f90
index 8f9b0918370..bcf51f8d5e9 100644
--- a/gcc/testsuite/gfortran.dg/recursive_statement_functions.f90
+++ b/gcc/testsuite/gfortran.dg/recursive_statement_functions.f90
@@ -1,4 +1,6 @@
 ! { dg-do compile }
+! { dg-options "-std=legacy" }
+!
 ! PR20866 - A statement function cannot be recursive.
 ! Contributed by Joost VandeVondele <jv244@cam.ac.uk>
 !
diff --git a/gcc/testsuite/gfortran.dg/return_1.f90 b/gcc/testsuite/gfortran.dg/return_1.f90
index a66b4c199ed..a8067b03c08 100644
--- a/gcc/testsuite/gfortran.dg/return_1.f90
+++ b/gcc/testsuite/gfortran.dg/return_1.f90
@@ -1,4 +1,6 @@
 ! { dg-do compile }
+! { dg-options "-std=legacy" }
+!
 ! Test cases where no blank is required after RETURN
 subroutine sub(*)
 return(1)
diff --git a/gcc/testsuite/gfortran.dg/rewind_1.f90 b/gcc/testsuite/gfortran.dg/rewind_1.f90
index cbd2ef17b8f..92edf6dfed9 100644
--- a/gcc/testsuite/gfortran.dg/rewind_1.f90
+++ b/gcc/testsuite/gfortran.dg/rewind_1.f90
@@ -1,4 +1,6 @@
 ! { dg-do run }
+! { dg-options "-std=legacy" }
+!
 ! Check that rewind doesn't delete a file.
 ! Writing to the file truncates it at the end of the current record.  Out
 ! IO library was defering the actual truncation until the file was rewound.
diff --git a/gcc/testsuite/gfortran.dg/runtime_warning_1.f90 b/gcc/testsuite/gfortran.dg/runtime_warning_1.f90
index 6af85c344ef..cff9eae7ae7 100644
--- a/gcc/testsuite/gfortran.dg/runtime_warning_1.f90
+++ b/gcc/testsuite/gfortran.dg/runtime_warning_1.f90
@@ -5,7 +5,7 @@
 ! { dg-options "-pedantic" }
 ! { dg-do run }
 !
-     character*5 c
+     character(5) c
      open (42,status='scratch')
      write (42,'(A,$)') 'abc' ! { dg-warning ".*descriptor" "" }
      write (42,'(A)') 'de'
diff --git a/gcc/testsuite/gfortran.dg/scalar_return_1.f90 b/gcc/testsuite/gfortran.dg/scalar_return_1.f90
index d7583bc10b4..df206458e3a 100644
--- a/gcc/testsuite/gfortran.dg/scalar_return_1.f90
+++ b/gcc/testsuite/gfortran.dg/scalar_return_1.f90
@@ -1,4 +1,6 @@
 ! { dg-do compile }
+! { dg-options "-std=legacy" }
+!
 ! tests the fix for pr25082 in which the return of an array by a
 ! subroutine went undremarked.
 !
diff --git a/gcc/testsuite/gfortran.dg/stfunc_1.f90 b/gcc/testsuite/gfortran.dg/stfunc_1.f90
index e21f34e063b..46dde6286b6 100644
--- a/gcc/testsuite/gfortran.dg/stfunc_1.f90
+++ b/gcc/testsuite/gfortran.dg/stfunc_1.f90
@@ -1,4 +1,6 @@
 ! { dg-do run }
+! { dg-options "-std=legacy" }
+!
 ! this is a problem which disappeared between 2005-01-02 and 2005-03-13
 ! PR 18600
       logical a, b
diff --git a/gcc/testsuite/gfortran.dg/stfunc_3.f90 b/gcc/testsuite/gfortran.dg/stfunc_3.f90
index 42eedf8c830..90980a92448 100644
--- a/gcc/testsuite/gfortran.dg/stfunc_3.f90
+++ b/gcc/testsuite/gfortran.dg/stfunc_3.f90
@@ -1,4 +1,6 @@
 ! { dg-do compile }
+! { dg-options "-std=legacy" }
+!
 ! Tests the fix for PR20867 in which implicit typing was not done within
 ! statement functions and so was not confirmed or not by subsequent
 ! type delarations.
diff --git a/gcc/testsuite/gfortran.dg/stfunc_4.f90 b/gcc/testsuite/gfortran.dg/stfunc_4.f90
index e995fb86bec..2f0efccf326 100644
--- a/gcc/testsuite/gfortran.dg/stfunc_4.f90
+++ b/gcc/testsuite/gfortran.dg/stfunc_4.f90
@@ -1,4 +1,6 @@
 ! { dg-do run }
+! { dg-options "-std=legacy" }
+!
 ! Tests the fix for PR29389, in which the  statement function would not be
 ! recognised as PURE within a PURE procedure.
 
diff --git a/gcc/testsuite/gfortran.dg/stfunc_6.f90 b/gcc/testsuite/gfortran.dg/stfunc_6.f90
index c5657833c0f..482d12592f3 100644
--- a/gcc/testsuite/gfortran.dg/stfunc_6.f90
+++ b/gcc/testsuite/gfortran.dg/stfunc_6.f90
@@ -1,4 +1,6 @@
 ! { dg-do compile }
+! { dg-options "-std=legacy" }
+!
 ! Tests the fix for the second bit of PR29389, in which the
 ! statement function would not be recognised as not PURE
 ! when it referenced a procedure that is not PURE.
diff --git a/gcc/testsuite/gfortran.dg/streamio_2.f90 b/gcc/testsuite/gfortran.dg/streamio_2.f90
index a7d5d3ccfaa..8260a7481c9 100644
--- a/gcc/testsuite/gfortran.dg/streamio_2.f90
+++ b/gcc/testsuite/gfortran.dg/streamio_2.f90
@@ -1,4 +1,6 @@
 ! { dg-do run }
+! { dg-options "-std=legacy" }
+!
 ! PR25828 Stream IO test 2
 ! Contributed by Jerry DeLisle <jvdelisle@verizon.net>.
 PROGRAM readUstream
@@ -16,4 +18,5 @@ PROGRAM readUstream
   if (string.ne."rst") call abort()
   if (n.ne.7) call abort()
   close(unit=11, status="delete")
-END PROGRAM readUstream
\ No newline at end of file
+END PROGRAM readUstream
+
diff --git a/gcc/testsuite/gfortran.dg/string_ctor_1.f90 b/gcc/testsuite/gfortran.dg/string_ctor_1.f90
index 3242ea8f9e3..7e5c2f9f030 100644
--- a/gcc/testsuite/gfortran.dg/string_ctor_1.f90
+++ b/gcc/testsuite/gfortran.dg/string_ctor_1.f90
@@ -1,4 +1,6 @@
 ! { dg-do run }
+! { dg-options "-std=legacy" }
+!
 ! Program to test character array constructors.
 ! PR17144
 subroutine test1 (n, t, u)
diff --git a/gcc/testsuite/gfortran.dg/string_null_compare_1.f b/gcc/testsuite/gfortran.dg/string_null_compare_1.f
index 2e6eb1b2b88..659b3eb3709 100644
--- a/gcc/testsuite/gfortran.dg/string_null_compare_1.f
+++ b/gcc/testsuite/gfortran.dg/string_null_compare_1.f
@@ -1,4 +1,6 @@
 ! { dg-do run }
+! { dg-options "-std=legacy" }
+!
 ! PR 27784 - Different strings should compare unequal even if they
 !            have CHAR(0) in them.
 
diff --git a/gcc/testsuite/gfortran.dg/substr_6.f90 b/gcc/testsuite/gfortran.dg/substr_6.f90
index ee0eae49e0e..813a02521a3 100644
--- a/gcc/testsuite/gfortran.dg/substr_6.f90
+++ b/gcc/testsuite/gfortran.dg/substr_6.f90
@@ -1,4 +1,6 @@
 ! { dg-do run }
+! { dg-options "-std=legacy" }
+!
 ! Check that NULs don't mess up constant substring simplification
 CHARACTER(5), parameter :: c0(1) = (/ "123" // ACHAR(0) // "5" /)
 CHARACTER*5 c(1)
diff --git a/gcc/testsuite/gfortran.dg/tl_editing.f90 b/gcc/testsuite/gfortran.dg/tl_editing.f90
index d2a7ede436f..830c7eb71bd 100644
--- a/gcc/testsuite/gfortran.dg/tl_editing.f90
+++ b/gcc/testsuite/gfortran.dg/tl_editing.f90
@@ -1,4 +1,6 @@
 ! { dg-do run }     
+! { dg-options "-std=legacy" }
+!
 ! Test of fix to bug triggered by NIST fm908.for.
 ! Left tabbing, followed by X or T-tabbing to the right would
 ! cause spaces to be overwritten on output data.
diff --git a/gcc/testsuite/gfortran.dg/unf_io_convert_1.f90 b/gcc/testsuite/gfortran.dg/unf_io_convert_1.f90
index 3d35312c92c..31765699750 100644
--- a/gcc/testsuite/gfortran.dg/unf_io_convert_1.f90
+++ b/gcc/testsuite/gfortran.dg/unf_io_convert_1.f90
@@ -16,7 +16,7 @@ program main
   integer n
   real r(size)
   integer i
-  character*4 str
+  character(4) str
 
   m(1) = Z'11223344' ! { dg-warning "BOZ literal at .1. outside a DATA statement" }
   m(2) = Z'55667788' ! { dg-warning "BOZ literal at .1. outside a DATA statement" }
diff --git a/gcc/testsuite/gfortran.dg/warnings_are_errors_1.f90 b/gcc/testsuite/gfortran.dg/warnings_are_errors_1.f90
index fcbeba5aa51..0a0883c67c3 100644
--- a/gcc/testsuite/gfortran.dg/warnings_are_errors_1.f90
+++ b/gcc/testsuite/gfortran.dg/warnings_are_errors_1.f90
@@ -5,7 +5,7 @@
 ! free-form tests
 
 ! gfc_notify_std:
-       function char_ (ch) ! { dg-warning "is obsolescent in fortran 95" }
+       function char_ (ch) ! { dg-warning "Obsolescent feature" }
        character(*) :: char_, ch
         char_ = ch
        end function char_
diff --git a/gcc/testsuite/gfortran.dg/x_slash_1.f b/gcc/testsuite/gfortran.dg/x_slash_1.f
index de576e2e401..435e4612227 100644
--- a/gcc/testsuite/gfortran.dg/x_slash_1.f
+++ b/gcc/testsuite/gfortran.dg/x_slash_1.f
@@ -1,4 +1,6 @@
 c { dg-do run { target fd_truncate } }
+c { dg-options "-std=legacy" }
+c
 c This program tests the fixes to PR22570.
 c
 c Provided by Paul Thomas - pault@gcc.gnu.org