--- gcc/config/i860/fx2800.h	2018/04/24 18:10:24	1.1
+++ gcc/config/i860/fx2800.h	2018/04/24 18:28:43	1.1.1.3
@@ -19,7 +19,8 @@ GNU General Public License for more deta
 
 You should have received a copy of the GNU General Public License
 along with GNU CC; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 #define OUTPUT_TDESC
 
@@ -176,14 +177,17 @@ the Free Software Foundation, 675 Mass A
 #endif
 
 #define DBX_OUTPUT_MAIN_SOURCE_FILENAME(file,name)		\
-	fprintf (file, ".stab \"%s\",.Ltext0,0x%x,0,0\n",	\
-		name, N_SO);					\
+	fprintf (file, ".stab ");				\
+	output_quoted_string (file, name);			\
+	fprintf (file, ",.Ltext0,0x%x,0,0\n", N_SO);		\
 	text_section ();					\
 	ASM_OUTPUT_INTERNAL_LABEL (file, "Ltext", 0)
 
 #define DBX_OUTPUT_SOURCE_FILENAME(file,name)			\
-	fprintf (file, ".stab \"%s\",.Ltext0,0x%x,0,0\n",	\
-		name, N_SOL);
+  do {	fprintf (file, ".stab ");				\
+	output_quoted_string (file, name);			\
+	fprintf (file, ",.Ltext0,0x%x,0,0\n", N_SOL);		\
+  } while (0)
 
 #define DBX_OUTPUT_CONSTANT_SYMBOL(file,name,ival)		\
 	fprintf (file, ".stab \"%s:c=i%d\",0,0x%x,0,0\n",	\
@@ -266,7 +270,7 @@ the Free Software Foundation, 675 Mass A
    the i860 running Concentrix 2.x.  */
 
 #undef CPP_PREDEFINES 
-#define CPP_PREDEFINES "-Di860 -Dunix -DBSD4_3 -Dalliant -Asystem(unix) -Acpu(i860) -Amachine(i860)"
+#define CPP_PREDEFINES "-Di860 -Dunix -DBSD4_3 -Dalliant -Asystem(unix) -Asystem(bsd) -Acpu(i860) -Amachine(i860)"
 
 #undef I860_REG_PREFIX
 #undef ASM_COMMENT_START