From c9febe1567dbd540fb648f408c257a1a090cef16 Mon Sep 17 00:00:00 2001
From: Dimitrios Apostolou <jimis@gmx.net>
Date: Sat, 12 Nov 2011 21:40:07 +0000
Subject: [PATCH] re PR bootstrap/51094 (Bootstrap failure at revision 181279
 on non-ELF targets)

	PR bootstrap/51094
	* config/elfos.h (STRING_ASM_OP): Define.
	* varasm.c (default_elf_asm_output_limited_string): Use it.

From-SVN: r181327
---
 gcc/ChangeLog      | 4 ++++
 gcc/config/elfos.h | 2 ++
 gcc/varasm.c       | 3 ++-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e9aa80a77882..f3e745fcb5e3 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,9 @@
 2011-11-12  Dimitrios Apostolou  <jimis@gmx.net>
 
+	PR bootstrap/51094
+	* config/elfos.h (STRING_ASM_OP): Define.
+	* varasm.c (default_elf_asm_output_limited_string): Use it.
+
 	PR bootstrap/51094
 	* gcc/configure.ac: Check for stpcpy declaration.
 	* system.h: Declare it if not.
diff --git a/gcc/config/elfos.h b/gcc/config/elfos.h
index 424720244393..0d883ea0dd7d 100644
--- a/gcc/config/elfos.h
+++ b/gcc/config/elfos.h
@@ -402,6 +402,8 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 
 #define ELF_STRING_LIMIT	((unsigned) 256)
 
+#define STRING_ASM_OP	"\t.string\t"
+
 /* The routine used to output NUL terminated strings.  We use a special
    version of this for most svr4 targets because doing so makes the
    generated assembly code more compact (and thus faster to assemble)
diff --git a/gcc/varasm.c b/gcc/varasm.c
index b35484602213..34cc50928a7e 100644
--- a/gcc/varasm.c
+++ b/gcc/varasm.c
@@ -7528,7 +7528,8 @@ default_elf_asm_output_limited_string (FILE *f, const char *s)
   int escape;
   unsigned char c;
 
-  fputs ("\t.string\t\"", f);
+  fputs (STRING_ASM_OP, f);
+  putc ('"', f);
   while (*s != '\0')
     {
       c = *s;