--- gcc/config/m88k/dgux.h	2018/04/24 18:10:23	1.1.1.1
+++ gcc/config/m88k/dgux.h	2018/04/24 18:14:04	1.1.1.2
@@ -28,6 +28,9 @@ the Free Software Foundation, 675 Mass A
 #define SDB_DEBUGGING_INFO
 #define PREFERRED_DEBUGGING_TYPE \
   (GET_VERSION_0300_SYNTAX ? DWARF_DEBUG : SDB_DEBUG)
+/* This controls a bug fix in cp-decl.c.
+   For version 2.6, someone should figure out the right condition.  */
+#define RMS_QUICK_HACK_1
 
 #ifndef NO_BUGS
 #define AS_BUG_IMMEDIATE_LABEL
@@ -70,7 +73,7 @@ the Free Software Foundation, 675 Mass A
 
 #undef	CPP_PREDEFINES
 #define CPP_PREDEFINES "-Dm88000 -Dm88k -Dunix -DDGUX -D__CLASSIFY_TYPE__=2\
-   -D__svr4__ -Asystem(unix) -Acpu(m88k) -Amachine(m88k)"
+   -D__svr4__ -Asystem(unix) -Asystem(svr4) -Acpu(m88k) -Amachine(m88k)"
 
 /* If -m88100 is in effect, add -Dm88100; similarly for -m88110.
    Here, the CPU_DEFAULT is assumed to be -m88000.  If not -ansi,
@@ -107,7 +110,7 @@ the Free Software Foundation, 675 Mass A
    When the -G link option is used (-shared and -symbolic) a final link is
    not being done.  */
 #undef	LIB_SPEC
-#define LIB_SPEC "%{!shared:%{!symbolic:-lc}} crtend.o%s"
+#define LIB_SPEC "%{msvr4:%{!shared:-lstaticdgc}} %{!shared:%{!symbolic:-lc}} crtend.o%s"
 #undef	LINK_SPEC
 #define LINK_SPEC "%{z*} %{h*} %{V} %{v:%{!V:-V}} \
 		   %{static:-dn -Bstatic} \
@@ -122,9 +125,6 @@ the Free Software Foundation, 675 Mass A
 			  %{!ansi:%{traditional:/lib/values-Xt.o} \
 			   %{!traditional:/usr/lib/values-Xa.o}}}}}"
 
-#undef	GPLUSPLUS_INCLUDE_DIR
-#define GPLUSPLUS_INCLUDE_DIR "/usr/opt/g++/lib/g++-include"
-
 /* Fast DG/UX version of profiler that does not require lots of
    registers to be stored.  */
 #undef	FUNCTION_PROFILER