diff --git a/gcc/config/elxsi/elxsi.h b/gcc/config/elxsi/elxsi.h
index dec91f57a96..c09e2c059ef 100644
--- a/gcc/config/elxsi/elxsi.h
+++ b/gcc/config/elxsi/elxsi.h
@@ -727,7 +727,10 @@ enum reg_class { NO_REGS, GENERAL_REGS, ALL_REGS, LIM_REG_CLASSES };
 
 /* Output the name of the file we are compiling.  */
 #define ASM_OUTPUT_SOURCE_FILENAME(STREAM, NAME) \
-    fprintf(STREAM, "\t.file\t\"%s\"\n", NAME);
+  do {	fprintf (STREAM, "\t.file\t");			\
+	output_quoted_string (STREAM, NAME);		\
+	fprintf (STREAM, "\n");				\
+  } while (0)
 
 /* Output at beginning of assembler file.  */
 #define ASM_FILE_START(FILE) fprintf (FILE, "");
diff --git a/gcc/config/m68k/3b1.h b/gcc/config/m68k/3b1.h
index 348de250b37..e5b9dc032c7 100644
--- a/gcc/config/m68k/3b1.h
+++ b/gcc/config/m68k/3b1.h
@@ -181,7 +181,10 @@ do { long l;					\
 /* The beginnings of sdb support... */
 
 #define ASM_OUTPUT_SOURCE_FILENAME(FILE, FILENAME) \
-  fprintf (FILE, "\tfile\t\"%s\"\n", FILENAME)
+  do {	fprintf (FILE, "\tfile\t");		\
+	output_quoted_string (FILE, FILENAME);	\
+	fprintf (FILE, "\n");			\
+  } while (0)
 
 #define ASM_OUTPUT_SOURCE_LINE(FILE, LINENO)	\
   fprintf (FILE, "\tln\t%d\n",			\
diff --git a/gcc/config/m68k/crds.h b/gcc/config/m68k/crds.h
index f0e0131ec67..3d7cfaaf04a 100644
--- a/gcc/config/m68k/crds.h
+++ b/gcc/config/m68k/crds.h
@@ -460,7 +460,10 @@ do { long l[2];						\
     }}
 
 #define ASM_OUTPUT_SOURCE_FILENAME(FILE, FILENAME) \
-  fprintf (FILE, "\t; file\t\"%s\"\n", FILENAME)
+  do {	fprintf (FILE, "\t; file\t");			\
+	output_quoted_string (FILE, FILENAME);		\
+	fprintf (FILE, "\n");				\
+  } while (0)
 
 #define ASM_OUTPUT_SOURCE_LINE(FILE, LINENO)	\
   fprintf (FILE, "\t; ln\t%d\n",			\
diff --git a/gcc/config/m68k/mot3300.h b/gcc/config/m68k/mot3300.h
index d1c31c5d4df..b949dc0caea 100644
--- a/gcc/config/m68k/mot3300.h
+++ b/gcc/config/m68k/mot3300.h
@@ -386,7 +386,10 @@ do { long l;					\
 
 #undef ASM_OUTPUT_SOURCE_FILENAME
 #define ASM_OUTPUT_SOURCE_FILENAME(FILE, FILENAME) \
-  fprintf (FILE, "\tfile\t\"%s\"\n", FILENAME)
+  do {	fprintf (FILE, "\tfile\t");		\
+	output_quoted_string (FILE, FILENAME);	\
+	fprintf (FILE, "\n");			\
+  } while (0)
 
 #undef ASM_OUTPUT_SOURCE_LINE
 #define ASM_OUTPUT_SOURCE_LINE(FILE, LINENO)	\
diff --git a/gcc/config/m68k/tower-as.h b/gcc/config/m68k/tower-as.h
index ed1f0bf6dee..caa4c2a4365 100644
--- a/gcc/config/m68k/tower-as.h
+++ b/gcc/config/m68k/tower-as.h
@@ -71,7 +71,9 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #define ASM_OUTPUT_SOURCE_FILENAME(FILE, FILENAME) \
   do {						   \
-    fprintf (FILE, "\tfile\t\"%s\"\n", FILENAME);  \
+    fprintf (FILE, "\tfile\t");			   \
+    output_quoted_string (FILE, FILENAME);	   \
+    fprintf (FILE, "\n");			   \
     fprintf (FILE, "section ~init,\"x\"\n");	   \
     fprintf (FILE, "section ~fini,\"x\"\n");	   \
     fprintf (FILE, "section ~rodata,\"x\"\n");   \
diff --git a/gcc/config/m88k/m88k.h b/gcc/config/m88k/m88k.h
index 8573f1a62e1..30ca9a77489 100644
--- a/gcc/config/m88k/m88k.h
+++ b/gcc/config/m88k/m88k.h
@@ -1819,7 +1819,10 @@ enum reg_class { NO_REGS, AP_REG, XRF_REGS, GENERAL_REGS, AGRF_REGS,
 #undef	ASM_FILE_END
 
 #define ASM_OUTPUT_SOURCE_FILENAME(FILE, NAME) \
-  fprintf (FILE, "\t%s\t \"%s\"\n", FILE_ASM_OP, NAME)
+  do {	fprintf (FILE, "\t%s\t ", FILE_ASM_OP);			\
+	output_quoted_string (FILE, NAME);			\
+	fprintf (FILE, "\n");					\
+  } while (0)
 
 #ifdef SDB_DEBUGGING_INFO
 #define ASM_OUTPUT_SOURCE_LINE(FILE, LINE)			\
diff --git a/gcc/dwarfout.c b/gcc/dwarfout.c
index a4b128a7b19..1300afd937e 100644
--- a/gcc/dwarfout.c
+++ b/gcc/dwarfout.c
@@ -578,7 +578,10 @@ static unsigned lookup_filename ();
 
 #ifndef ASM_OUTPUT_SOURCE_FILENAME
 #define ASM_OUTPUT_SOURCE_FILENAME(FILE,NAME) \
-  fprintf ((FILE), "\t%s\t\"%s\"\n", FILE_ASM_OP, NAME)
+  do {	fprintf (FILE, "\t%s\t", FILE_ASM_OP);				\
+	output_quoted_string (FILE, NAME);				\
+	fputc ('\n', FILE);						\
+  } while (0)
 #endif
 
 #ifndef ASM_OUTPUT_DEF