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

gcc/fortran/ChangeLog

+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

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);

gcc/testsuite/ChangeLog

+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

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