diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 75a9e2fbb5c..09b031315af 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2011-11-15  Joseph Myers  <joseph@codesourcery.com>
+
+	* config/i386/i386elf.h (ASM_OUTPUT_ASCII): Change STRING_LIMIT to
+	ELF_STRING_LIMIT.
+
 2011-11-15  Richard Henderson  <rth@redhat.com>
 
 	* config/alpha/alpha.c (alpha_pre_atomic_barrier): New.
diff --git a/gcc/config/i386/i386elf.h b/gcc/config/i386/i386elf.h
index 1b942cba914..179c601738d 100644
--- a/gcc/config/i386/i386elf.h
+++ b/gcc/config/i386/i386elf.h
@@ -50,7 +50,7 @@ along with GCC; see the file COPYING3.  If not see
    generated assembly code more compact (and thus faster to assemble)
    as well as more readable.  Note that if we find subparts of the
    character sequence which end with NUL (and which are shorter than
-   STRING_LIMIT) we output those using ASM_OUTPUT_LIMITED_STRING.  */
+   ELF_STRING_LIMIT) we output those using ASM_OUTPUT_LIMITED_STRING.  */
 
 #undef ASM_OUTPUT_ASCII
 #define ASM_OUTPUT_ASCII(FILE, STR, LENGTH)				\
@@ -70,7 +70,7 @@ along with GCC; see the file COPYING3.  If not see
 	    }								\
 	  for (p = _ascii_bytes; p < limit && *p != '\0'; p++)		\
 	    continue;							\
-	  if (p < limit && (p - _ascii_bytes) <= (long) STRING_LIMIT)	\
+	  if (p < limit && (p - _ascii_bytes) <= (long) ELF_STRING_LIMIT) \
 	    {								\
 	      if (bytes_in_chunk > 0)					\
 		{							\