Use C fixincludes for UnixWare 7.

Co-Authored-By: Rodney Brown <RodneyBrown@mynd.com>

From-SVN: r39771

4 files changed, 257 insertions, 50 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1c9ce2d..ec4bd1f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2001-02-16  Bruce Korb  <bkorb@gnu.org>
+            Rodney Brown  <RodneyBrown@mynd.com>
+
+	* fixinc/mkfixinc.sh: Use C fixincludes for UnixWare 7.
+	* fixinc/inclhack.def: Add fixinc.svr4 patterns with matching
+	machine restrictions
+	* fixinc/fixincl.x: regen
+
 Fri Feb 16 12:41:30 2001  Richard Kenner  <kenner@vlsi1.ultra.nyu.edu>
 
 	* cse.c (new_label_ref): New variable.
diff --git a/gcc/fixinc/fixincl.x b/gcc/fixinc/fixincl.x
index f0d2ce4..5a1f9ae 100644
--- a/gcc/fixinc/fixincl.x
+++ b/gcc/fixinc/fixincl.x
@@ -5,7 +5,7 @@
  * files which are fixed to work correctly with ANSI C and placed in a
  * directory that GNU C will search.
  *
- * This file contains 131 fixup descriptions.
+ * This file contains 134 fixup descriptions.
  *
  * See README for more information.
  *
@@ -3584,9 +3584,125 @@ static const char* apzSco_Strict_AnsiPatch[] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
+ *  Description of Strict_Ansi_Not fix
+ */
+#define STRICT_ANSI_NOT_FIXIDX           87
+tSCC zStrict_Ansi_NotName[] =
+     "strict_ansi_not";
+
+/*
+ *  File name selection pattern
+ */
+#define zStrict_Ansi_NotList (char*)NULL
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzStrict_Ansi_NotMachs[] = {
+        "*-*-sysv4*",
+        "i[34567]86-*-sysv5*",
+        "i[34567]86-*-udk*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zStrict_Ansi_NotSelect0[] =
+       "^([ \t]*#[ \t]*if.*)(!__STDC__|__STDC__[ \t]*==[ \t]*0|__STDC__[ \t]*!=[ \t]*1|__STDC__[ \t]*-[ \t]*0[ \t]*==[ \t]*0)(.*)";
+
+#define    STRICT_ANSI_NOT_TEST_CT  1
+static tTestDesc aStrict_Ansi_NotTests[] = {
+  { TT_EGREP,    zStrict_Ansi_NotSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Strict_Ansi_Not
+ */
+static const char* apzStrict_Ansi_NotPatch[] = {
+    "format",
+    "%1 !defined(__STRICT_ANSI__)%3",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Strict_Ansi_Not_Ctd fix
+ */
+#define STRICT_ANSI_NOT_CTD_FIXIDX       88
+tSCC zStrict_Ansi_Not_CtdName[] =
+     "strict_ansi_not_ctd";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zStrict_Ansi_Not_CtdList[] =
+  "|limits.h|math.h|stdio.h|signal.h|stdlib.h|time.h|";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzStrict_Ansi_Not_CtdMachs[] = {
+        "i[34567]86-*-sysv5*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zStrict_Ansi_Not_CtdSelect0[] =
+       "^([ \t]*[|&][|&][ \t(]*)(__STDC__[ \t]*-[ \t]*0[ \t]*==[ \t]*0)(.*)";
+
+#define    STRICT_ANSI_NOT_CTD_TEST_CT  1
+static tTestDesc aStrict_Ansi_Not_CtdTests[] = {
+  { TT_EGREP,    zStrict_Ansi_Not_CtdSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Strict_Ansi_Not_Ctd
+ */
+static const char* apzStrict_Ansi_Not_CtdPatch[] = {
+    "format",
+    "%1 !defined(__STRICT_ANSI__)%3",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Strict_Ansi_Only fix
+ */
+#define STRICT_ANSI_ONLY_FIXIDX          89
+tSCC zStrict_Ansi_OnlyName[] =
+     "strict_ansi_only";
+
+/*
+ *  File name selection pattern
+ */
+#define zStrict_Ansi_OnlyList (char*)NULL
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzStrict_Ansi_OnlyMachs[] = {
+        "*-*-sysv4*",
+        "i[34567]86-*-sysv5*",
+        "i[34567]86-*-udk",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zStrict_Ansi_OnlySelect0[] =
+       "^([ \t]*#[ \t]*if.*)(__STDC__[ \t]*!=[ \t]*0|__STDC__[ \t]*==[ \t]*1|__STDC__[ \t]*-[ \t]*0[ \t]*==[ \t]*1|__STDC__[ \t]*-[ \t]*0[ \t]*!=[ \t]*0)(.*)";
+
+#define    STRICT_ANSI_ONLY_TEST_CT  1
+static tTestDesc aStrict_Ansi_OnlyTests[] = {
+  { TT_EGREP,    zStrict_Ansi_OnlySelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Strict_Ansi_Only
+ */
+static const char* apzStrict_Ansi_OnlyPatch[] = {
+    "format",
+    "%1 defined(__STRICT_ANSI__)%3",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
  *  Description of Sco_Utime fix
  */
-#define SCO_UTIME_FIXIDX                 87
+#define SCO_UTIME_FIXIDX                 90
 tSCC zSco_UtimeName[] =
      "sco_utime";
 
@@ -3624,7 +3740,7 @@ static const char* apzSco_UtimePatch[] = {
  *
  *  Description of Statsswtch fix
  */
-#define STATSSWTCH_FIXIDX                88
+#define STATSSWTCH_FIXIDX                91
 tSCC zStatsswtchName[] =
      "statsswtch";
 
@@ -3660,7 +3776,7 @@ static const char* apzStatsswtchPatch[] = {
  *
  *  Description of Stdio_Stdarg_H fix
  */
-#define STDIO_STDARG_H_FIXIDX            89
+#define STDIO_STDARG_H_FIXIDX            92
 tSCC zStdio_Stdarg_HName[] =
      "stdio_stdarg_h";
 
@@ -3697,7 +3813,7 @@ static const char* apzStdio_Stdarg_HPatch[] = {
  *
  *  Description of Stdio_Va_List fix
  */
-#define STDIO_VA_LIST_FIXIDX             90
+#define STDIO_VA_LIST_FIXIDX             93
 tSCC zStdio_Va_ListName[] =
      "stdio_va_list";
 
@@ -3742,7 +3858,7 @@ s@_Va_LIST@_VA_LIST@",
  *
  *  Description of Struct_File fix
  */
-#define STRUCT_FILE_FIXIDX               91
+#define STRUCT_FILE_FIXIDX               94
 tSCC zStruct_FileName[] =
      "struct_file";
 
@@ -3779,7 +3895,7 @@ static const char* apzStruct_FilePatch[] = {
  *
  *  Description of Struct_Sockaddr fix
  */
-#define STRUCT_SOCKADDR_FIXIDX           92
+#define STRUCT_SOCKADDR_FIXIDX           95
 tSCC zStruct_SockaddrName[] =
      "struct_sockaddr";
 
@@ -3823,7 +3939,7 @@ static const char* apzStruct_SockaddrPatch[] = {
  *
  *  Description of Sun_Auth_Proto fix
  */
-#define SUN_AUTH_PROTO_FIXIDX            93
+#define SUN_AUTH_PROTO_FIXIDX            96
 tSCC zSun_Auth_ProtoName[] =
      "sun_auth_proto";
 
@@ -3864,7 +3980,7 @@ static const char* apzSun_Auth_ProtoPatch[] = {
  *
  *  Description of Sun_Bogus_Ifdef fix
  */
-#define SUN_BOGUS_IFDEF_FIXIDX           94
+#define SUN_BOGUS_IFDEF_FIXIDX           97
 tSCC zSun_Bogus_IfdefName[] =
      "sun_bogus_ifdef";
 
@@ -3900,7 +4016,7 @@ static const char* apzSun_Bogus_IfdefPatch[] = {
  *
  *  Description of Sun_Catmacro fix
  */
-#define SUN_CATMACRO_FIXIDX              95
+#define SUN_CATMACRO_FIXIDX              98
 tSCC zSun_CatmacroName[] =
      "sun_catmacro";
 
@@ -3940,7 +4056,7 @@ static const char* apzSun_CatmacroPatch[] = {
  *
  *  Description of Sun_Malloc fix
  */
-#define SUN_MALLOC_FIXIDX                96
+#define SUN_MALLOC_FIXIDX                99
 tSCC zSun_MallocName[] =
      "sun_malloc";
 
@@ -3971,7 +4087,7 @@ static const char* apzSun_MallocPatch[] = { "sed",
  *
  *  Description of Sun_Rusers_Semi fix
  */
-#define SUN_RUSERS_SEMI_FIXIDX           97
+#define SUN_RUSERS_SEMI_FIXIDX           100
 tSCC zSun_Rusers_SemiName[] =
      "sun_rusers_semi";
 
@@ -4006,7 +4122,7 @@ static const char* apzSun_Rusers_SemiPatch[] = { "sed",
  *
  *  Description of Sun_Signal fix
  */
-#define SUN_SIGNAL_FIXIDX                98
+#define SUN_SIGNAL_FIXIDX                101
 tSCC zSun_SignalName[] =
      "sun_signal";
 
@@ -4046,7 +4162,7 @@ void\t(*signal(...))(...);\n\
  *
  *  Description of Sunos_Matherr_Decl fix
  */
-#define SUNOS_MATHERR_DECL_FIXIDX        99
+#define SUNOS_MATHERR_DECL_FIXIDX        102
 tSCC zSunos_Matherr_DeclName[] =
      "sunos_matherr_decl";
 
@@ -4089,7 +4205,7 @@ static const char* apzSunos_Matherr_DeclPatch[] = {
  *
  *  Description of Sunos_Strlen fix
  */
-#define SUNOS_STRLEN_FIXIDX              100
+#define SUNOS_STRLEN_FIXIDX              103
 tSCC zSunos_StrlenName[] =
      "sunos_strlen";
 
@@ -4125,7 +4241,7 @@ static const char* apzSunos_StrlenPatch[] = {
  *
  *  Description of Svr4__P fix
  */
-#define SVR4__P_FIXIDX                   101
+#define SVR4__P_FIXIDX                   104
 tSCC zSvr4__PName[] =
      "svr4__p";
 
@@ -4163,7 +4279,7 @@ static const char* apzSvr4__PPatch[] = {
  *
  *  Description of Svr4_Getcwd fix
  */
-#define SVR4_GETCWD_FIXIDX               102
+#define SVR4_GETCWD_FIXIDX               105
 tSCC zSvr4_GetcwdName[] =
      "svr4_getcwd";
 
@@ -4199,7 +4315,7 @@ static const char* apzSvr4_GetcwdPatch[] = {
  *
  *  Description of Svr4_Profil fix
  */
-#define SVR4_PROFIL_FIXIDX               103
+#define SVR4_PROFIL_FIXIDX               106
 tSCC zSvr4_ProfilName[] =
      "svr4_profil";
 
@@ -4235,7 +4351,7 @@ static const char* apzSvr4_ProfilPatch[] = {
  *
  *  Description of Gnu_Types fix
  */
-#define GNU_TYPES_FIXIDX                 104
+#define GNU_TYPES_FIXIDX                 107
 tSCC zGnu_TypesName[] =
      "gnu_types";
 
@@ -4277,7 +4393,7 @@ static const char* apzGnu_TypesPatch[] = {
  *
  *  Description of Sysv68_String fix
  */
-#define SYSV68_STRING_FIXIDX             105
+#define SYSV68_STRING_FIXIDX             108
 tSCC zSysv68_StringName[] =
      "sysv68_string";
 
@@ -4314,7 +4430,7 @@ extern unsigned int\\\n\
  *
  *  Description of Sysz_Stdlib_For_Sun fix
  */
-#define SYSZ_STDLIB_FOR_SUN_FIXIDX       106
+#define SYSZ_STDLIB_FOR_SUN_FIXIDX       109
 tSCC zSysz_Stdlib_For_SunName[] =
      "sysz_stdlib_for_sun";
 
@@ -4350,7 +4466,7 @@ static const char* apzSysz_Stdlib_For_SunPatch[] = {
  *
  *  Description of Tinfo_Cplusplus fix
  */
-#define TINFO_CPLUSPLUS_FIXIDX           107
+#define TINFO_CPLUSPLUS_FIXIDX           110
 tSCC zTinfo_CplusplusName[] =
      "tinfo_cplusplus";
 
@@ -4386,7 +4502,7 @@ static const char* apzTinfo_CplusplusPatch[] = {
  *
  *  Description of Ultrix_Atof_Param fix
  */
-#define ULTRIX_ATOF_PARAM_FIXIDX         108
+#define ULTRIX_ATOF_PARAM_FIXIDX         111
 tSCC zUltrix_Atof_ParamName[] =
      "ultrix_atof_param";
 
@@ -4422,7 +4538,7 @@ static const char* apzUltrix_Atof_ParamPatch[] = {
  *
  *  Description of Ultrix_Const fix
  */
-#define ULTRIX_CONST_FIXIDX              109
+#define ULTRIX_CONST_FIXIDX              112
 tSCC zUltrix_ConstName[] =
      "ultrix_const";
 
@@ -4459,7 +4575,7 @@ static const char* apzUltrix_ConstPatch[] = {
  *
  *  Description of Ultrix_Const2 fix
  */
-#define ULTRIX_CONST2_FIXIDX             110
+#define ULTRIX_CONST2_FIXIDX             113
 tSCC zUltrix_Const2Name[] =
      "ultrix_const2";
 
@@ -4496,7 +4612,7 @@ static const char* apzUltrix_Const2Patch[] = {
  *
  *  Description of Ultrix_Fix_Fixproto fix
  */
-#define ULTRIX_FIX_FIXPROTO_FIXIDX       111
+#define ULTRIX_FIX_FIXPROTO_FIXIDX       114
 tSCC zUltrix_Fix_FixprotoName[] =
      "ultrix_fix_fixproto";
 
@@ -4534,7 +4650,7 @@ static const char* apzUltrix_Fix_FixprotoPatch[] = {
  *
  *  Description of Ultrix_Ifdef fix
  */
-#define ULTRIX_IFDEF_FIXIDX              112
+#define ULTRIX_IFDEF_FIXIDX              115
 tSCC zUltrix_IfdefName[] =
      "ultrix_ifdef";
 
@@ -4570,7 +4686,7 @@ static const char* apzUltrix_IfdefPatch[] = {
  *
  *  Description of Ultrix_Math_Ifdef fix
  */
-#define ULTRIX_MATH_IFDEF_FIXIDX         113
+#define ULTRIX_MATH_IFDEF_FIXIDX         116
 tSCC zUltrix_Math_IfdefName[] =
      "ultrix_math_ifdef";
 
@@ -4606,7 +4722,7 @@ static const char* apzUltrix_Math_IfdefPatch[] = {
  *
  *  Description of Ultrix_Nested_Ioctl fix
  */
-#define ULTRIX_NESTED_IOCTL_FIXIDX       114
+#define ULTRIX_NESTED_IOCTL_FIXIDX       117
 tSCC zUltrix_Nested_IoctlName[] =
      "ultrix_nested_ioctl";
 
@@ -4641,7 +4757,7 @@ static const char* apzUltrix_Nested_IoctlPatch[] = { "sed",
  *
  *  Description of Ultrix_Nested_Svc fix
  */
-#define ULTRIX_NESTED_SVC_FIXIDX         115
+#define ULTRIX_NESTED_SVC_FIXIDX         118
 tSCC zUltrix_Nested_SvcName[] =
      "ultrix_nested_svc";
 
@@ -4676,7 +4792,7 @@ static const char* apzUltrix_Nested_SvcPatch[] = { "sed",
  *
  *  Description of Ultrix_Stat fix
  */
-#define ULTRIX_STAT_FIXIDX               116
+#define ULTRIX_STAT_FIXIDX               119
 tSCC zUltrix_StatName[] =
      "ultrix_stat";
 
@@ -4717,7 +4833,7 @@ static const char* apzUltrix_StatPatch[] = { "sed",
  *
  *  Description of Ultrix_Static fix
  */
-#define ULTRIX_STATIC_FIXIDX             117
+#define ULTRIX_STATIC_FIXIDX             120
 tSCC zUltrix_StaticName[] =
      "ultrix_static";
 
@@ -4754,7 +4870,7 @@ static const char* apzUltrix_StaticPatch[] = { "sed",
  *
  *  Description of Ultrix_Strings fix
  */
-#define ULTRIX_STRINGS_FIXIDX            118
+#define ULTRIX_STRINGS_FIXIDX            121
 tSCC zUltrix_StringsName[] =
      "ultrix_strings";
 
@@ -4789,7 +4905,7 @@ static const char* apzUltrix_StringsPatch[] = {
  *
  *  Description of Undefine_Null fix
  */
-#define UNDEFINE_NULL_FIXIDX             119
+#define UNDEFINE_NULL_FIXIDX             122
 tSCC zUndefine_NullName[] =
      "undefine_null";
 
@@ -4835,7 +4951,7 @@ static const char* apzUndefine_NullPatch[] = {
  *
  *  Description of Uw7_Byteorder_Fix fix
  */
-#define UW7_BYTEORDER_FIX_FIXIDX         120
+#define UW7_BYTEORDER_FIX_FIXIDX         123
 tSCC zUw7_Byteorder_FixName[] =
      "uw7_byteorder_fix";
 
@@ -4886,7 +5002,7 @@ static const char* apzUw7_Byteorder_FixPatch[] = {
  *
  *  Description of Va_I960_Macro fix
  */
-#define VA_I960_MACRO_FIXIDX             121
+#define VA_I960_MACRO_FIXIDX             124
 tSCC zVa_I960_MacroName[] =
      "va_i960_macro";
 
@@ -4922,7 +5038,7 @@ static const char* apzVa_I960_MacroPatch[] = {
  *
  *  Description of Void_Null fix
  */
-#define VOID_NULL_FIXIDX                 122
+#define VOID_NULL_FIXIDX                 125
 tSCC zVoid_NullName[] =
      "void_null";
 
@@ -4958,7 +5074,7 @@ static const char* apzVoid_NullPatch[] = {
  *
  *  Description of Vxworks_Gcc_Problem fix
  */
-#define VXWORKS_GCC_PROBLEM_FIXIDX       123
+#define VXWORKS_GCC_PROBLEM_FIXIDX       126
 tSCC zVxworks_Gcc_ProblemName[] =
      "vxworks_gcc_problem";
 
@@ -5008,7 +5124,7 @@ static const char* apzVxworks_Gcc_ProblemPatch[] = { "sed",
  *
  *  Description of Vxworks_Needs_Vxtypes fix
  */
-#define VXWORKS_NEEDS_VXTYPES_FIXIDX     124
+#define VXWORKS_NEEDS_VXTYPES_FIXIDX     127
 tSCC zVxworks_Needs_VxtypesName[] =
      "vxworks_needs_vxtypes";
 
@@ -5044,7 +5160,7 @@ static const char* apzVxworks_Needs_VxtypesPatch[] = {
  *
  *  Description of Vxworks_Needs_Vxworks fix
  */
-#define VXWORKS_NEEDS_VXWORKS_FIXIDX     125
+#define VXWORKS_NEEDS_VXWORKS_FIXIDX     128
 tSCC zVxworks_Needs_VxworksName[] =
      "vxworks_needs_vxworks";
 
@@ -5093,7 +5209,7 @@ static const char* apzVxworks_Needs_VxworksPatch[] = { "sed",
  *
  *  Description of Vxworks_Time fix
  */
-#define VXWORKS_TIME_FIXIDX              126
+#define VXWORKS_TIME_FIXIDX              129
 tSCC zVxworks_TimeName[] =
      "vxworks_time";
 
@@ -5144,7 +5260,7 @@ typedef void (*__gcc_VOIDFUNCPTR) ();\n\
  *
  *  Description of X11_Class fix
  */
-#define X11_CLASS_FIXIDX                 127
+#define X11_CLASS_FIXIDX                 130
 tSCC zX11_ClassName[] =
      "x11_class";
 
@@ -5191,7 +5307,7 @@ static const char* apzX11_ClassPatch[] = {
  *
  *  Description of X11_Class_Usage fix
  */
-#define X11_CLASS_USAGE_FIXIDX           128
+#define X11_CLASS_USAGE_FIXIDX           131
 tSCC zX11_Class_UsageName[] =
      "x11_class_usage";
 
@@ -5234,7 +5350,7 @@ static const char* apzX11_Class_UsagePatch[] = {
  *
  *  Description of X11_New fix
  */
-#define X11_NEW_FIXIDX                   129
+#define X11_NEW_FIXIDX                   132
 tSCC zX11_NewName[] =
      "x11_new";
 
@@ -5275,7 +5391,7 @@ static const char* apzX11_NewPatch[] = { "sed",
  *
  *  Description of X11_Sprintf fix
  */
-#define X11_SPRINTF_FIXIDX               130
+#define X11_SPRINTF_FIXIDX               133
 tSCC zX11_SprintfName[] =
      "x11_sprintf";
 
@@ -5314,9 +5430,9 @@ static const char* apzX11_SprintfPatch[] = {
  *
  *  List of all fixes
  */
-#define REGEX_COUNT          136
+#define REGEX_COUNT          139
 #define MACH_LIST_SIZE_LIMIT 279
-#define FIX_COUNT            131
+#define FIX_COUNT            134
 
 tFixDesc fixDescList[ FIX_COUNT ] = {
   {  zAaa_Ki_IfaceName,    zAaa_Ki_IfaceList,
@@ -5754,6 +5870,21 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      SCO_STRICT_ANSI_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aSco_Strict_AnsiTests,   apzSco_Strict_AnsiPatch, 0 },
 
+  {  zStrict_Ansi_NotName,    zStrict_Ansi_NotList,
+     apzStrict_Ansi_NotMachs,
+     STRICT_ANSI_NOT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aStrict_Ansi_NotTests,   apzStrict_Ansi_NotPatch, 0 },
+
+  {  zStrict_Ansi_Not_CtdName,    zStrict_Ansi_Not_CtdList,
+     apzStrict_Ansi_Not_CtdMachs,
+     STRICT_ANSI_NOT_CTD_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aStrict_Ansi_Not_CtdTests,   apzStrict_Ansi_Not_CtdPatch, 0 },
+
+  {  zStrict_Ansi_OnlyName,    zStrict_Ansi_OnlyList,
+     apzStrict_Ansi_OnlyMachs,
+     STRICT_ANSI_ONLY_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aStrict_Ansi_OnlyTests,   apzStrict_Ansi_OnlyPatch, 0 },
+
   {  zSco_UtimeName,    zSco_UtimeList,
      apzSco_UtimeMachs,
      SCO_UTIME_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
diff --git a/gcc/fixinc/inclhack.def b/gcc/fixinc/inclhack.def
index 4033275..53a764c 100644
--- a/gcc/fixinc/inclhack.def
+++ b/gcc/fixinc/inclhack.def
@@ -1918,6 +1918,76 @@ fix = {
     test_text = "#if !__STDC__ /* not standard C */\nint foo;\n#endif";
 };
 
+/*
+ *  "!__STDC__" or "__STDC__==0" or "__STDC__!=1" or "__STDC__-0==0"
+ *  is "!defined( __STRICT_ANSI__ )"
+ */
+fix = {
+    hackname = strict_ansi_not;
+    mach="*-*-sysv4*";
+    mach="i[34567]86-*-sysv5*";
+    mach="i[34567]86-*-udk*";
+    select   = "^([ \t]*#[ \t]*if.*)"
+               "(!__STDC__"
+               "|__STDC__[ \t]*==[ \t]*0"
+               "|__STDC__[ \t]*!=[ \t]*1"
+               "|__STDC__[ \t]*-[ \t]*0[ \t]*==[ \t]*0"
+               ")(.*)";
+
+    c_fix     = format;
+    c_fix_arg = "%1 !defined(__STRICT_ANSI__)%3";
+
+    test_text = "#if !__STDC__ || __STDC__ == 0 || __STDC__ != 1"
+               "|| __STDC__ - 0 == 0"
+               "/* not std C */\nint foo;\n#endif";
+};
+
+/*
+ *  "__STDC__-0==0"
+ *  is "!defined( __STRICT_ANSI__ )" on continued #if-s
+ */
+fix = {
+    hackname = strict_ansi_not_ctd;
+    files="limits.h";
+    files="math.h";
+    files="stdio.h";
+    files="signal.h";
+    files="stdlib.h";
+    files="time.h";
+    mach="i[34567]86-*-sysv5*";
+    select   = "^([ \t]*[|&][|&][ \t(]*)"
+               "(__STDC__[ \t]*-[ \t]*0[ \t]*==[ \t]*0"
+               ")(.*)";
+
+    c_fix     = format;
+    c_fix_arg = "%1 !defined(__STRICT_ANSI__)%3";
+
+    test_text = "#if 1\\\n"
+               "|| __STDC__ - 0 == 0 /* not std C */\nint foo;\n#endif";
+};
+
+/*
+ *  "__STDC__!=0" or "__STDC__==1" or "__STDC__-0==1"
+ *  is "defined( __STRICT_ANSI__ )"
+ */
+fix = {
+    hackname = strict_ansi_only;
+    mach="*-*-sysv4*";
+    mach="i[34567]86-*-sysv5*";
+    mach="i[34567]86-*-udk";
+    select   = "^([ \t]*#[ \t]*if.*)"
+               "(__STDC__[ \t]*!=[ \t]*0"
+               "|__STDC__[ \t]*==[ \t]*1"
+               "|__STDC__[ \t]*-[ \t]*0[ \t]*==[ \t]*1"
+               "|__STDC__[ \t]*-[ \t]*0[ \t]*!=[ \t]*0"
+               ")(.*)";
+
+    c_fix     = format;
+    c_fix_arg = "%1 defined(__STRICT_ANSI__)%3";
+
+    test_text = "#if __STDC__ == 1 /* is std C\n */\nint foo;\n#endif";
+};
+
 
 /*
  *  Fix prototype declaration of utime in sys/times.h.
diff --git a/gcc/fixinc/mkfixinc.sh b/gcc/fixinc/mkfixinc.sh
index f353d5e..29567bd 100755
--- a/gcc/fixinc/mkfixinc.sh
+++ b/gcc/fixinc/mkfixinc.sh
@@ -35,9 +35,7 @@ esac
 
 # Check for special fix rules for particular targets
 case $machine in
-	*-*-sysv4* | \
-	i?86-*-sysv5* | \
-	i?86-*-udk*)
+	*-*-sysv4* )
 		fixincludes=fixinc.svr4
 		;;