--- gcc/config/mips/svr4-5.h	2018/04/24 18:10:25	1.1.1.1
+++ gcc/config/mips/svr4-5.h	2018/04/24 18:15:50	1.1.1.2
@@ -22,7 +22,8 @@ the Free Software Foundation, 675 Mass A
 #define CPP_PREDEFINES \
 "-Dmips -Dunix -Dhost_mips -DMIPSEB -DR3000 -DSYSTYPE_SVR4 \
 -D_mips -D_unix -D_host_mips -D_MIPSEB -D_R3000 -D_SYSTYPE_SVR4 \
--D_MIPS_SZINT=32 -D_MIPS_SZLONG=32 -D_MIPS_SZPTR=32"
+-D_MIPS_SZINT=32 -D_MIPS_SZLONG=32 -D_MIPS_SZPTR=32 \
+-Asystem(unix) -Asystem(svr4) -Acpu(mips) -Amachine(mips)"
 
 #define STANDARD_INCLUDE_DIR "/svr4/usr/include"
 
@@ -32,7 +33,8 @@ the Free Software Foundation, 675 Mass A
 %{.C:	-D__LANGUAGE_C_PLUS_PLUS -D_LANGUAGE_C_PLUS_PLUS} \
 %{.m:	-D__LANGUAGE_OBJECTIVE_C -D_LANGUAGE_OBJECTIVE_C} \
 %{.S:	-D__LANGUAGE_ASSEMBLY -D_LANGUAGE_ASSEMBLY %{!ansi:-DLANGUAGE_ASSEMBLY}} \
-%{!.S:	-D__LANGUAGE_C -D_LANGUAGE_C %{!ansi:-DLANGUAGE_C}}"
+%{.s:	-D__LANGUAGE_ASSEMBLY -D_LANGUAGE_ASSEMBLY %{!ansi:-DLANGUAGE_ASSEMBLY}} \
+%{!.S:%{!.s:	-D__LANGUAGE_C -D_LANGUAGE_C %{!ansi:-DLANGUAGE_C}}}"
 
 #define LINK_SPEC "\
 %{G*} \
@@ -61,6 +63,12 @@ the Free Software Foundation, 675 Mass A
 #ifdef  L_trampoline
 #include <unistd.h>
 
+/* In at least 5.0 and 5.01, there is no _SC_PAGE_SIZE macro, only a
+   _SC_PAGESIZE macro.  */
+#ifdef _SC_PAGESIZE
+#define _SC_PAGE_SIZE _SC_PAGESIZE
+#endif
+
 #define getpagesize()	sysconf(_SC_PAGE_SIZE)
 #endif /*  L_trampoline */