diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f5e5062b8d4eb132a06b49756ad529143001269e..44085de636b364a715239dad47c1ba4747181581 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2000-09-10  Richard Henderson  <rth@cygnus.com>
+
+	* c-parse.in (asm patterns): Fix volatile check.
+
 2000-09-09  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
 	* cppmacro.c (check_trad_stringification): New function.
diff --git a/gcc/c-parse.in b/gcc/c-parse.in
index 5ef738672f77f5c29a82b43e4fc08ed2ea06b3e2..416256df2823dc78c2941d3a46ddc692a65f7143 100644
--- a/gcc/c-parse.in
+++ b/gcc/c-parse.in
@@ -1901,14 +1901,14 @@ stmt:
 		{ stmt_count++;
 		  emit_line_note ($<filename>-1, $<lineno>0);
 		  c_expand_asm_operands ($4, $6, NULL_TREE, NULL_TREE,
-					 $2 == ridpointers[(int)RID_VOLATILE],
+					 $2 && C_RID_CODE ($2) == RID_VOLATILE,
 					 input_filename, lineno); }
 	/* This is the case with input operands as well.  */
 	| ASM_KEYWORD maybe_type_qual '(' expr ':' asm_operands ':' asm_operands ')' ';'
 		{ stmt_count++;
 		  emit_line_note ($<filename>-1, $<lineno>0);
 		  c_expand_asm_operands ($4, $6, $8, NULL_TREE,
-					 $2 == ridpointers[(int)RID_VOLATILE],
+					 $2 && C_RID_CODE ($2) == RID_VOLATILE,
 					 input_filename, lineno); }
 	/* This is the case with clobbered registers as well.  */
 	| ASM_KEYWORD maybe_type_qual '(' expr ':' asm_operands ':'
@@ -1916,7 +1916,7 @@ stmt:
 		{ stmt_count++;
 		  emit_line_note ($<filename>-1, $<lineno>0);
 		  c_expand_asm_operands ($4, $6, $8, $10,
-					 $2 == ridpointers[(int)RID_VOLATILE],
+					 $2 && C_RID_CODE ($2) == RID_VOLATILE,
 					 input_filename, lineno); }
 	| GOTO identifier ';'
 		{ tree decl;