diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8b32f16721d..e69a20568b3 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2002-05-13  Zack Weinberg  <zack@codesourcery.com>
+
+	* genattr.c (gen_attr): Don't emit a comma after the last
+	enumerator.
+
 2002-05-13  Richard Henderson  <rth@redhat.com>
 
 	* cfgrtl.c (purge_dead_edges): Handle abnormal call edges created
diff --git a/gcc/genattr.c b/gcc/genattr.c
index b688bd49bad..591e0d7997e 100644
--- a/gcc/genattr.c
+++ b/gcc/genattr.c
@@ -106,7 +106,8 @@ gen_attr (attr)
 	  putchar ('_');
 	  while (tag != p)
 	    putchar (TOUPPER (*tag++));
-	  fputs (", ", stdout);
+	  if (*p == ',')
+	    fputs (", ", stdout);
 	}
 
       fputs ("};\n", stdout);