diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3f1a21e40eb9..e9562f3db30f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2008-07-02  Mark Shinwell  <shinwell@codesourcery.com>
+
+	* final.c (asm_insn_count): Return zero for an empty asm body.
+
 2008-07-02  Richard Guenther  <rguenther@suse.de>
 
 	* bitmap.h (bitmap_set_bit): Return bool.
diff --git a/gcc/final.c b/gcc/final.c
index 1f673fb7858a..cbdb3f1bfdd7 100644
--- a/gcc/final.c
+++ b/gcc/final.c
@@ -1385,6 +1385,9 @@ asm_insn_count (rtx body)
   else
     template = decode_asm_operands (body, NULL, NULL, NULL, NULL, NULL);
 
+  if (!*template)
+    return 0;
+
   for (; *template; template++)
     if (IS_ASM_LOGICAL_LINE_SEPARATOR (*template, template)
 	|| *template == '\n')