--- gcc/config/elxsi/elxsi.h	2018/04/24 18:10:24	1.1.1.1
+++ gcc/config/elxsi/elxsi.h	2018/04/24 18:15:06	1.1.1.2
@@ -23,7 +23,7 @@ the Free Software Foundation, 675 Mass A
 
 /* Names to predefine in the preprocessor for this target machine.  */
 
-#define CPP_PREDEFINES "-Delxsi -Dunix"
+#define CPP_PREDEFINES "-Delxsi -Dunix -Asystem(unix) -Acpu(elxsi) -Amachine(elxsi)"
 
 /* Print subsidiary information on the compiler version in use.  */
 
@@ -727,7 +727,10 @@ enum reg_class { NO_REGS, GENERAL_REGS,
 
 /* 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, "");