symbol.c (check_conflict): Add conflict between VOLATILE attribute and program name.

fortran/
2006-11-20  Tobias Burnus  <burnus@net-b.de>

        * symbol.c (check_conflict): Add conflict between VOLATILE
          attribute and program name.

testsuite/
2006-11-20  Tobias Burnus  <burnus@net-b.de>

        * gfortran.dg/volatile3.f90: Add conflict test.

From-SVN: r119025

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index da741c6faff5e8a53ea6b2886b7840f3b09ccf97..a88071a4289f610c50996df85b4dca4d409cbd60 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-20  Tobias Burnus  <burnus@net-b.de>
+
+       * symbol.c (check_conflict): Add conflict between VOLATILE
+         attribute and program name.
+
 2006-11-20  Bernhard Fischer  <aldot@gcc.gnu.org>
 
        PR fortran/24783

diff --git a/gcc/fortran/symbol.c b/gcc/fortran/symbol.c
index d867de9fcfcddbcdc4d796cf2654aa6f0201afa9..7982920b4fa622e29b693fca91b1d0c79771690a 100644 (file)
--- a/gcc/fortran/symbol.c
+++ b/gcc/fortran/symbol.c
@@ -432,6 +432,7 @@ check_conflict (symbol_attribute * attr, const char * name, locus * where)
       conf2 (dimension);
       conf2 (dummy);
       conf2 (save);
+      conf2 (volatile_);
       conf2 (pointer);
       conf2 (target);
       conf2 (external);

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index bda06241fd7527775f77d59e86a8d0347f9c96bf..046b230c79833feaa6ff9eaec76c6d8296443ec0 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2006-11-20  Tobias Burnus  <burnus@net-b.de>
+
+       * gfortran.dg/volatile3.f90: Add conflict test.
+
 2006-11-20  Bernhard Fischer  <aldot@gcc.gnu.org>
 
        PR fortran/24783

diff --git a/gcc/testsuite/gfortran.dg/volatile3.f90 b/gcc/testsuite/gfortran.dg/volatile3.f90
index 46619eb6bcec91d0488b6c494ccb3596dcd24008..966272eecd2141bdc91a827a2f37b4e54cf4936b 100644 (file)
--- a/gcc/testsuite/gfortran.dg/volatile3.f90
+++ b/gcc/testsuite/gfortran.dg/volatile3.f90
@@ -13,6 +13,7 @@ program volatile_test
   real, volatile,volatile :: r = 3. ! { dg-error "Duplicate VOLATILE attribute" }
   volatile :: l,n ! { dg-error "Duplicate VOLATILE attribute" }
   volatile ! { dg-error "Syntax error in VOLATILE statement" }
+  volatile :: volatile_test ! { dg-error "PROGRAM attribute conflicts with VOLATILE attribute" }
   l = 4.0
   m = 3.0
 contains