2007-02-18 Jerry DeLisle <jvdelisle@gcc.gnu.org>

	PR fortran/30681
	* options.c (gfc_init_options): Relax warning level for obsolescent.
	* match.c (match_arithmetic_if): Change to obsolescent from deleted.
	(gfc_match_if): Same.

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

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 388bfd6..af39568 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,10 @@
+2007-02-18  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
+
+       PR fortran/30681
+       * options.c (gfc_init_options): Relax warning level for obsolescent.
+       * match.c (match_arithmetic_if): Change to obsolescent from deleted.
+       (gfc_match_if): Same.
+
 2007-02-18  Roger Sayle  <roger@eyesopen.com>
 
        * trans-array.c (gfc_build_constant_array_constructor): When the

diff --git a/gcc/fortran/match.c b/gcc/fortran/match.c
index bf78911..012f549 100644 (file)
--- a/gcc/fortran/match.c
+++ b/gcc/fortran/match.c
@@ -952,7 +952,7 @@ match_arithmetic_if (void)
       return MATCH_ERROR;
     }
 
-  if (gfc_notify_std (GFC_STD_F95_DEL, "Obsolete: arithmetic IF statement "
+  if (gfc_notify_std (GFC_STD_F95_OBS, "Obsolescent: arithmetic IF statement "
                      "at %C") == FAILURE)
     return MATCH_ERROR;
 
@@ -1025,7 +1025,7 @@ gfc_match_if (gfc_statement *if_type)
          return MATCH_ERROR;
        }
       
-      if (gfc_notify_std (GFC_STD_F95_DEL, "Obsolete: arithmetic IF "
+      if (gfc_notify_std (GFC_STD_F95_OBS, "Obsolescent: arithmetic IF "
                          "statement at %C") == FAILURE)
        return MATCH_ERROR;
 

diff --git a/gcc/fortran/options.c b/gcc/fortran/options.c
index 0f27766..bd8f6eb 100644 (file)
--- a/gcc/fortran/options.c
+++ b/gcc/fortran/options.c
@@ -100,8 +100,7 @@ gfc_init_options (unsigned int argc ATTRIBUTE_UNUSED,
   gfc_option.allow_std = GFC_STD_F95_OBS | GFC_STD_F95_DEL
     | GFC_STD_F2003 | GFC_STD_F95 | GFC_STD_F77 | GFC_STD_GNU
     | GFC_STD_LEGACY;
-  gfc_option.warn_std = GFC_STD_F95_OBS | GFC_STD_F95_DEL
-    | GFC_STD_LEGACY;
+  gfc_option.warn_std = GFC_STD_F95_DEL | GFC_STD_LEGACY;
 
   gfc_option.warn_nonstd_intrinsics = 0;