diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index fe86f872da1..78ee470c5bb 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2009-07-08  Nick Clifton  <nickc@redhat.com>
+
+	* config/i386/unix.h (ASM_COMMENT_START): Add a space after the
+	forward slash.
+
 2009-07-08  DJ Delorie  <dj@redhat.com>
 
 	* config/mep/mep-ivc2.cpu (cpmovtocsar0_C3, cpmovtocsar1_C3,
diff --git a/gcc/config/i386/unix.h b/gcc/config/i386/unix.h
index ae5d31dfb95..aa6c4a38ae3 100644
--- a/gcc/config/i386/unix.h
+++ b/gcc/config/i386/unix.h
@@ -35,9 +35,14 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 
 /* Define the syntax of pseudo-ops, labels and comments.  */
 
-/* String containing the assembler's comment-starter.  */
+/* String containing the assembler's comment-starter.
+   Note the trailing space is necessary in case the character
+   that immediately follows the comment is '*'.  If this happens
+   and the space is not there the assembler will interpret this
+   as the start of a C-like slash-star comment and complain when
+   there is no terminator.  */
 
-#define ASM_COMMENT_START "/"
+#define ASM_COMMENT_START "/ "
 
 /* Output to assembler file text saying following lines
    may contain character constants, extra white space, comments, etc.  */