diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index db3256e6953..683cf71c4bd 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+Wed Dec 13 17:25:32 MET 2000  Jan Hubicka  <jh@suse.cz>
+
+	* genoutput.c (process_template): Add sanity checking for '@' templates.
+
 2000-12-13  Bernd Schmidt  <bernds@redhat.co.uk>
 
 	* simplify-rtx.c (cselib_finish): Free reg_values and used_regs
diff --git a/gcc/genoutput.c b/gcc/genoutput.c
index a5674c95279..dc36d465dd6 100644
--- a/gcc/genoutput.c
+++ b/gcc/genoutput.c
@@ -701,6 +701,15 @@ process_template (d, template)
 	  printf ("\",\n");
 	  i++;
 	}
+      if (i == 1)
+	message_with_line (d->lineno,
+			   "'@' is redundant for output template with single alternative");
+      if (i != d->n_alternatives)
+	{
+	  message_with_line (d->lineno,
+			     "Wrong number of alternatives in the output template");
+	  have_error = 1;
+	}
 
       printf ("};\n");
     }