diff mbox

Fix x86-elf build

Message ID Pine.LNX.4.64.1111160022110.12426@digraph.polyomino.org.uk
State New
Headers show

Commit Message

Joseph Myers Nov. 16, 2011, 12:23 a.m. UTC 
config/i386/i386elf.h wasn't updated for the change of STRING_LIMIT to 
ELF_STRING_LIMIT, so breaking builds for i?86-elf.  I've committed this 
patch as obvious to fix this.  Tested building cc1 and xgcc for cross to 
i686-elf.

Comments

Joseph Myers Nov. 16, 2011, 1:06 a.m. UTC | #1 
I should add: I don't know any reason why this target should need its own 
ASM_OUTPUT_ASCII definition (instead of the default ELF version) at all, 
but haven't tried removing the definition.
diff mbox

Patch

Index: gcc/ChangeLog
===================================================================
--- gcc/ChangeLog	(revision 181399)
+++ gcc/ChangeLog	(working copy)
@@ -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.
Index: gcc/config/i386/i386elf.h
===================================================================
--- gcc/config/i386/i386elf.h	(revision 181399)
+++ gcc/config/i386/i386elf.h	(working copy)
@@ -50,7 +50,7 @@ 
    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 @@ 
 	    }								\
 	  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)					\
 		{							\