--- gcc/config/i386/sco4.h	2018/04/24 18:16:56	1.1.1.2
+++ gcc/config/i386/sco4.h	2018/04/24 18:30:52	1.1.1.4
@@ -1,6 +1,6 @@
 /* Definitions for Intel 386 running SCO Unix System V 3.2 Version 4.
    Written by Chip Salzenberg.
-   Copyright (C) 1992 Free Software Foundation, Inc.
+   Copyright (C) 1992, 1994 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
 
@@ -16,7 +16,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.  */
 
 
 /* Mostly it's like earlier SCO UNIX.  */
@@ -61,21 +62,25 @@ the Free Software Foundation, 675 Mass A
    Specify predefined symbols in preprocessor.  */
 
 #undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-Di386 -Dunix -Asystem(unix) -Asystem(svr3) -Acpu(i386) -Amachine(i386)"
+#define CPP_PREDEFINES \
+ "-Asystem(unix) -Asystem(svr3) -Acpu(i386) -Amachine(i386)"
 
 #undef CPP_SPEC
 #define CPP_SPEC \
- "-D_M_I386 -D_M_I86 -D_M_I86SM -D_M_SDATA -D_M_STEXT \
-  -D_M_UNIX -D_M_XENIX \
+ "-D_i386 -D_M_I386 -D_M_I86 -D_M_I86SM -D_M_SDATA -D_M_STEXT \
+  -D_unix -D_M_UNIX -D_M_XENIX \
   -D_M_SYS5 -D_M_SYSV -D_M_SYS3 -D_M_SYSIII \
   -D_M_COFF -D_M_BITFIELDS -D_M_WORDSWAP \
   %{scoxpg3:-D_XOPEN_SOURCE -D_STRICT_NAMES} \
   %{!scoxpg3:%{posix:-D_POSIX_SOURCE -D_STRICT_NAMES}} \
   %{!scoxpg3:%{!posix:\
     %{ansi:-D_STRICT_NAMES}%{!ansi:\
-    -DM_I386 -DM_I86 -DM_I86SM -DM_SDATA -DM_STEXT \
-    -DM_UNIX -DM_XENIX \
+    -Di386 -DM_I386 -DM_I86 -DM_I86SM -DM_SDATA -DM_STEXT \
+    -Dunix -DM_UNIX -DM_XENIX \
     -DM_SYS5 -DM_SYSV -DM_SYS3 -DM_SYSIII \
     -DM_COFF -DM_BITFIELDS -DM_WORDSWAP \
     %{scointl:-D_M_INTERNAT -DM_INTERNAT} \
     %{traditional:-D_KR -D_SVID -D_NO_PROTOTYPE}}}}"
+
+/* The system headers are C++-aware.  */
+#define NO_IMPLICIT_EXTERN_C