diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3dcb83381042..1c616f40eb21 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-25  Richard B. Kreckel  <richard.kreckel@framatome-anp.com>
+
+	PR target/17171
+	* config/i386/gas.h (ASM_COMMENT_START): Define to "#".
+
 2004-08-25  Richard Henderson  <rth@redhat.com>
 
         * config/alpha/alpha.c (alpha_cannot_force_const_mem): New.
diff --git a/gcc/config/i386/gas.h b/gcc/config/i386/gas.h
index 9f0024310185..bf545128467c 100644
--- a/gcc/config/i386/gas.h
+++ b/gcc/config/i386/gas.h
@@ -117,4 +117,8 @@ Boston, MA 02111-1307, USA.  */
 /* Print opcodes the way that GAS expects them.  */
 #define GAS_MNEMONICS 1
 
+/* The comment-starter string as GAS expects it. */
+#undef ASM_COMMENT_START
+#define ASM_COMMENT_START "#"
+
 #define TARGET_ASM_FILE_START_FILE_DIRECTIVE true