--- gcc/config/sparc/sol2.h	2018/04/24 18:10:24	1.1
+++ gcc/config/sparc/sol2.h	2018/04/24 18:15:08	1.1.1.2
@@ -24,12 +24,13 @@ the Free Software Foundation, 675 Mass A
 
 #undef CPP_PREDEFINES
 #define CPP_PREDEFINES \
- "-Dsun -Dsparc -Dunix -D__svr4__ -Asystem(unix) -Acpu(sparc) -Amachine(sparc)\
+ "-Dsun -Dsparc -Dunix -D__svr4__ \
+  -Asystem(unix) -Asystem(svr4) -Acpu(sparc) -Amachine(sparc)\
   -D__GCC_NEW_VARARGS__"
 
 #undef CPP_SPEC
 #define CPP_SPEC "\
-   %{compat-bsd:-iwithprefix ucbinclude -idirafter /usr/ucbinclude}\
+   %{compat-bsd:-iwithprefixbefore ucbinclude -I/usr/ucbinclude}\
    %{msparclite:-D__sparclite__} %{mv8:-D__sparc_v8__}"
 
 /* The sun bundled assembler doesn't accept -Yd, (and neither does gas).
@@ -224,3 +225,9 @@ do {									\
    || (CHAR) == 'A' \
    || (CHAR) == 'h' \
    || (CHAR) == 'z')
+
+/* ??? This does not work in SunOS 4.x, so it is not enabled in sparc.h.
+   Instead, it is enabled here, because it does work under Solaris.  */
+/* Define for support of TFmode long double and REAL_ARITHMETIC.
+   Sparc ABI says that long double is 4 words.  */
+#define LONG_DOUBLE_TYPE_SIZE 128