Fortran: [PR123025] Catch Old-style character declarations.

	Before this patch we missed the two cases here:

	character*5 string5         ! Gives obsolescent message
	character*(5) string5const  ! Silent with constant
	character*(2+3) string5expr ! Silent with expression

	PR fortran/123025

gcc/fortran/ChangeLog:

	* decl.cc (match_char_length): Add a check for the
	obsolete '*' style of character declarations in the
	alternate branch of checking so we dont miss two
	use cases:

gcc/testsuite/ChangeLog:

	* gfortran.dg/assumed_charlen_dummy.f90: These tests failed
	with the change because of the default -pedantic option
	used by the dg.exp mechanisms. Overide this default.
	* gfortran.dg/automatic_char_len_1.f90: Ditto.
	* gfortran.dg/entry_23.f: Ditto.
	* gfortran.dg/finalize_59.f90: Dito.
	* gfortran.dg/g77/f90-intrinsic-bit.f: Ditto.
	* gfortran.dg/g77/f90-intrinsic-mathematical.f: Ditto.
	* gfortran.dg/g77/f90-intrinsic-numeric.f: Ditto.
	* gfortran.dg/g77/intrinsic-unix-bessel.f: Ditto.
	* gfortran.dg/g77/intrinsic-unix-erf.f: Ditto.
	* gfortran.dg/initialization_9.f90: Ditto.
	* gfortran.dg/intrinsic_actual_4.f90: Ditto.
	* gfortran.dg/namelist_assumed_char.f90: Ditto.
	* gfortran.dg/pr15140.f90: Ditto.

Co-authored-by: Steven G. Kargl <kargl@gcc.gnu.org>

14 files changed, 18 insertions, 3 deletions

diff --git a/gcc/fortran/decl.cc b/gcc/fortran/decl.cc
index dfedb96..0e55171 100644
--- a/gcc/fortran/decl.cc
+++ b/gcc/fortran/decl.cc
@@ -1217,6 +1217,10 @@ match_char_length (gfc_expr **expr, bool *deferred, bool obsolescent_check)
       goto syntax;
     }
 
+  if (obsolescent_check
+      && !gfc_notify_std (GFC_STD_F95_OBS, "Old-style character length at %C"))
+    return MATCH_ERROR;
+
   return MATCH_YES;
 
 syntax:
diff --git a/gcc/testsuite/gfortran.dg/assumed_charlen_dummy.f90 b/gcc/testsuite/gfortran.dg/assumed_charlen_dummy.f90
index 04f0b9f..2e0e77c 100644
--- a/gcc/testsuite/gfortran.dg/assumed_charlen_dummy.f90
+++ b/gcc/testsuite/gfortran.dg/assumed_charlen_dummy.f90
@@ -1,4 +1,5 @@
 ! { dg-do compile }
+! { dg-options " " }
 ! Test the fix for PR fortran/39893.
 ! Original testcase provided by Deji Akingunola.
 ! Reduced testcase provided by Dominique d'Humieres.
diff --git a/gcc/testsuite/gfortran.dg/automatic_char_len_1.f90 b/gcc/testsuite/gfortran.dg/automatic_char_len_1.f90
index 3ccfcb7..7f102b7 100644
--- a/gcc/testsuite/gfortran.dg/automatic_char_len_1.f90
+++ b/gcc/testsuite/gfortran.dg/automatic_char_len_1.f90
@@ -1,4 +1,5 @@
 ! { dg-do compile }
+! { dg-options " " }
 ! PR18082 - Compiler would get stuck in loop, whilst treating
 ! the assignments.
 ! Test is one of PR cases.
diff --git a/gcc/testsuite/gfortran.dg/entry_23.f b/gcc/testsuite/gfortran.dg/entry_23.f
index ebc5f66..d10ea92 100644
--- a/gcc/testsuite/gfortran.dg/entry_23.f
+++ b/gcc/testsuite/gfortran.dg/entry_23.f
@@ -1,4 +1,5 @@
 ! { dg-do run }
+! { dg-options " " }
 ! PR 97799 - this used to segfault intermittently.
 ! Test case by George Hockney.
       PROGRAM MAIN
diff --git a/gcc/testsuite/gfortran.dg/finalize_59.f90 b/gcc/testsuite/gfortran.dg/finalize_59.f90
index 8be5f71..e9e68d4 100644
--- a/gcc/testsuite/gfortran.dg/finalize_59.f90
+++ b/gcc/testsuite/gfortran.dg/finalize_59.f90
@@ -187,7 +187,7 @@ Program Cds_Principal
    Type(Uef_Vector)                                    :: Cds_Mod_Les_materiaux
    Type (Cds_Materiau_Acier_EC)                        :: acier_ec
    Class (Cds_Materiau), pointer                       :: pt_materiau
-   Character *(8)                                      :: nom_materiau
+   Character(len=8)                                    :: nom_materiau
 !-------------------------------------------------------------------------------------------------
       CaLL  Cds_Mod_Les_materiaux%Add (acier_ec)
       nom_materiau = "12345678"
@@ -199,7 +199,7 @@ Function Get_Pt_Materiau_nom (vecteur, nom_materiau)
     !   Fonction :
     !--------------------
      ! Parametres en entree
-    Character *(8), Intent (in)        :: nom_materiau
+    Character(len=8), Intent (in)        :: nom_materiau
     Type (Uef_Vector)          , Intent (inout)     :: vecteur
 
     ! Parametres en sortie
diff --git a/gcc/testsuite/gfortran.dg/g77/f90-intrinsic-bit.f b/gcc/testsuite/gfortran.dg/g77/f90-intrinsic-bit.f
index 0ce45de..2f03db1 100644
--- a/gcc/testsuite/gfortran.dg/g77/f90-intrinsic-bit.f
+++ b/gcc/testsuite/gfortran.dg/g77/f90-intrinsic-bit.f
@@ -1,4 +1,5 @@
 c { dg-do run }
+c { dg-options " " }
 c  f90-intrinsic-bit.f
 c
 c Test Fortran 90 
diff --git a/gcc/testsuite/gfortran.dg/g77/f90-intrinsic-mathematical.f b/gcc/testsuite/gfortran.dg/g77/f90-intrinsic-mathematical.f
index d151fd0..f07336e 100644
--- a/gcc/testsuite/gfortran.dg/g77/f90-intrinsic-mathematical.f
+++ b/gcc/testsuite/gfortran.dg/g77/f90-intrinsic-mathematical.f
@@ -1,4 +1,5 @@
 c { dg-do run }
+c { dg-options " " }
 c  f90-intrinsic-mathematical.f
 c
 c Test Fortran 90 intrinsic mathematical functions - Section 13.10.3 and
diff --git a/gcc/testsuite/gfortran.dg/g77/f90-intrinsic-numeric.f b/gcc/testsuite/gfortran.dg/g77/f90-intrinsic-numeric.f
index c8d7c56..c01efe6 100644
--- a/gcc/testsuite/gfortran.dg/g77/f90-intrinsic-numeric.f
+++ b/gcc/testsuite/gfortran.dg/g77/f90-intrinsic-numeric.f
@@ -1,4 +1,5 @@
 c { dg-do run }
+c { dg-options " " }
 c  f90-intrinsic-numeric.f
 c
 c Test Fortran 90 intrinsic numeric functions - Section 13.10.2 and 13.13 
diff --git a/gcc/testsuite/gfortran.dg/g77/intrinsic-unix-bessel.f b/gcc/testsuite/gfortran.dg/g77/intrinsic-unix-bessel.f
index b388806..406a8e4 100644
--- a/gcc/testsuite/gfortran.dg/g77/intrinsic-unix-bessel.f
+++ b/gcc/testsuite/gfortran.dg/g77/intrinsic-unix-bessel.f
@@ -1,4 +1,5 @@
 c { dg-do run }
+c { dg-options " " }
 c  intrinsic-unix-bessel.f
 c
 c Test Bessel function intrinsics.  
diff --git a/gcc/testsuite/gfortran.dg/g77/intrinsic-unix-erf.f b/gcc/testsuite/gfortran.dg/g77/intrinsic-unix-erf.f
index 250519a..6ed9590 100644
--- a/gcc/testsuite/gfortran.dg/g77/intrinsic-unix-erf.f
+++ b/gcc/testsuite/gfortran.dg/g77/intrinsic-unix-erf.f
@@ -1,4 +1,5 @@
 c { dg-do run }
+c { dg-options " " }
 c  intrinsic-unix-erf.f
 c
 c Test Bessel function intrinsics.  
diff --git a/gcc/testsuite/gfortran.dg/initialization_9.f90 b/gcc/testsuite/gfortran.dg/initialization_9.f90
index d904047..fe7ca63 100644
--- a/gcc/testsuite/gfortran.dg/initialization_9.f90
+++ b/gcc/testsuite/gfortran.dg/initialization_9.f90
@@ -1,4 +1,5 @@
 ! { dg-do compile }
+! { dg-options " " }
 !
 ! PR fortran/31639
 ! Contributed by Martin Michlmayr <tbm AT cyrius DOT com>
diff --git a/gcc/testsuite/gfortran.dg/intrinsic_actual_4.f90 b/gcc/testsuite/gfortran.dg/intrinsic_actual_4.f90
index 4521c96..3358b4a 100644
--- a/gcc/testsuite/gfortran.dg/intrinsic_actual_4.f90
+++ b/gcc/testsuite/gfortran.dg/intrinsic_actual_4.f90
@@ -1,4 +1,5 @@
 ! { dg-do run }
+! { dg-options " " }
 ! Tests the fix for PR27900, in which an ICE would be caused because
 ! the actual argument LEN had no type.
 !
diff --git a/gcc/testsuite/gfortran.dg/namelist_assumed_char.f90 b/gcc/testsuite/gfortran.dg/namelist_assumed_char.f90
index b7d063c..25edf64 100644
--- a/gcc/testsuite/gfortran.dg/namelist_assumed_char.f90
+++ b/gcc/testsuite/gfortran.dg/namelist_assumed_char.f90
@@ -8,7 +8,7 @@
 ! Add -std=f95, add bar()
 !
 subroutine foo(c)
-  character*(*) c
+  character*(*) c   ! { dg-warning "Old-style character length" }
   namelist /abc/ c  ! { dg-error "nonconstant character length in namelist" }
 end subroutine
 
diff --git a/gcc/testsuite/gfortran.dg/pr15140.f90 b/gcc/testsuite/gfortran.dg/pr15140.f90
index 80c08dd..7f9af4f 100644
--- a/gcc/testsuite/gfortran.dg/pr15140.f90
+++ b/gcc/testsuite/gfortran.dg/pr15140.f90
@@ -1,4 +1,5 @@
 ! { dg-do run }
+! { dg-options "-std=legacy" }
 ! PR 15140: we used to fail an assertion, because we don't use the
 ! argument of the subroutine directly, but instead use a copy of it.
 function M(NAMES)