From 8aeb3b0e4c171a9712da93c41f1dfe226b4e9bf9 Mon Sep 17 00:00:00 2001
From: Bruce Korb <autogen@linuxbox.com>
Date: Mon, 22 Nov 1999 15:05:48 +0000
Subject: [PATCH] __FD_ZERO fixes for gnu libc1&2

From-SVN: r30613
---
 gcc/ChangeLog           |  17 ++
 gcc/fixinc/fixincl.sh   |   2 +-
 gcc/fixinc/fixincl.x    | 377 ++++++++++++++++++++++++++++------------
 gcc/fixinc/inclhack.def | 175 ++++++++++++++-----
 gcc/fixinc/inclhack.sh  | 296 ++++++++++++++++++++-----------
 gcc/fixinc/mkfixinc.sh  |   7 +-
 6 files changed, 610 insertions(+), 264 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index abec23f5f6c..bfba8e00f43 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,20 @@
+1999-11-22  Bruce Korb  <autogen@linuxbox.com
+
+	* fixinc/mkfisinc.sh(i?86-*-linux): disable script, run fixincl exe
+	(mips-dec-bsd*): non-functional code
+	(alpha*-*-linux-gnu*): redundant, duplicated by "*-*-linux-gnu*"
+
+	* fixinc/inclhack.def(AAB_fd_zero_glibc_*):
+	added three replacement fixes
+	(no_double_slash): removed comments that are not (any longer) pertinent
+	(bad_lval): this fix currently runs against many files.
+	The comment seems to indicate that we should select for files
+	containing 'pragma extern_prefix'.
+
+	* fixinc/inclhack.sh:  regen
+	* fixinc/fixincl.x:  regen
+	* fixinc/fixincl.sh:  regen
+
 Fri Nov 12 14:08:40 1999  Andrew Haley  <aph@cygnus.com>
 
 	* emit-rtl.c (gen_sequence): Only return the pattern of an insn if
diff --git a/gcc/fixinc/fixincl.sh b/gcc/fixinc/fixincl.sh
index 2f29c5cd59b..ed4649b38cb 100755
--- a/gcc/fixinc/fixincl.sh
+++ b/gcc/fixinc/fixincl.sh
@@ -6,7 +6,7 @@
 # files which are fixed to work correctly with ANSI C and placed in a
 # directory that GNU C will search.
 #
-# This script contains 109 fixup scripts.
+# This script contains 112 fixup scripts.
 #
 # See README-fixinc for more information.
 #
diff --git a/gcc/fixinc/fixincl.x b/gcc/fixinc/fixincl.x
index 91b364bae75..8b001be4e91 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 109 fixup descriptions.
+ * This file contains 112 fixup descriptions.
  *
  * See README-fixinc for more information.
  *
@@ -311,11 +311,149 @@ typedef char * va_list;\n\
 #endif /*  #ifndef __INT_VARARGS_H  */\n",
     (char*)NULL };
 
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Aab_Fd_Zero_Glibc_1_0 fix
+ */
+#define AAB_FD_ZERO_GLIBC_1_0_FIXIDX     7
+tSCC zAab_Fd_Zero_Glibc_1_0Name[] =
+     "Aab_Fd_Zero_Glibc_1_0";
+/*
+ *  File name selection pattern
+ */
+tSCC zAab_Fd_Zero_Glibc_1_0List[] =
+  "|asm/posix_types.h|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzAab_Fd_Zero_Glibc_1_0Machs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zAab_Fd_Zero_Glibc_1_0Select0[] =
+       "i[34567]86-*-linux-gnu*";
+
+#define    AAB_FD_ZERO_GLIBC_1_0_TEST_CT  1
+#define    AAB_FD_ZERO_GLIBC_1_0_RE_CT    1
+tTestDesc aAab_Fd_Zero_Glibc_1_0Tests[] = {
+  { TT_EGREP,    zAab_Fd_Zero_Glibc_1_0Select0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Aab_Fd_Zero_Glibc_1_0
+ */
+const char* apzAab_Fd_Zero_Glibc_1_0Patch[] = {
+"/* This file fixes __FD_ZERO bug for glibc-1.x. */\n\
+#ifndef _POSIX_TYPES_H_WRAPPER\n\
+#include <features.h>\n\
+#include_next <asm/posix_types.h>\n\
+\n\
+#if defined(__FD_ZERO) && !defined(__GLIBC__)\n\
+#undef __FD_ZERO\n\
+#define __FD_ZERO(fdsetp)   do {     int __d0, __d1; \t\t__asm__ __volatile__(\"cld ; rep ; stosl\" \t\t\t: \"=&c\" (__d0), \"=&D\" (__d1) \t\t\t: \"a\" (0), \"0\" (__FDSET_LONGS), \t\t\t  \"1\" ((__kernel_fd_set *) (fdsetp)) :\"memory\");   } while (0)\n\
+#endif\n\
+\n\
+#define _POSIX_TYPES_H_WRAPPER\n\
+#endif /* _POSIX_TYPES_H_WRAPPER */\n",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Aab_Fd_Zero_Glibc_1_X fix
+ */
+#define AAB_FD_ZERO_GLIBC_1_X_FIXIDX     8
+tSCC zAab_Fd_Zero_Glibc_1_XName[] =
+     "Aab_Fd_Zero_Glibc_1_X";
+/*
+ *  File name selection pattern
+ */
+tSCC zAab_Fd_Zero_Glibc_1_XList[] =
+  "|gnu/types.h|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzAab_Fd_Zero_Glibc_1_XMachs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zAab_Fd_Zero_Glibc_1_XSelect0[] =
+       "i[34567]86-*-linux-gnu*";
+
+#define    AAB_FD_ZERO_GLIBC_1_X_TEST_CT  1
+#define    AAB_FD_ZERO_GLIBC_1_X_RE_CT    1
+tTestDesc aAab_Fd_Zero_Glibc_1_XTests[] = {
+  { TT_EGREP,    zAab_Fd_Zero_Glibc_1_XSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Aab_Fd_Zero_Glibc_1_X
+ */
+const char* apzAab_Fd_Zero_Glibc_1_XPatch[] = {
+"/* This file fixes __FD_ZERO bug for glibc-1.x. */\n\
+#ifndef _TYPES_H_WRAPPER\n\
+#include <features.h>\n\
+#include_next <gnu/types.h>\n\
+\n\
+#if defined(__FD_ZERO) && !defined(__GLIBC__)\n\
+#undef __FD_ZERO\n\
+# define __FD_ZERO(fdsetp)   do {     int __d0, __d1; \t__asm__ __volatile__(\"cld ; rep ; stosl\"         \t: \"=&c\" (__d0), \"=&D\" (__d1)         \t: \"a\" (0), \"0\" (__FDSET_LONGS), \t\t  \"1\" ((__fd_set *) (fdsetp)) :\"memory\");   } while (0)\n\
+#endif\n\
+\n\
+#define _TYPES_H_WRAPPER\n\
+#endif /* _TYPES_H_WRAPPER */\n",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Aab_Fd_Zero_Glibc_2_0 fix
+ */
+#define AAB_FD_ZERO_GLIBC_2_0_FIXIDX     9
+tSCC zAab_Fd_Zero_Glibc_2_0Name[] =
+     "Aab_Fd_Zero_Glibc_2_0";
+/*
+ *  File name selection pattern
+ */
+tSCC zAab_Fd_Zero_Glibc_2_0List[] =
+  "|selectbits.h|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzAab_Fd_Zero_Glibc_2_0Machs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zAab_Fd_Zero_Glibc_2_0Select0[] =
+       "i[34567]86-*-linux-gnu*";
+
+#define    AAB_FD_ZERO_GLIBC_2_0_TEST_CT  1
+#define    AAB_FD_ZERO_GLIBC_2_0_RE_CT    1
+tTestDesc aAab_Fd_Zero_Glibc_2_0Tests[] = {
+  { TT_EGREP,    zAab_Fd_Zero_Glibc_2_0Select0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Aab_Fd_Zero_Glibc_2_0
+ */
+const char* apzAab_Fd_Zero_Glibc_2_0Patch[] = {
+"/* This file fixes __FD_ZERO bug for glibc-2.0.x. */\n\
+#ifndef _SELECTBITS_H_WRAPPER\n\
+#include <features.h>\n\
+#include_next <selectbits.h>\n\
+\n\
+#if defined(__FD_ZERO) && defined(__GLIBC__) \t&& defined(__GLIBC_MINOR__) && __GLIBC__ == 2 \t&& __GLIBC_MINOR__ == 0\n\
+#undef __FD_ZERO\n\
+#define __FD_ZERO(fdsetp)   do {     int __d0, __d1;   __asm__ __volatile__ (\"cld; rep; stosl\"                         : \"=&c\" (__d0), \"=&D\" (__d1)                         : \"a\" (0), \"0\" (sizeof (__fd_set)                                         / sizeof (__fd_mask)),                           \"1\" ((__fd_mask *) (fdsetp))                         : \"memory\");   } while (0)\n\
+#endif\n\
+\n\
+#define _SELECTBITS_H_WRAPPER\n\
+#endif /* _SELECTBITS_H_WRAPPER */\n",
+    (char*)NULL };
+
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  Description of Aab_Svr4_Replace_Byteorder fix
  */
-#define AAB_SVR4_REPLACE_BYTEORDER_FIXIDX 7
+#define AAB_SVR4_REPLACE_BYTEORDER_FIXIDX 10
 tSCC zAab_Svr4_Replace_ByteorderName[] =
      "Aab_Svr4_Replace_Byteorder";
 /*
@@ -489,7 +627,7 @@ ntohs (unsigned int __arg)\n\
  *
  *  Description of Aix_Syswait fix
  */
-#define AIX_SYSWAIT_FIXIDX               8
+#define AIX_SYSWAIT_FIXIDX               11
 tSCC zAix_SyswaitName[] =
      "Aix_Syswait";
 /*
@@ -525,7 +663,7 @@ struct rusage;\n",
  *
  *  Description of Aix_Volatile fix
  */
-#define AIX_VOLATILE_FIXIDX              9
+#define AIX_VOLATILE_FIXIDX              12
 tSCC zAix_VolatileName[] =
      "Aix_Volatile";
 /*
@@ -560,7 +698,7 @@ const char* apzAix_VolatilePatch[] = { "sed",
  *
  *  Description of Alpha_Getopt fix
  */
-#define ALPHA_GETOPT_FIXIDX              10
+#define ALPHA_GETOPT_FIXIDX              13
 tSCC zAlpha_GetoptName[] =
      "Alpha_Getopt";
 /*
@@ -595,7 +733,7 @@ const char* apzAlpha_GetoptPatch[] = { "sed",
  *
  *  Description of Alpha_Parens fix
  */
-#define ALPHA_PARENS_FIXIDX              11
+#define ALPHA_PARENS_FIXIDX              14
 tSCC zAlpha_ParensName[] =
      "Alpha_Parens";
 /*
@@ -630,7 +768,7 @@ const char* apzAlpha_ParensPatch[] = { "sed",
  *
  *  Description of Alpha_Sbrk fix
  */
-#define ALPHA_SBRK_FIXIDX                12
+#define ALPHA_SBRK_FIXIDX                15
 tSCC zAlpha_SbrkName[] =
      "Alpha_Sbrk";
 /*
@@ -665,7 +803,7 @@ const char* apzAlpha_SbrkPatch[] = { "sed",
  *
  *  Description of Arm_Norcroft_Hint fix
  */
-#define ARM_NORCROFT_HINT_FIXIDX         13
+#define ARM_NORCROFT_HINT_FIXIDX         16
 tSCC zArm_Norcroft_HintName[] =
      "Arm_Norcroft_Hint";
 /*
@@ -700,7 +838,7 @@ const char* apzArm_Norcroft_HintPatch[] = { "sed",
  *
  *  Description of Arm_Wchar fix
  */
-#define ARM_WCHAR_FIXIDX                 14
+#define ARM_WCHAR_FIXIDX                 17
 tSCC zArm_WcharName[] =
      "Arm_Wchar";
 /*
@@ -736,7 +874,7 @@ const char* apzArm_WcharPatch[] = { "sed",
  *
  *  Description of Aux_Asm fix
  */
-#define AUX_ASM_FIXIDX                   15
+#define AUX_ASM_FIXIDX                   18
 tSCC zAux_AsmName[] =
      "Aux_Asm";
 /*
@@ -771,7 +909,7 @@ const char* apzAux_AsmPatch[] = { "sed",
  *
  *  Description of Avoid_Bool fix
  */
-#define AVOID_BOOL_FIXIDX                16
+#define AVOID_BOOL_FIXIDX                19
 tSCC zAvoid_BoolName[] =
      "Avoid_Bool";
 /*
@@ -817,7 +955,7 @@ const char* apzAvoid_BoolPatch[] = { "sed",
  *
  *  Description of Bad_Struct_Term fix
  */
-#define BAD_STRUCT_TERM_FIXIDX           17
+#define BAD_STRUCT_TERM_FIXIDX           20
 tSCC zBad_Struct_TermName[] =
      "Bad_Struct_Term";
 /*
@@ -852,7 +990,7 @@ const char* apzBad_Struct_TermPatch[] = { "sed",
  *
  *  Description of Badquote fix
  */
-#define BADQUOTE_FIXIDX                  18
+#define BADQUOTE_FIXIDX                  21
 tSCC zBadquoteName[] =
      "Badquote";
 /*
@@ -879,7 +1017,7 @@ const char* apzBadquotePatch[] = { "sed",
  *
  *  Description of Bad_Lval fix
  */
-#define BAD_LVAL_FIXIDX                  19
+#define BAD_LVAL_FIXIDX                  22
 tSCC zBad_LvalName[] =
      "Bad_Lval";
 /*
@@ -891,9 +1029,17 @@ tSCC zBad_LvalList[] =
  *  Machine/OS name selection pattern
  */
 #define apzBad_LvalMachs (const char**)NULL
-#define BAD_LVAL_TEST_CT  0
-#define BAD_LVAL_RE_CT    0
-#define aBad_LvalTests   (tTestDesc*)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zBad_LvalSelect0[] =
+       "^[ \t]*#[ \t]*pragma[ \t][ \t]*extern_prefix";
+
+#define    BAD_LVAL_TEST_CT  1
+#define    BAD_LVAL_RE_CT    1
+tTestDesc aBad_LvalTests[] = {
+  { TT_EGREP,    zBad_LvalSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Bad_Lval
@@ -906,7 +1052,7 @@ const char* apzBad_LvalPatch[] = { "sed",
  *
  *  Description of Broken_Assert_Stdio fix
  */
-#define BROKEN_ASSERT_STDIO_FIXIDX       20
+#define BROKEN_ASSERT_STDIO_FIXIDX       23
 tSCC zBroken_Assert_StdioName[] =
      "Broken_Assert_Stdio";
 /*
@@ -949,7 +1095,7 @@ const char* apzBroken_Assert_StdioPatch[] = { "sed",
  *
  *  Description of Broken_Assert_Stdlib fix
  */
-#define BROKEN_ASSERT_STDLIB_FIXIDX      21
+#define BROKEN_ASSERT_STDLIB_FIXIDX      24
 tSCC zBroken_Assert_StdlibName[] =
      "Broken_Assert_Stdlib";
 /*
@@ -994,7 +1140,7 @@ const char* apzBroken_Assert_StdlibPatch[] = { "sed",
  *
  *  Description of Bsd43_Io_Macros fix
  */
-#define BSD43_IO_MACROS_FIXIDX           22
+#define BSD43_IO_MACROS_FIXIDX           25
 tSCC zBsd43_Io_MacrosName[] =
      "Bsd43_Io_Macros";
 /*
@@ -1029,7 +1175,7 @@ const char* apzBsd43_Io_MacrosPatch[] = { "sed",
  *
  *  Description of Dec_Intern_Asm fix
  */
-#define DEC_INTERN_ASM_FIXIDX            23
+#define DEC_INTERN_ASM_FIXIDX            26
 tSCC zDec_Intern_AsmName[] =
      "Dec_Intern_Asm";
 /*
@@ -1059,7 +1205,7 @@ const char* apzDec_Intern_AsmPatch[] = { "sed",
  *
  *  Description of No_Double_Slash fix
  */
-#define NO_DOUBLE_SLASH_FIXIDX           24
+#define NO_DOUBLE_SLASH_FIXIDX           27
 tSCC zNo_Double_SlashName[] =
      "No_Double_Slash";
 /*
@@ -1091,7 +1237,7 @@ const char* apzNo_Double_SlashPatch[] = {"no_double_slash",
  *
  *  Description of Ecd_Cursor fix
  */
-#define ECD_CURSOR_FIXIDX                25
+#define ECD_CURSOR_FIXIDX                28
 tSCC zEcd_CursorName[] =
      "Ecd_Cursor";
 /*
@@ -1118,7 +1264,7 @@ const char* apzEcd_CursorPatch[] = { "sed",
  *
  *  Description of Sco5_Stat_Wrappers fix
  */
-#define SCO5_STAT_WRAPPERS_FIXIDX        26
+#define SCO5_STAT_WRAPPERS_FIXIDX        29
 tSCC zSco5_Stat_WrappersName[] =
      "Sco5_Stat_Wrappers";
 /*
@@ -1155,7 +1301,7 @@ extern \"C\"\\\n\
  *
  *  Description of End_Else_Label fix
  */
-#define END_ELSE_LABEL_FIXIDX            27
+#define END_ELSE_LABEL_FIXIDX            30
 tSCC zEnd_Else_LabelName[] =
      "End_Else_Label";
 /*
@@ -1187,7 +1333,7 @@ const char* apzEnd_Else_LabelPatch[] = {"else_endif_label",
  *
  *  Description of Hp_Inline fix
  */
-#define HP_INLINE_FIXIDX                 28
+#define HP_INLINE_FIXIDX                 31
 tSCC zHp_InlineName[] =
      "Hp_Inline";
 /*
@@ -1223,7 +1369,7 @@ const char* apzHp_InlinePatch[] = { "sed",
  *
  *  Description of Hp_Sysfile fix
  */
-#define HP_SYSFILE_FIXIDX                29
+#define HP_SYSFILE_FIXIDX                32
 tSCC zHp_SysfileName[] =
      "Hp_Sysfile";
 /*
@@ -1258,7 +1404,7 @@ const char* apzHp_SysfilePatch[] = { "sed",
  *
  *  Description of Cxx_Unready fix
  */
-#define CXX_UNREADY_FIXIDX               30
+#define CXX_UNREADY_FIXIDX               33
 tSCC zCxx_UnreadyName[] =
      "Cxx_Unready";
 /*
@@ -1301,7 +1447,7 @@ extern \"C\" {\\\n\
  *
  *  Description of Hpux_Maxint fix
  */
-#define HPUX_MAXINT_FIXIDX               31
+#define HPUX_MAXINT_FIXIDX               34
 tSCC zHpux_MaxintName[] =
      "Hpux_Maxint";
 /*
@@ -1331,7 +1477,7 @@ const char* apzHpux_MaxintPatch[] = { "sed",
  *
  *  Description of Hpux_Systime fix
  */
-#define HPUX_SYSTIME_FIXIDX              32
+#define HPUX_SYSTIME_FIXIDX              35
 tSCC zHpux_SystimeName[] =
      "Hpux_Systime";
 /*
@@ -1366,7 +1512,7 @@ const char* apzHpux_SystimePatch[] = { "sed",
  *
  *  Description of Hpux11_Uint32_C fix
  */
-#define HPUX11_UINT32_C_FIXIDX           33
+#define HPUX11_UINT32_C_FIXIDX           36
 tSCC zHpux11_Uint32_CName[] =
      "Hpux11_Uint32_C";
 /*
@@ -1401,7 +1547,7 @@ const char* apzHpux11_Uint32_CPatch[] = { "sed",
  *
  *  Description of Interactv_Add1 fix
  */
-#define INTERACTV_ADD1_FIXIDX            34
+#define INTERACTV_ADD1_FIXIDX            37
 tSCC zInteractv_Add1Name[] =
      "Interactv_Add1";
 /*
@@ -1439,7 +1585,7 @@ const char* apzInteractv_Add1Patch[] = { "sed",
  *
  *  Description of Interactv_Add2 fix
  */
-#define INTERACTV_ADD2_FIXIDX            35
+#define INTERACTV_ADD2_FIXIDX            38
 tSCC zInteractv_Add2Name[] =
      "Interactv_Add2";
 /*
@@ -1477,7 +1623,7 @@ const char* apzInteractv_Add2Patch[] = { "sed",
  *
  *  Description of Interactv_Add3 fix
  */
-#define INTERACTV_ADD3_FIXIDX            36
+#define INTERACTV_ADD3_FIXIDX            39
 tSCC zInteractv_Add3Name[] =
      "Interactv_Add3";
 /*
@@ -1516,7 +1662,7 @@ const char* apzInteractv_Add3Patch[] = { "sed",
  *
  *  Description of Io_Def_Quotes fix
  */
-#define IO_DEF_QUOTES_FIXIDX             37
+#define IO_DEF_QUOTES_FIXIDX             40
 tSCC zIo_Def_QuotesName[] =
      "Io_Def_Quotes";
 /*
@@ -1553,7 +1699,7 @@ const char* apzIo_Def_QuotesPatch[] = { "sed",
  *
  *  Description of Ioctl_Fix_Ctrl fix
  */
-#define IOCTL_FIX_CTRL_FIXIDX            38
+#define IOCTL_FIX_CTRL_FIXIDX            41
 tSCC zIoctl_Fix_CtrlName[] =
      "Ioctl_Fix_Ctrl";
 /*
@@ -1592,7 +1738,7 @@ const char* apzIoctl_Fix_CtrlPatch[] = { "sed",
  *
  *  Description of Ip_Missing_Semi fix
  */
-#define IP_MISSING_SEMI_FIXIDX           39
+#define IP_MISSING_SEMI_FIXIDX           42
 tSCC zIp_Missing_SemiName[] =
      "Ip_Missing_Semi";
 /*
@@ -1619,7 +1765,7 @@ const char* apzIp_Missing_SemiPatch[] = { "sed",
  *
  *  Description of Irix_Multiline_Cmnt fix
  */
-#define IRIX_MULTILINE_CMNT_FIXIDX       40
+#define IRIX_MULTILINE_CMNT_FIXIDX       43
 tSCC zIrix_Multiline_CmntName[] =
      "Irix_Multiline_Cmnt";
 /*
@@ -1647,7 +1793,7 @@ const char* apzIrix_Multiline_CmntPatch[] = { "sed",
  *
  *  Description of Irix_Sockaddr fix
  */
-#define IRIX_SOCKADDR_FIXIDX             41
+#define IRIX_SOCKADDR_FIXIDX             44
 tSCC zIrix_SockaddrName[] =
      "Irix_Sockaddr";
 /*
@@ -1683,7 +1829,7 @@ struct sockaddr;\n",
  *
  *  Description of Irix_Struct__File fix
  */
-#define IRIX_STRUCT__FILE_FIXIDX         42
+#define IRIX_STRUCT__FILE_FIXIDX         45
 tSCC zIrix_Struct__FileName[] =
      "Irix_Struct__File";
 /*
@@ -1711,7 +1857,7 @@ struct __file_s;\n",
  *
  *  Description of Irix_Asm_Apostrophe fix
  */
-#define IRIX_ASM_APOSTROPHE_FIXIDX       43
+#define IRIX_ASM_APOSTROPHE_FIXIDX       46
 tSCC zIrix_Asm_ApostropheName[] =
      "Irix_Asm_Apostrophe";
 /*
@@ -1746,7 +1892,7 @@ const char* apzIrix_Asm_ApostrophePatch[] = { "sed",
  *
  *  Description of Isc_Fmod fix
  */
-#define ISC_FMOD_FIXIDX                  44
+#define ISC_FMOD_FIXIDX                  47
 tSCC zIsc_FmodName[] =
      "Isc_Fmod";
 /*
@@ -1781,7 +1927,7 @@ const char* apzIsc_FmodPatch[] = { "sed",
  *
  *  Description of Motorola_Nested fix
  */
-#define MOTOROLA_NESTED_FIXIDX           45
+#define MOTOROLA_NESTED_FIXIDX           48
 tSCC zMotorola_NestedName[] =
      "Motorola_Nested";
 /*
@@ -1811,7 +1957,7 @@ const char* apzMotorola_NestedPatch[] = { "sed",
  *
  *  Description of Isc_Sys_Limits fix
  */
-#define ISC_SYS_LIMITS_FIXIDX            46
+#define ISC_SYS_LIMITS_FIXIDX            49
 tSCC zIsc_Sys_LimitsName[] =
      "Isc_Sys_Limits";
 /*
@@ -1847,7 +1993,7 @@ const char* apzIsc_Sys_LimitsPatch[] = { "sed",
  *
  *  Description of Kandr_Concat fix
  */
-#define KANDR_CONCAT_FIXIDX              47
+#define KANDR_CONCAT_FIXIDX              50
 tSCC zKandr_ConcatName[] =
      "Kandr_Concat";
 /*
@@ -1882,7 +2028,7 @@ const char* apzKandr_ConcatPatch[] = { "sed",
  *
  *  Description of Limits_Ifndefs fix
  */
-#define LIMITS_IFNDEFS_FIXIDX            48
+#define LIMITS_IFNDEFS_FIXIDX            51
 tSCC zLimits_IfndefsName[] =
      "Limits_Ifndefs";
 /*
@@ -1941,7 +2087,7 @@ const char* apzLimits_IfndefsPatch[] = { "sed",
  *
  *  Description of Lynx_Void_Int fix
  */
-#define LYNX_VOID_INT_FIXIDX             49
+#define LYNX_VOID_INT_FIXIDX             52
 tSCC zLynx_Void_IntName[] =
      "Lynx_Void_Int";
 /*
@@ -1976,7 +2122,7 @@ const char* apzLynx_Void_IntPatch[] = { "sed",
  *
  *  Description of Lynxos_Fcntl_Proto fix
  */
-#define LYNXOS_FCNTL_PROTO_FIXIDX        50
+#define LYNXOS_FCNTL_PROTO_FIXIDX        53
 tSCC zLynxos_Fcntl_ProtoName[] =
      "Lynxos_Fcntl_Proto";
 /*
@@ -2011,7 +2157,7 @@ const char* apzLynxos_Fcntl_ProtoPatch[] = { "sed",
  *
  *  Description of M88k_Bad_Hypot_Opt fix
  */
-#define M88K_BAD_HYPOT_OPT_FIXIDX        51
+#define M88K_BAD_HYPOT_OPT_FIXIDX        54
 tSCC zM88k_Bad_Hypot_OptName[] =
      "M88k_Bad_Hypot_Opt";
 /*
@@ -2053,7 +2199,7 @@ static __inline__ double fake_hypot (x, y)\\\n\
  *
  *  Description of M88k_Bad_S_If fix
  */
-#define M88K_BAD_S_IF_FIXIDX             52
+#define M88K_BAD_S_IF_FIXIDX             55
 tSCC zM88k_Bad_S_IfName[] =
      "M88k_Bad_S_If";
 /*
@@ -2091,7 +2237,7 @@ const char* apzM88k_Bad_S_IfPatch[] = { "sed",
  *
  *  Description of M88k_Multi_Incl fix
  */
-#define M88K_MULTI_INCL_FIXIDX           53
+#define M88K_MULTI_INCL_FIXIDX           56
 tSCC zM88k_Multi_InclName[] =
      "M88k_Multi_Incl";
 /*
@@ -2133,7 +2279,7 @@ const char* apzM88k_Multi_InclPatch[] = { "sh", "-c",
  *
  *  Description of Machine_Name fix
  */
-#define MACHINE_NAME_FIXIDX              54
+#define MACHINE_NAME_FIXIDX              57
 tSCC zMachine_NameName[] =
      "Machine_Name";
 /*
@@ -2203,7 +2349,7 @@ s/\\\\+++fixinc_eol+++/\\\\/g\n\
  *
  *  Description of Math_Exception fix
  */
-#define MATH_EXCEPTION_FIXIDX            55
+#define MATH_EXCEPTION_FIXIDX            58
 tSCC zMath_ExceptionName[] =
      "Math_Exception";
 /*
@@ -2253,7 +2399,7 @@ const char* apzMath_ExceptionPatch[] = { "sed",
  *
  *  Description of Math_Gcc_Ifndefs fix
  */
-#define MATH_GCC_IFNDEFS_FIXIDX          56
+#define MATH_GCC_IFNDEFS_FIXIDX          59
 tSCC zMath_Gcc_IfndefsName[] =
      "Math_Gcc_Ifndefs";
 /*
@@ -2292,7 +2438,7 @@ const char* apzMath_Gcc_IfndefsPatch[] = { "sh", "-c",
  *
  *  Description of Nested_Comment fix
  */
-#define NESTED_COMMENT_FIXIDX            57
+#define NESTED_COMMENT_FIXIDX            60
 tSCC zNested_CommentName[] =
      "Nested_Comment";
 /*
@@ -2319,7 +2465,7 @@ const char* apzNested_CommentPatch[] = { "sed",
  *
  *  Description of News_Os_Recursion fix
  */
-#define NEWS_OS_RECURSION_FIXIDX         58
+#define NEWS_OS_RECURSION_FIXIDX         61
 tSCC zNews_Os_RecursionName[] =
      "News_Os_Recursion";
 /*
@@ -2357,7 +2503,7 @@ const char* apzNews_Os_RecursionPatch[] = { "sed",
  *
  *  Description of Next_Math_Prefix fix
  */
-#define NEXT_MATH_PREFIX_FIXIDX          59
+#define NEXT_MATH_PREFIX_FIXIDX          62
 tSCC zNext_Math_PrefixName[] =
      "Next_Math_Prefix";
 /*
@@ -2396,7 +2542,7 @@ const char* apzNext_Math_PrefixPatch[] = { "sed",
  *
  *  Description of Next_Template fix
  */
-#define NEXT_TEMPLATE_FIXIDX             60
+#define NEXT_TEMPLATE_FIXIDX             63
 tSCC zNext_TemplateName[] =
      "Next_Template";
 /*
@@ -2432,7 +2578,7 @@ const char* apzNext_TemplatePatch[] = { "sed",
  *
  *  Description of Next_Volitile fix
  */
-#define NEXT_VOLITILE_FIXIDX             61
+#define NEXT_VOLITILE_FIXIDX             64
 tSCC zNext_VolitileName[] =
      "Next_Volitile";
 /*
@@ -2468,7 +2614,7 @@ const char* apzNext_VolitilePatch[] = { "sed",
  *
  *  Description of Next_Wait_Union fix
  */
-#define NEXT_WAIT_UNION_FIXIDX           62
+#define NEXT_WAIT_UNION_FIXIDX           65
 tSCC zNext_Wait_UnionName[] =
      "Next_Wait_Union";
 /*
@@ -2503,7 +2649,7 @@ const char* apzNext_Wait_UnionPatch[] = { "sed",
  *
  *  Description of Nodeent_Syntax fix
  */
-#define NODEENT_SYNTAX_FIXIDX            63
+#define NODEENT_SYNTAX_FIXIDX            66
 tSCC zNodeent_SyntaxName[] =
      "Nodeent_Syntax";
 /*
@@ -2530,7 +2676,7 @@ const char* apzNodeent_SyntaxPatch[] = { "sed",
  *
  *  Description of Osf_Namespace_A fix
  */
-#define OSF_NAMESPACE_A_FIXIDX           64
+#define OSF_NAMESPACE_A_FIXIDX           67
 tSCC zOsf_Namespace_AName[] =
      "Osf_Namespace_A";
 /*
@@ -2576,7 +2722,7 @@ const char* apzOsf_Namespace_APatch[] = { "sed",
  *
  *  Description of Osf_Namespace_B fix
  */
-#define OSF_NAMESPACE_B_FIXIDX           65
+#define OSF_NAMESPACE_B_FIXIDX           68
 tSCC zOsf_Namespace_BName[] =
      "Osf_Namespace_B";
 /*
@@ -2623,7 +2769,7 @@ typedef __regmatch_t\tregmatch_t;\n",
  *
  *  Description of Pthread_Page_Size fix
  */
-#define PTHREAD_PAGE_SIZE_FIXIDX         66
+#define PTHREAD_PAGE_SIZE_FIXIDX         69
 tSCC zPthread_Page_SizeName[] =
      "Pthread_Page_Size";
 /*
@@ -2658,7 +2804,7 @@ const char* apzPthread_Page_SizePatch[] = { "sed",
  *
  *  Description of Read_Ret_Type fix
  */
-#define READ_RET_TYPE_FIXIDX             67
+#define READ_RET_TYPE_FIXIDX             70
 tSCC zRead_Ret_TypeName[] =
      "Read_Ret_Type";
 /*
@@ -2694,7 +2840,7 @@ const char* apzRead_Ret_TypePatch[] = { "sed",
  *
  *  Description of Rs6000_Double fix
  */
-#define RS6000_DOUBLE_FIXIDX             68
+#define RS6000_DOUBLE_FIXIDX             71
 tSCC zRs6000_DoubleName[] =
      "Rs6000_Double";
 /*
@@ -2732,7 +2878,7 @@ const char* apzRs6000_DoublePatch[] = { "sed",
  *
  *  Description of Rs6000_Fchmod fix
  */
-#define RS6000_FCHMOD_FIXIDX             69
+#define RS6000_FCHMOD_FIXIDX             72
 tSCC zRs6000_FchmodName[] =
      "Rs6000_Fchmod";
 /*
@@ -2767,7 +2913,7 @@ const char* apzRs6000_FchmodPatch[] = { "sed",
  *
  *  Description of Rs6000_Param fix
  */
-#define RS6000_PARAM_FIXIDX              70
+#define RS6000_PARAM_FIXIDX              73
 tSCC zRs6000_ParamName[] =
      "Rs6000_Param";
 /*
@@ -2794,7 +2940,7 @@ const char* apzRs6000_ParamPatch[] = { "sed",
  *
  *  Description of Sony_Include fix
  */
-#define SONY_INCLUDE_FIXIDX              71
+#define SONY_INCLUDE_FIXIDX              74
 tSCC zSony_IncludeName[] =
      "Sony_Include";
 /*
@@ -2829,7 +2975,7 @@ const char* apzSony_IncludePatch[] = { "sed",
  *
  *  Description of Statsswtch fix
  */
-#define STATSSWTCH_FIXIDX                72
+#define STATSSWTCH_FIXIDX                75
 tSCC zStatsswtchName[] =
      "Statsswtch";
 /*
@@ -2864,7 +3010,7 @@ const char* apzStatsswtchPatch[] = { "sed",
  *
  *  Description of Stdio_Va_List fix
  */
-#define STDIO_VA_LIST_FIXIDX             73
+#define STDIO_VA_LIST_FIXIDX             76
 tSCC zStdio_Va_ListName[] =
      "Stdio_Va_List";
 /*
@@ -2908,7 +3054,7 @@ const char* apzStdio_Va_ListPatch[] = { "sh", "-c",
  *
  *  Description of Sun_Bogus_Ifdef fix
  */
-#define SUN_BOGUS_IFDEF_FIXIDX           74
+#define SUN_BOGUS_IFDEF_FIXIDX           77
 tSCC zSun_Bogus_IfdefName[] =
      "Sun_Bogus_Ifdef";
 /*
@@ -2943,7 +3089,7 @@ const char* apzSun_Bogus_IfdefPatch[] = { "sed",
  *
  *  Description of Sun_Bogus_Ifdef_Sun4c fix
  */
-#define SUN_BOGUS_IFDEF_SUN4C_FIXIDX     75
+#define SUN_BOGUS_IFDEF_SUN4C_FIXIDX     78
 tSCC zSun_Bogus_Ifdef_Sun4cName[] =
      "Sun_Bogus_Ifdef_Sun4c";
 /*
@@ -2978,7 +3124,7 @@ const char* apzSun_Bogus_Ifdef_Sun4cPatch[] = { "sed",
  *
  *  Description of Sun_Catmacro fix
  */
-#define SUN_CATMACRO_FIXIDX              76
+#define SUN_CATMACRO_FIXIDX              79
 tSCC zSun_CatmacroName[] =
      "Sun_Catmacro";
 /*
@@ -3018,7 +3164,7 @@ const char* apzSun_CatmacroPatch[] = { "sed",
  *
  *  Description of Sun_Malloc fix
  */
-#define SUN_MALLOC_FIXIDX                77
+#define SUN_MALLOC_FIXIDX                80
 tSCC zSun_MallocName[] =
      "Sun_Malloc";
 /*
@@ -3048,7 +3194,7 @@ const char* apzSun_MallocPatch[] = { "sed",
  *
  *  Description of Sun_Memcpy fix
  */
-#define SUN_MEMCPY_FIXIDX                78
+#define SUN_MEMCPY_FIXIDX                81
 tSCC zSun_MemcpyName[] =
      "Sun_Memcpy";
 /*
@@ -3103,7 +3249,7 @@ extern int memcmp();\\\n\
  *
  *  Description of Sun_Rusers_Semi fix
  */
-#define SUN_RUSERS_SEMI_FIXIDX           79
+#define SUN_RUSERS_SEMI_FIXIDX           82
 tSCC zSun_Rusers_SemiName[] =
      "Sun_Rusers_Semi";
 /*
@@ -3138,7 +3284,7 @@ const char* apzSun_Rusers_SemiPatch[] = { "sed",
  *
  *  Description of Sun_Signal fix
  */
-#define SUN_SIGNAL_FIXIDX                80
+#define SUN_SIGNAL_FIXIDX                83
 tSCC zSun_SignalName[] =
      "Sun_Signal";
 /*
@@ -3178,7 +3324,7 @@ void\t(*signal(...))(...);\\\n\
  *
  *  Description of Sun_Auth_Proto fix
  */
-#define SUN_AUTH_PROTO_FIXIDX            81
+#define SUN_AUTH_PROTO_FIXIDX            84
 tSCC zSun_Auth_ProtoName[] =
      "Sun_Auth_Proto";
 /*
@@ -3218,7 +3364,7 @@ const char* apzSun_Auth_ProtoPatch[] = { "sed",
  *
  *  Description of Sunos_Matherr_Decl fix
  */
-#define SUNOS_MATHERR_DECL_FIXIDX        82
+#define SUNOS_MATHERR_DECL_FIXIDX        85
 tSCC zSunos_Matherr_DeclName[] =
      "Sunos_Matherr_Decl";
 /*
@@ -3247,7 +3393,7 @@ struct exception;\n",
  *
  *  Description of Sunos_Strlen fix
  */
-#define SUNOS_STRLEN_FIXIDX              83
+#define SUNOS_STRLEN_FIXIDX              86
 tSCC zSunos_StrlenName[] =
      "Sunos_Strlen";
 /*
@@ -3274,7 +3420,7 @@ const char* apzSunos_StrlenPatch[] = { "sed",
  *
  *  Description of Systypes fix
  */
-#define SYSTYPES_FIXIDX                  84
+#define SYSTYPES_FIXIDX                  87
 tSCC zSystypesName[] =
      "Systypes";
 /*
@@ -3333,7 +3479,7 @@ typedef __SIZE_TYPE__ size_t;\\\n\
  *
  *  Description of Systypes_For_Aix fix
  */
-#define SYSTYPES_FOR_AIX_FIXIDX          85
+#define SYSTYPES_FOR_AIX_FIXIDX          88
 tSCC zSystypes_For_AixName[] =
      "Systypes_For_Aix";
 /*
@@ -3379,7 +3525,7 @@ const char* apzSystypes_For_AixPatch[] = { "sed",
  *
  *  Description of Sysv68_String fix
  */
-#define SYSV68_STRING_FIXIDX             86
+#define SYSV68_STRING_FIXIDX             89
 tSCC zSysv68_StringName[] =
      "Sysv68_String";
 /*
@@ -3416,7 +3562,7 @@ extern unsigned int\\\n\
  *
  *  Description of Sysz_Stdlib_For_Sun fix
  */
-#define SYSZ_STDLIB_FOR_SUN_FIXIDX       87
+#define SYSZ_STDLIB_FOR_SUN_FIXIDX       90
 tSCC zSysz_Stdlib_For_SunName[] =
      "Sysz_Stdlib_For_Sun";
 /*
@@ -3454,7 +3600,7 @@ const char* apzSysz_Stdlib_For_SunPatch[] = { "sed",
  *
  *  Description of Sysz_Stdtypes_For_Sun fix
  */
-#define SYSZ_STDTYPES_FOR_SUN_FIXIDX     88
+#define SYSZ_STDTYPES_FOR_SUN_FIXIDX     91
 tSCC zSysz_Stdtypes_For_SunName[] =
      "Sysz_Stdtypes_For_Sun";
 /*
@@ -3495,7 +3641,7 @@ const char* apzSysz_Stdtypes_For_SunPatch[] = { "sed",
  *
  *  Description of Tinfo_Cplusplus fix
  */
-#define TINFO_CPLUSPLUS_FIXIDX           89
+#define TINFO_CPLUSPLUS_FIXIDX           92
 tSCC zTinfo_CplusplusName[] =
      "Tinfo_Cplusplus";
 /*
@@ -3522,7 +3668,7 @@ const char* apzTinfo_CplusplusPatch[] = { "sed",
  *
  *  Description of Ultrix_Ansi_Compat fix
  */
-#define ULTRIX_ANSI_COMPAT_FIXIDX        90
+#define ULTRIX_ANSI_COMPAT_FIXIDX        93
 tSCC zUltrix_Ansi_CompatName[] =
      "Ultrix_Ansi_Compat";
 /*
@@ -3559,7 +3705,7 @@ const char* apzUltrix_Ansi_CompatPatch[] = { "sed",
  *
  *  Description of Ultrix_Fix_Fixproto fix
  */
-#define ULTRIX_FIX_FIXPROTO_FIXIDX       91
+#define ULTRIX_FIX_FIXPROTO_FIXIDX       94
 tSCC zUltrix_Fix_FixprotoName[] =
      "Ultrix_Fix_Fixproto";
 /*
@@ -3595,7 +3741,7 @@ struct utsname;\n",
  *
  *  Description of Ultrix_Atof_Param fix
  */
-#define ULTRIX_ATOF_PARAM_FIXIDX         92
+#define ULTRIX_ATOF_PARAM_FIXIDX         95
 tSCC zUltrix_Atof_ParamName[] =
      "Ultrix_Atof_Param";
 /*
@@ -3626,7 +3772,7 @@ const char* apzUltrix_Atof_ParamPatch[] = { "sed",
  *
  *  Description of Ultrix_Const fix
  */
-#define ULTRIX_CONST_FIXIDX              93
+#define ULTRIX_CONST_FIXIDX              96
 tSCC zUltrix_ConstName[] =
      "Ultrix_Const";
 /*
@@ -3661,7 +3807,7 @@ const char* apzUltrix_ConstPatch[] = { "sed",
  *
  *  Description of Ultrix_Ifdef fix
  */
-#define ULTRIX_IFDEF_FIXIDX              94
+#define ULTRIX_IFDEF_FIXIDX              97
 tSCC zUltrix_IfdefName[] =
      "Ultrix_Ifdef";
 /*
@@ -3696,7 +3842,7 @@ const char* apzUltrix_IfdefPatch[] = { "sed",
  *
  *  Description of Ultrix_Nested_Cmnt fix
  */
-#define ULTRIX_NESTED_CMNT_FIXIDX        95
+#define ULTRIX_NESTED_CMNT_FIXIDX        98
 tSCC zUltrix_Nested_CmntName[] =
      "Ultrix_Nested_Cmnt";
 /*
@@ -3723,7 +3869,7 @@ const char* apzUltrix_Nested_CmntPatch[] = { "sed",
  *
  *  Description of Ultrix_Static fix
  */
-#define ULTRIX_STATIC_FIXIDX             96
+#define ULTRIX_STATIC_FIXIDX             99
 tSCC zUltrix_StaticName[] =
      "Ultrix_Static";
 /*
@@ -3760,7 +3906,7 @@ const char* apzUltrix_StaticPatch[] = { "sed",
  *
  *  Description of Undefine_Null fix
  */
-#define UNDEFINE_NULL_FIXIDX             97
+#define UNDEFINE_NULL_FIXIDX             100
 tSCC zUndefine_NullName[] =
      "Undefine_Null";
 /*
@@ -3802,7 +3948,7 @@ const char* apzUndefine_NullPatch[] = { "sed",
  *
  *  Description of Unixware7_Byteorder_Fix fix
  */
-#define UNIXWARE7_BYTEORDER_FIX_FIXIDX   98
+#define UNIXWARE7_BYTEORDER_FIX_FIXIDX   101
 tSCC zUnixware7_Byteorder_FixName[] =
      "Unixware7_Byteorder_Fix";
 /*
@@ -3845,7 +3991,7 @@ const char* apzUnixware7_Byteorder_FixPatch[] = { "sed",
  *
  *  Description of Va_I960_Macro fix
  */
-#define VA_I960_MACRO_FIXIDX             99
+#define VA_I960_MACRO_FIXIDX             102
 tSCC zVa_I960_MacroName[] =
      "Va_I960_Macro";
 /*
@@ -3883,7 +4029,7 @@ const char* apzVa_I960_MacroPatch[] = { "sed",
  *
  *  Description of Void_Null fix
  */
-#define VOID_NULL_FIXIDX                 100
+#define VOID_NULL_FIXIDX                 103
 tSCC zVoid_NullName[] =
      "Void_Null";
 /*
@@ -3918,7 +4064,7 @@ const char* apzVoid_NullPatch[] = { "sed",
  *
  *  Description of Vxworks_Gcc_Problem fix
  */
-#define VXWORKS_GCC_PROBLEM_FIXIDX       101
+#define VXWORKS_GCC_PROBLEM_FIXIDX       104
 tSCC zVxworks_Gcc_ProblemName[] =
      "Vxworks_Gcc_Problem";
 /*
@@ -3968,7 +4114,7 @@ const char* apzVxworks_Gcc_ProblemPatch[] = { "sed",
  *
  *  Description of Vxworks_Needs_Vxtypes fix
  */
-#define VXWORKS_NEEDS_VXTYPES_FIXIDX     102
+#define VXWORKS_NEEDS_VXTYPES_FIXIDX     105
 tSCC zVxworks_Needs_VxtypesName[] =
      "Vxworks_Needs_Vxtypes";
 /*
@@ -4003,7 +4149,7 @@ const char* apzVxworks_Needs_VxtypesPatch[] = { "sed",
  *
  *  Description of Vxworks_Needs_Vxworks fix
  */
-#define VXWORKS_NEEDS_VXWORKS_FIXIDX     103
+#define VXWORKS_NEEDS_VXWORKS_FIXIDX     106
 tSCC zVxworks_Needs_VxworksName[] =
      "Vxworks_Needs_Vxworks";
 /*
@@ -4052,7 +4198,7 @@ const char* apzVxworks_Needs_VxworksPatch[] = { "sed",
  *
  *  Description of Vxworks_Time fix
  */
-#define VXWORKS_TIME_FIXIDX              104
+#define VXWORKS_TIME_FIXIDX              107
 tSCC zVxworks_TimeName[] =
      "Vxworks_Time";
 /*
@@ -4103,7 +4249,7 @@ typedef void (*__gcc_VOIDFUNCPTR) ();\\\n\
  *
  *  Description of X11_Class fix
  */
-#define X11_CLASS_FIXIDX                 105
+#define X11_CLASS_FIXIDX                 108
 tSCC zX11_ClassName[] =
      "X11_Class";
 /*
@@ -4143,7 +4289,7 @@ const char* apzX11_ClassPatch[] = { "sed",
  *
  *  Description of X11_Class_Usage fix
  */
-#define X11_CLASS_USAGE_FIXIDX           106
+#define X11_CLASS_USAGE_FIXIDX           109
 tSCC zX11_Class_UsageName[] =
      "X11_Class_Usage";
 /*
@@ -4178,7 +4324,7 @@ const char* apzX11_Class_UsagePatch[] = { "sed",
  *
  *  Description of X11_New fix
  */
-#define X11_NEW_FIXIDX                   107
+#define X11_NEW_FIXIDX                   110
 tSCC zX11_NewName[] =
      "X11_New";
 /*
@@ -4219,7 +4365,7 @@ const char* apzX11_NewPatch[] = { "sed",
  *
  *  Description of X11_Sprintf fix
  */
-#define X11_SPRINTF_FIXIDX               108
+#define X11_SPRINTF_FIXIDX               111
 tSCC zX11_SprintfName[] =
      "X11_Sprintf";
 /*
@@ -4248,9 +4394,9 @@ extern char *\tsprintf();\\\n\
  *
  *  List of all fixes
  */
-#define REGEX_COUNT          75
+#define REGEX_COUNT          79
 #define MACH_LIST_SIZE_LIMIT 279
-#define FIX_COUNT            109
+#define FIX_COUNT            112
 
 tFixDesc fixDescList[ FIX_COUNT ] = {
   {  zAaa_Ki_IfaceName,    zAaa_Ki_IfaceList,
@@ -4288,6 +4434,21 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      AAB_DGUX_INT_VARARGS_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT,
      aAab_Dgux_Int_VarargsTests,   apzAab_Dgux_Int_VarargsPatch },
 
+  {  zAab_Fd_Zero_Glibc_1_0Name,    zAab_Fd_Zero_Glibc_1_0List,
+     apzAab_Fd_Zero_Glibc_1_0Machs, (regex_t*)NULL,
+     AAB_FD_ZERO_GLIBC_1_0_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT,
+     aAab_Fd_Zero_Glibc_1_0Tests,   apzAab_Fd_Zero_Glibc_1_0Patch },
+
+  {  zAab_Fd_Zero_Glibc_1_XName,    zAab_Fd_Zero_Glibc_1_XList,
+     apzAab_Fd_Zero_Glibc_1_XMachs, (regex_t*)NULL,
+     AAB_FD_ZERO_GLIBC_1_X_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT,
+     aAab_Fd_Zero_Glibc_1_XTests,   apzAab_Fd_Zero_Glibc_1_XPatch },
+
+  {  zAab_Fd_Zero_Glibc_2_0Name,    zAab_Fd_Zero_Glibc_2_0List,
+     apzAab_Fd_Zero_Glibc_2_0Machs, (regex_t*)NULL,
+     AAB_FD_ZERO_GLIBC_2_0_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT,
+     aAab_Fd_Zero_Glibc_2_0Tests,   apzAab_Fd_Zero_Glibc_2_0Patch },
+
   {  zAab_Svr4_Replace_ByteorderName,    zAab_Svr4_Replace_ByteorderList,
      apzAab_Svr4_Replace_ByteorderMachs, (regex_t*)NULL,
      AAB_SVR4_REPLACE_BYTEORDER_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT,
diff --git a/gcc/fixinc/inclhack.def b/gcc/fixinc/inclhack.def
index 0871bb189d4..d0c4d1db4b3 100644
--- a/gcc/fixinc/inclhack.def
+++ b/gcc/fixinc/inclhack.def
@@ -154,6 +154,127 @@ typedef char * va_list;
 };
 
 
+/*
+ *  This fixes __FD_ZERO bug for glibc-1.0.x
+ */
+fix = {
+    hackname = AAB_fd_zero_glibc_1_0;
+    files    = asm/posix_types.h;
+    select   = 'i[34567]86-*-linux-gnu*';
+
+    /*
+     * Define _POSIX_TYPES_H_WRAPPER at the end of the wrapper, not
+     * the start, so that if #include_next gets another instance of
+     * the wrapper, this will follow the #include_next chain until
+     * we arrive at the real <asm/posix_types.h>.
+     */
+    replace  =
+
+'/* This file fixes __FD_ZERO bug for glibc-1.x. */
+\#ifndef _POSIX_TYPES_H_WRAPPER
+\#include <features.h>
+\#include_next <asm/posix_types.h>
+
+\#if defined(__FD_ZERO) && !defined(__GLIBC__)
+\#undef __FD_ZERO
+\#define __FD_ZERO(fdsetp) \
+  do { \
+    int __d0, __d1; \
+		__asm__ __volatile__("cld ; rep ; stosl" \
+			: "=&c" (__d0), "=&D" (__d1) \
+			: "a" (0), "0" (__FDSET_LONGS), \
+			  "1" ((__kernel_fd_set *) (fdsetp)) :"memory"); \
+  } while (0)
+\#endif
+
+\#define _POSIX_TYPES_H_WRAPPER
+\#endif /* _POSIX_TYPES_H_WRAPPER */
+';
+};
+
+
+/*
+ *  This fixes __FD_ZERO bug for glibc-1.x
+ */
+fix = {
+    hackname = AAB_fd_zero_glibc_1_x;
+    files    = gnu/types.h;
+    select   = 'i[34567]86-*-linux-gnu*';
+
+    /*
+     * Define _TYPES_H_WRAPPER at the end of the wrapper, not
+     * the start, so that if #include_next gets another instance of
+     * the wrapper, this will follow the #include_next chain until
+     * we arrive at the real <gnu/types.h>.
+     */
+    replace  =
+
+'/* This file fixes __FD_ZERO bug for glibc-1.x. */
+\#ifndef _TYPES_H_WRAPPER
+\#include <features.h>
+\#include_next <gnu/types.h>
+
+\#if defined(__FD_ZERO) && !defined(__GLIBC__)
+\#undef __FD_ZERO
+\# define __FD_ZERO(fdsetp) \
+  do { \
+    int __d0, __d1; \
+	__asm__ __volatile__("cld ; rep ; stosl" \
+        	: "=&c" (__d0), "=&D" (__d1) \
+        	: "a" (0), "0" (__FDSET_LONGS), \
+		  "1" ((__fd_set *) (fdsetp)) :"memory"); \
+  } while (0)
+\#endif
+
+\#define _TYPES_H_WRAPPER
+\#endif /* _TYPES_H_WRAPPER */
+';
+};
+
+
+/*
+ *  This fixes __FD_ZERO bug for glibc-2.0.x
+ */
+fix = {
+    hackname = AAB_fd_zero_glibc_2_0;
+    files    = selectbits.h;
+    select   = 'i[34567]86-*-linux-gnu*';
+
+    /*
+     * Define _SELECTBITS_H_WRAPPER at the end of the wrapper, not
+     * the start, so that if #include_next gets another instance of
+     * the wrapper, this will follow the #include_next chain until
+     * we arrive at the real <selectbits.h>.
+     */
+    replace  =
+
+'/* This file fixes __FD_ZERO bug for glibc-2.0.x. */
+\#ifndef _SELECTBITS_H_WRAPPER
+\#include <features.h>
+\#include_next <selectbits.h>
+
+\#if defined(__FD_ZERO) && defined(__GLIBC__) \
+	&& defined(__GLIBC_MINOR__) && __GLIBC__ == 2 \
+	&& __GLIBC_MINOR__ == 0
+\#undef __FD_ZERO
+\#define __FD_ZERO(fdsetp) \
+  do { \
+    int __d0, __d1; \
+  __asm__ __volatile__ ("cld; rep; stosl" \
+                        : "=&c" (__d0), "=&D" (__d1) \
+                        : "a" (0), "0" (sizeof (__fd_set) \
+                                        / sizeof (__fd_mask)), \
+                          "1" ((__fd_mask *) (fdsetp)) \
+                        : "memory"); \
+  } while (0)
+\#endif
+
+\#define _SELECTBITS_H_WRAPPER
+\#endif /* _SELECTBITS_H_WRAPPER */
+';
+};
+
+
 /*
  *  Completely replace <sys/byteorder.h>; with a file that implements gcc's
  *  optimized byteswapping.  Restricted to "SVR4" machines until either
@@ -519,6 +640,9 @@ fix = {
  */
 fix = {
     hackname = bad_lval;
+
+    select   = "^[ \t]*#[ \t]*pragma[ \t][ \t]*extern_prefix";
+
     files    = libgen.h;
     files    = dirent.h;
     files    = ftw.h;
@@ -597,56 +721,15 @@ fix = {
 
 
 /*
- *  Remove the double-slash comments
- *  They *must* be removed so it will not create nested comments!!
- *  However, they will *not* be removed if the file name ends with
- *  any of "++", ".hh" or ".H", or if the file name contains "cxx/".
- *
- *  There *used* to be a number of similar problems in various OSes:
-
- *  Turning // comments into normal comments trashes this IRIX 4.0.1
- *  header file, which embeds // comments inside multi-line
- *  comments.  If this looks like the IRIX header file, we refix it by
- *  just throwing away the // comments.
-
- *  Same problem with a file from SunOS 4.1.3 : a header file containing
- *  the string "//" embedded in "/ * * /"
-
- *  There is a similar problem with the VxWorks drv/netif/if_med.h file.
-
- *  And also with the HP-UX 10 and HP-UX 11 sys/pci.h file
-
- *  Now that we delete the // comments instead of converting them to / * * /,
- *  traditional hacks like irix_bogus_cxx_cmnt, no longer work (which
- *  strangely enough was also used on alpha-dec-osf4.0d).  If we skip the
- *  hack whenever we see ``"//"' ', then the need for the secondary hack
- *  disappears.  Note: it is painful to ensure that the first quote
- *  exists, so we just check for the trailing quote directly abutting
- *  the //.  Note: We should never touch a line that has // completely
- *  within quotes but this is somewhat hard to check for.
-
- *  Ultimately, this fix ought to go inside of C code where
- *  we can do a better analysis on the need and method for fixing.
+ *  Remove the double-slash comments.  The "double_slash" test will
+ *  try to ignore C++ headers by checking for "CC/", "xx/" and "++/"
+ *  in the file name.  There are still the occasional C++ headers
+ *  that have their comments stripped.  Too bad.
  */
 fix = {
     hackname = no_double_slash;
-    /*
-     *  Test that the file-to-fix does not from a C++ directory
-     *  Also, only accept double slashes that are not part of URL's
-     *  and do not appear to be within a single-line C-style comment
-     *  and are not the end of a quoted string.
-     */
-#ifdef NO_C_TESTS
-    test   = ' -z "`echo ${file} | egrep \'(CC|cxx|\+\+)/\'`"';
-    select = '(^|[^:])//[^"*]';
-    sed    = 's,^//.*$,,';
-    sed    = 's,\(/\*.*\)//\(.*\*/\),\1/ /\2,g';
-    sed    = 's,\([^:]\)//[^"].*$,\1,';
-    sed    = 's,[^:]//[^"].*$,,';
-#else
     c_test = "double_slash";
     c_fix  = "no_double_slash";
-#endif
 };
 
 
@@ -660,6 +743,7 @@ fix = {
     sed    = "s/ecd.cursor/ecd_cursor/";
 };
 
+
 /*
  *  On SCO OpenServer 5.0.0 through (at least) 5.0.5 <sys/stat.h> contains
  *  tiny static wrappers that aren't C++ safe.
@@ -682,7 +766,6 @@ fix = {
 };
 
 
-
 /*
  *  Fix else and endif directives that contain non-commentary text
  */
diff --git a/gcc/fixinc/inclhack.sh b/gcc/fixinc/inclhack.sh
index 913cdb3c35e..abcad11dd0d 100755
--- a/gcc/fixinc/inclhack.sh
+++ b/gcc/fixinc/inclhack.sh
@@ -6,7 +6,7 @@
 # files which are fixed to work correctly with ANSI C and placed in a
 # directory that GNU C will search.
 #
-# This script contains 109 fixup scripts.
+# This script contains 112 fixup scripts.
 #
 # See README-fixinc for more information.
 #
@@ -521,7 +521,94 @@ _EOF_
 
 
     #
-    # Fix   8:  Aab_Svr4_Replace_Byteorder
+    # Fix   8:  Aab_Fd_Zero_Glibc_1_0
+    #
+    case "${file}" in ./asm/posix_types.h )
+    if ( test -n "`egrep 'i[34567]86-*-linux-gnu*' ${file}`"
+       ) > /dev/null 2>&1 ; then
+    echo "aab_fd_zero_glibc_1_0 replacing file ${file}" >&2
+    cat > ${DESTFILE} << '_EOF_'
+/* This file fixes __FD_ZERO bug for glibc-1.x. */
+#ifndef _POSIX_TYPES_H_WRAPPER
+#include <features.h>
+#include_next <asm/posix_types.h>
+
+#if defined(__FD_ZERO) && !defined(__GLIBC__)
+#undef __FD_ZERO
+#define __FD_ZERO(fdsetp)   do {     int __d0, __d1; 		__asm__ __volatile__("cld ; rep ; stosl" 			: "=&c" (__d0), "=&D" (__d1) 			: "a" (0), "0" (__FDSET_LONGS), 			  "1" ((__kernel_fd_set *) (fdsetp)) :"memory");   } while (0)
+#endif
+
+#define _POSIX_TYPES_H_WRAPPER
+#endif /* _POSIX_TYPES_H_WRAPPER */
+
+_EOF_
+    continue
+
+    fi # end of select 'if'
+    ;; # case end for file name test
+    esac
+
+
+    #
+    # Fix   9:  Aab_Fd_Zero_Glibc_1_X
+    #
+    case "${file}" in ./gnu/types.h )
+    if ( test -n "`egrep 'i[34567]86-*-linux-gnu*' ${file}`"
+       ) > /dev/null 2>&1 ; then
+    echo "aab_fd_zero_glibc_1_x replacing file ${file}" >&2
+    cat > ${DESTFILE} << '_EOF_'
+/* This file fixes __FD_ZERO bug for glibc-1.x. */
+#ifndef _TYPES_H_WRAPPER
+#include <features.h>
+#include_next <gnu/types.h>
+
+#if defined(__FD_ZERO) && !defined(__GLIBC__)
+#undef __FD_ZERO
+# define __FD_ZERO(fdsetp)   do {     int __d0, __d1; 	__asm__ __volatile__("cld ; rep ; stosl"         	: "=&c" (__d0), "=&D" (__d1)         	: "a" (0), "0" (__FDSET_LONGS), 		  "1" ((__fd_set *) (fdsetp)) :"memory");   } while (0)
+#endif
+
+#define _TYPES_H_WRAPPER
+#endif /* _TYPES_H_WRAPPER */
+
+_EOF_
+    continue
+
+    fi # end of select 'if'
+    ;; # case end for file name test
+    esac
+
+
+    #
+    # Fix  10:  Aab_Fd_Zero_Glibc_2_0
+    #
+    case "${file}" in ./selectbits.h )
+    if ( test -n "`egrep 'i[34567]86-*-linux-gnu*' ${file}`"
+       ) > /dev/null 2>&1 ; then
+    echo "aab_fd_zero_glibc_2_0 replacing file ${file}" >&2
+    cat > ${DESTFILE} << '_EOF_'
+/* This file fixes __FD_ZERO bug for glibc-2.0.x. */
+#ifndef _SELECTBITS_H_WRAPPER
+#include <features.h>
+#include_next <selectbits.h>
+
+#if defined(__FD_ZERO) && defined(__GLIBC__) 	&& defined(__GLIBC_MINOR__) && __GLIBC__ == 2 	&& __GLIBC_MINOR__ == 0
+#undef __FD_ZERO
+#define __FD_ZERO(fdsetp)   do {     int __d0, __d1;   __asm__ __volatile__ ("cld; rep; stosl"                         : "=&c" (__d0), "=&D" (__d1)                         : "a" (0), "0" (sizeof (__fd_set)                                         / sizeof (__fd_mask)),                           "1" ((__fd_mask *) (fdsetp))                         : "memory");   } while (0)
+#endif
+
+#define _SELECTBITS_H_WRAPPER
+#endif /* _SELECTBITS_H_WRAPPER */
+
+_EOF_
+    continue
+
+    fi # end of select 'if'
+    ;; # case end for file name test
+    esac
+
+
+    #
+    # Fix  11:  Aab_Svr4_Replace_Byteorder
     #
     case "${file}" in ./sys/byteorder.h )
     case "$target_canonical" in *-*-sysv4* | \
@@ -684,7 +771,7 @@ _EOF_
 
 
     #
-    # Fix   9:  Aix_Syswait
+    # Fix  12:  Aix_Syswait
     #
     case "${file}" in ./sys/wait.h )
     if ( test -n "`egrep 'bos325,' ${file}`"
@@ -707,7 +794,7 @@ struct rusage;
 
 
     #
-    # Fix  10:  Aix_Volatile
+    # Fix  13:  Aix_Volatile
     #
     case "${file}" in ./sys/signal.h )
     if ( test -n "`egrep 'typedef volatile int sig_atomic_t' ${file}`"
@@ -728,7 +815,7 @@ struct rusage;
 
 
     #
-    # Fix  11:  Alpha_Getopt
+    # Fix  14:  Alpha_Getopt
     #
     case "${file}" in ./stdio.h | \
 	./stdlib.h )
@@ -750,7 +837,7 @@ struct rusage;
 
 
     #
-    # Fix  12:  Alpha_Parens
+    # Fix  15:  Alpha_Parens
     #
     case "${file}" in ./sym.h )
     if ( test -n "`egrep '#ifndef\\(__mips64\\)' ${file}`"
@@ -771,7 +858,7 @@ struct rusage;
 
 
     #
-    # Fix  13:  Alpha_Sbrk
+    # Fix  16:  Alpha_Sbrk
     #
     case "${file}" in ./unistd.h )
     if ( test -n "`egrep 'char[ 	]*\\*[	 ]*sbrk[ 	]*\\(' ${file}`"
@@ -792,7 +879,7 @@ struct rusage;
 
 
     #
-    # Fix  14:  Arm_Norcroft_Hint
+    # Fix  17:  Arm_Norcroft_Hint
     #
     case "${file}" in ./X11/Intrinsic.h )
     if ( test -n "`egrep '___type p_type' ${file}`"
@@ -813,7 +900,7 @@ struct rusage;
 
 
     #
-    # Fix  15:  Arm_Wchar
+    # Fix  18:  Arm_Wchar
     #
     case "${file}" in ./stdlib.h )
     if ( test -n "`egrep '#[ 	]*define[ 	]*__wchar_t' ${file}`"
@@ -835,7 +922,7 @@ struct rusage;
 
 
     #
-    # Fix  16:  Aux_Asm
+    # Fix  19:  Aux_Asm
     #
     case "${file}" in ./sys/param.h )
     if ( test -n "`egrep '#ifndef NOINLINE' ${file}`"
@@ -856,7 +943,7 @@ struct rusage;
 
 
     #
-    # Fix  17:  Avoid_Bool
+    # Fix  20:  Avoid_Bool
     #
     case "${file}" in ./curses.h | \
 	./curses_colr/curses.h | \
@@ -906,7 +993,7 @@ struct rusage;
 
 
     #
-    # Fix  18:  Bad_Struct_Term
+    # Fix  21:  Bad_Struct_Term
     #
     case "${file}" in ./curses.h )
     if ( test -n "`egrep '^[ 	]*typedef[ 	]+struct[ 	]+term[ 	]*;' ${file}`"
@@ -927,7 +1014,7 @@ struct rusage;
 
 
     #
-    # Fix  19:  Badquote
+    # Fix  22:  Badquote
     #
     case "${file}" in ./sundev/vuid_event.h )
     fixlist="${fixlist}
@@ -945,7 +1032,7 @@ struct rusage;
 
 
     #
-    # Fix  20:  Bad_Lval
+    # Fix  23:  Bad_Lval
     #
     case "${file}" in ./libgen.h | \
 	./dirent.h | \
@@ -961,6 +1048,8 @@ struct rusage;
 	./stropts.h | \
 	./time.h | \
 	./unistd.h )
+    if ( test -n "`egrep '^[ 	]*#[ 	]*pragma[ 	][ 	]*extern_prefix' ${file}`"
+       ) > /dev/null 2>&1 ; then
     fixlist="${fixlist}
       bad_lval"
     if [ ! -r ${DESTFILE} ]
@@ -971,12 +1060,13 @@ struct rusage;
           < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
+    fi # end of select 'if'
     ;; # case end for file name test
     esac
 
 
     #
-    # Fix  21:  Broken_Assert_Stdio
+    # Fix  24:  Broken_Assert_Stdio
     #
     case "${file}" in ./assert.h )
     if ( test -n "`egrep 'stderr' ${file}`"
@@ -1003,7 +1093,7 @@ struct rusage;
 
 
     #
-    # Fix  22:  Broken_Assert_Stdlib
+    # Fix  25:  Broken_Assert_Stdlib
     #
     case "${file}" in ./assert.h )
     if ( test -n "`egrep 'exit *\\(|abort *\\(' ${file}`"
@@ -1032,7 +1122,7 @@ struct rusage;
 
 
     #
-    # Fix  23:  Bsd43_Io_Macros
+    # Fix  26:  Bsd43_Io_Macros
     #
     if ( test -n "`egrep 'BSD43__IO' ${file}`"
        ) > /dev/null 2>&1 ; then
@@ -1051,7 +1141,7 @@ struct rusage;
 
 
     #
-    # Fix  24:  Dec_Intern_Asm
+    # Fix  27:  Dec_Intern_Asm
     #
     case "${file}" in ./c_asm.h )
     fixlist="${fixlist}
@@ -1074,7 +1164,7 @@ struct rusage;
 
 
     #
-    # Fix  25:  No_Double_Slash
+    # Fix  28:  No_Double_Slash
     #
     if ${FIXTESTS} ${file} double_slash
     then
@@ -1090,7 +1180,7 @@ struct rusage;
 
 
     #
-    # Fix  26:  Ecd_Cursor
+    # Fix  29:  Ecd_Cursor
     #
     case "${file}" in ./sunwindow/win_lock.h | \
 	./sunwindow/win_cursor.h )
@@ -1109,7 +1199,7 @@ struct rusage;
 
 
     #
-    # Fix  27:  Sco5_Stat_Wrappers
+    # Fix  30:  Sco5_Stat_Wrappers
     #
     case "${file}" in ./sys/stat.h )
     case "$target_canonical" in i*86-*-sco3.2v5* )
@@ -1140,7 +1230,7 @@ extern "C"\
 
 
     #
-    # Fix  28:  End_Else_Label
+    # Fix  31:  End_Else_Label
     #
     if ${FIXTESTS} ${file} else_endif_label
     then
@@ -1156,7 +1246,7 @@ extern "C"\
 
 
     #
-    # Fix  29:  Hp_Inline
+    # Fix  32:  Hp_Inline
     #
     case "${file}" in ./sys/spinlock.h )
     if ( test -n "`egrep 'include.*\"\\.\\./machine/' ${file}`"
@@ -1178,7 +1268,7 @@ extern "C"\
 
 
     #
-    # Fix  30:  Hp_Sysfile
+    # Fix  33:  Hp_Sysfile
     #
     case "${file}" in ./sys/file.h )
     if ( test -n "`egrep 'HPUX_SOURCE' ${file}`"
@@ -1199,7 +1289,7 @@ extern "C"\
 
 
     #
-    # Fix  31:  Cxx_Unready
+    # Fix  34:  Cxx_Unready
     #
     case "${file}" in ./sys/mman.h | \
 	./rpc/types.h )
@@ -1232,7 +1322,7 @@ extern "C" {\
 
 
     #
-    # Fix  32:  Hpux_Maxint
+    # Fix  35:  Hpux_Maxint
     #
     case "${file}" in ./sys/param.h )
     fixlist="${fixlist}
@@ -1255,7 +1345,7 @@ extern "C" {\
 
 
     #
-    # Fix  33:  Hpux_Systime
+    # Fix  36:  Hpux_Systime
     #
     case "${file}" in ./sys/time.h )
     if ( test -n "`egrep '^extern struct sigevent;' ${file}`"
@@ -1276,7 +1366,7 @@ extern "C" {\
 
 
     #
-    # Fix  34:  Hpux11_Uint32_C
+    # Fix  37:  Hpux11_Uint32_C
     #
     case "${file}" in ./inttypes.h )
     if ( test -n "`egrep '^#define UINT32_C\\(__c\\)[ 	]*__CONCAT__\\(__CONCAT_U__\\(__c\\),l\\)' ${file}`"
@@ -1297,7 +1387,7 @@ extern "C" {\
 
 
     #
-    # Fix  35:  Interactv_Add1
+    # Fix  38:  Interactv_Add1
     #
     case "${file}" in ./stdio.h | \
 	./math.h | \
@@ -1324,7 +1414,7 @@ extern "C" {\
 
 
     #
-    # Fix  36:  Interactv_Add2
+    # Fix  39:  Interactv_Add2
     #
     case "${file}" in ./math.h )
     if ( test '('  -d /etc/conf/kconfig.d ')' -a \
@@ -1346,7 +1436,7 @@ extern "C" {\
 
 
     #
-    # Fix  37:  Interactv_Add3
+    # Fix  40:  Interactv_Add3
     #
     case "${file}" in ./sys/limits.h )
     if ( test '('  -d /etc/conf/kconfig.d ')' -a \
@@ -1369,7 +1459,7 @@ extern "C" {\
 
 
     #
-    # Fix  38:  Io_Def_Quotes
+    # Fix  41:  Io_Def_Quotes
     #
     if ( test -n "`egrep '[ 	]*[ 	](_|DES)IO[A-Z]*[ 	]*\\( *[^,'\\'']' ${file}`"
        ) > /dev/null 2>&1 ; then
@@ -1390,7 +1480,7 @@ extern "C" {\
 
 
     #
-    # Fix  39:  Ioctl_Fix_Ctrl
+    # Fix  42:  Ioctl_Fix_Ctrl
     #
     if ( test -n "`egrep 'CTRL[ 	]*\\(' ${file}`"
        ) > /dev/null 2>&1 ; then
@@ -1413,7 +1503,7 @@ extern "C" {\
 
 
     #
-    # Fix  40:  Ip_Missing_Semi
+    # Fix  43:  Ip_Missing_Semi
     #
     case "${file}" in ./netinet/ip.h )
     fixlist="${fixlist}
@@ -1431,7 +1521,7 @@ extern "C" {\
 
 
     #
-    # Fix  41:  Irix_Multiline_Cmnt
+    # Fix  44:  Irix_Multiline_Cmnt
     #
     case "${file}" in ./sys/types.h )
     fixlist="${fixlist}
@@ -1450,7 +1540,7 @@ extern "C" {\
 
 
     #
-    # Fix  42:  Irix_Sockaddr
+    # Fix  45:  Irix_Sockaddr
     #
     case "${file}" in ./rpc/auth.h )
     if ( test -n "`egrep 'authdes_create.*struct sockaddr' ${file}`"
@@ -1473,7 +1563,7 @@ struct sockaddr;
 
 
     #
-    # Fix  43:  Irix_Struct__File
+    # Fix  46:  Irix_Struct__File
     #
     case "${file}" in ./rpc/xdr.h )
     fixlist="${fixlist}
@@ -1493,7 +1583,7 @@ struct __file_s;
 
 
     #
-    # Fix  44:  Irix_Asm_Apostrophe
+    # Fix  47:  Irix_Asm_Apostrophe
     #
     case "${file}" in ./sys/asm.h )
     if ( test -n "`egrep '^[ 	]*#.*[Ww]e'\\''re' ${file}`"
@@ -1514,7 +1604,7 @@ struct __file_s;
 
 
     #
-    # Fix  45:  Isc_Fmod
+    # Fix  48:  Isc_Fmod
     #
     case "${file}" in ./math.h )
     if ( test -n "`egrep 'fmod\\(double\\)' ${file}`"
@@ -1535,7 +1625,7 @@ struct __file_s;
 
 
     #
-    # Fix  46:  Motorola_Nested
+    # Fix  49:  Motorola_Nested
     #
     case "${file}" in ./limits.h | \
 	./sys/limits.h )
@@ -1558,7 +1648,7 @@ struct __file_s;
 
 
     #
-    # Fix  47:  Isc_Sys_Limits
+    # Fix  50:  Isc_Sys_Limits
     #
     case "${file}" in ./sys/limits.h )
     if ( test -n "`egrep 'CHILD_MAX' ${file}`"
@@ -1580,7 +1670,7 @@ struct __file_s;
 
 
     #
-    # Fix  48:  Kandr_Concat
+    # Fix  51:  Kandr_Concat
     #
     case "${file}" in ./sparc/asm_linkage.h | \
 	./sun3/asm_linkage.h | \
@@ -1618,7 +1708,7 @@ struct __file_s;
 
 
     #
-    # Fix  49:  Limits_Ifndefs
+    # Fix  52:  Limits_Ifndefs
     #
     case "${file}" in ./limits.h | \
 	./sys/limits.h )
@@ -1677,7 +1767,7 @@ struct __file_s;
 
 
     #
-    # Fix  50:  Lynx_Void_Int
+    # Fix  53:  Lynx_Void_Int
     #
     case "${file}" in ./curses.h )
     if ( test -n "`egrep '#[ 	]*define[ 	]+void[ 	]+int' ${file}`"
@@ -1698,7 +1788,7 @@ struct __file_s;
 
 
     #
-    # Fix  51:  Lynxos_Fcntl_Proto
+    # Fix  54:  Lynxos_Fcntl_Proto
     #
     case "${file}" in ./fcntl.h )
     if ( test -n "`egrep 'fcntl.*\\(int, int, int\\)' ${file}`"
@@ -1719,7 +1809,7 @@ struct __file_s;
 
 
     #
-    # Fix  52:  M88k_Bad_Hypot_Opt
+    # Fix  55:  M88k_Bad_Hypot_Opt
     #
     case "${file}" in ./math.h )
     case "$target_canonical" in m88k-motorola-sysv3* )
@@ -1754,7 +1844,7 @@ static __inline__ double fake_hypot (x, y)\
 
 
     #
-    # Fix  53:  M88k_Bad_S_If
+    # Fix  56:  M88k_Bad_S_If
     #
     case "${file}" in ./sys/stat.h )
     case "$target_canonical" in m88k-*-sysv3* )
@@ -1779,7 +1869,7 @@ static __inline__ double fake_hypot (x, y)\
 
 
     #
-    # Fix  54:  M88k_Multi_Incl
+    # Fix  57:  M88k_Multi_Incl
     #
     case "${file}" in ./time.h )
     case "$target_canonical" in m88k-tektronix-sysv3* )
@@ -1813,7 +1903,7 @@ static __inline__ double fake_hypot (x, y)\
 
 
     #
-    # Fix  55:  Machine_Name
+    # Fix  58:  Machine_Name
     #
     if ( test -n "`egrep '^#[ 	]*(if|elif).*[^a-zA-Z0-9_](_*[MSRrhim]|[Mbimnpstuv])[a-zA-Z0-9_]' ${file}`"
        ) > /dev/null 2>&1 ; then
@@ -1865,7 +1955,7 @@ s/\\+++fixinc_eol+++/\\/g
 
 
     #
-    # Fix  56:  Math_Exception
+    # Fix  59:  Math_Exception
     #
     case "${file}" in ./math.h )
     if ( test -n "`egrep 'struct exception' ${file}`"
@@ -1905,7 +1995,7 @@ s/\\+++fixinc_eol+++/\\/g
 
 
     #
-    # Fix  57:  Math_Gcc_Ifndefs
+    # Fix  60:  Math_Gcc_Ifndefs
     #
     case "${file}" in ./math.h )
     fixlist="${fixlist}
@@ -1939,7 +2029,7 @@ s/\\+++fixinc_eol+++/\\/g
 
 
     #
-    # Fix  58:  Nested_Comment
+    # Fix  61:  Nested_Comment
     #
     case "${file}" in ./rpc/rpc.h )
     fixlist="${fixlist}
@@ -1957,7 +2047,7 @@ s/\\+++fixinc_eol+++/\\/g
 
 
     #
-    # Fix  59:  News_Os_Recursion
+    # Fix  62:  News_Os_Recursion
     #
     case "${file}" in ./stdlib.h )
     if ( test -n "`egrep '#include <stdlib.h>' ${file}`"
@@ -1983,7 +2073,7 @@ s/\\+++fixinc_eol+++/\\/g
 
 
     #
-    # Fix  60:  Next_Math_Prefix
+    # Fix  63:  Next_Math_Prefix
     #
     case "${file}" in ./ansi/math.h )
     if ( test -n "`egrep '^extern.*double.*__const__.*' ${file}`"
@@ -2008,7 +2098,7 @@ s/\\+++fixinc_eol+++/\\/g
 
 
     #
-    # Fix  61:  Next_Template
+    # Fix  64:  Next_Template
     #
     case "${file}" in ./bsd/libc.h )
     if ( test -n "`egrep 'template' ${file}`"
@@ -2030,7 +2120,7 @@ s/\\+++fixinc_eol+++/\\/g
 
 
     #
-    # Fix  62:  Next_Volitile
+    # Fix  65:  Next_Volitile
     #
     case "${file}" in ./ansi/stdlib.h )
     if ( test -n "`egrep 'volatile' ${file}`"
@@ -2052,7 +2142,7 @@ s/\\+++fixinc_eol+++/\\/g
 
 
     #
-    # Fix  63:  Next_Wait_Union
+    # Fix  66:  Next_Wait_Union
     #
     case "${file}" in ./sys/wait.h )
     if ( test -n "`egrep 'wait\\(union wait' ${file}`"
@@ -2073,7 +2163,7 @@ s/\\+++fixinc_eol+++/\\/g
 
 
     #
-    # Fix  64:  Nodeent_Syntax
+    # Fix  67:  Nodeent_Syntax
     #
     case "${file}" in ./netdnet/dnetdb.h )
     fixlist="${fixlist}
@@ -2091,7 +2181,7 @@ s/\\+++fixinc_eol+++/\\/g
 
 
     #
-    # Fix  65:  Osf_Namespace_A
+    # Fix  68:  Osf_Namespace_A
     #
     case "${file}" in ./reg_types.h | \
 	./sys/lc_core.h )
@@ -2118,7 +2208,7 @@ s/\\+++fixinc_eol+++/\\/g
 
 
     #
-    # Fix  66:  Osf_Namespace_B
+    # Fix  69:  Osf_Namespace_B
     #
     case "${file}" in ./regex.h )
     if ( test '('  -r reg_types.h ')' -a \
@@ -2146,7 +2236,7 @@ typedef __regmatch_t	regmatch_t;
 
 
     #
-    # Fix  67:  Pthread_Page_Size
+    # Fix  70:  Pthread_Page_Size
     #
     case "${file}" in ./pthread.h )
     if ( test -n "`egrep '^int __page_size' ${file}`"
@@ -2167,7 +2257,7 @@ typedef __regmatch_t	regmatch_t;
 
 
     #
-    # Fix  68:  Read_Ret_Type
+    # Fix  71:  Read_Ret_Type
     #
     case "${file}" in ./stdio.h )
     if ( test -n "`egrep 'extern int	.*, fread\\(\\), fwrite\\(\\)' ${file}`"
@@ -2189,7 +2279,7 @@ typedef __regmatch_t	regmatch_t;
 
 
     #
-    # Fix  69:  Rs6000_Double
+    # Fix  72:  Rs6000_Double
     #
     case "${file}" in ./math.h )
     if ( test -n "`egrep '[^a-zA-Z_]class\\(' ${file}`"
@@ -2215,7 +2305,7 @@ typedef __regmatch_t	regmatch_t;
 
 
     #
-    # Fix  70:  Rs6000_Fchmod
+    # Fix  73:  Rs6000_Fchmod
     #
     case "${file}" in ./sys/stat.h )
     if ( test -n "`egrep 'fchmod\\(char' ${file}`"
@@ -2236,7 +2326,7 @@ typedef __regmatch_t	regmatch_t;
 
 
     #
-    # Fix  71:  Rs6000_Param
+    # Fix  74:  Rs6000_Param
     #
     case "${file}" in ./stdio.h | \
 	./unistd.h )
@@ -2255,7 +2345,7 @@ typedef __regmatch_t	regmatch_t;
 
 
     #
-    # Fix  72:  Sony_Include
+    # Fix  75:  Sony_Include
     #
     case "${file}" in ./machine/machparam.h )
     if ( test -n "`egrep '\"\\.\\./machine/endian.h\"' ${file}`"
@@ -2276,7 +2366,7 @@ typedef __regmatch_t	regmatch_t;
 
 
     #
-    # Fix  73:  Statsswtch
+    # Fix  76:  Statsswtch
     #
     case "${file}" in ./rpcsvc/rstat.h )
     if ( test -n "`egrep 'boottime$' ${file}`"
@@ -2297,7 +2387,7 @@ typedef __regmatch_t	regmatch_t;
 
 
     #
-    # Fix  74:  Stdio_Va_List
+    # Fix  77:  Stdio_Va_List
     #
     case "${file}" in ./stdio.h )
     fixlist="${fixlist}
@@ -2336,7 +2426,7 @@ typedef __regmatch_t	regmatch_t;
 
 
     #
-    # Fix  75:  Sun_Bogus_Ifdef
+    # Fix  78:  Sun_Bogus_Ifdef
     #
     case "${file}" in ./hsfs/hsfs_spec.h | \
 	./hsfs/iso_spec.h )
@@ -2358,7 +2448,7 @@ typedef __regmatch_t	regmatch_t;
 
 
     #
-    # Fix  76:  Sun_Bogus_Ifdef_Sun4c
+    # Fix  79:  Sun_Bogus_Ifdef_Sun4c
     #
     case "${file}" in ./hsfs/hsnode.h )
     if ( test -n "`egrep '#ifdef __i386__ || __sun4c__' ${file}`"
@@ -2379,7 +2469,7 @@ typedef __regmatch_t	regmatch_t;
 
 
     #
-    # Fix  77:  Sun_Catmacro
+    # Fix  80:  Sun_Catmacro
     #
     case "${file}" in ./pixrect/memvar.h )
     if ( test -n "`egrep '^#define[ 	]+CAT\\(a,b\\)' ${file}`"
@@ -2407,7 +2497,7 @@ typedef __regmatch_t	regmatch_t;
 
 
     #
-    # Fix  78:  Sun_Malloc
+    # Fix  81:  Sun_Malloc
     #
     case "${file}" in ./malloc.h )
     fixlist="${fixlist}
@@ -2428,7 +2518,7 @@ typedef __regmatch_t	regmatch_t;
 
 
     #
-    # Fix  79:  Sun_Memcpy
+    # Fix  82:  Sun_Memcpy
     #
     case "${file}" in ./memory.h )
     if ( test -n "`egrep '/\\*	@\\(#\\)(head/memory.h	50.1	 |memory\\.h 1\\.[2-4] 8./../.. SMI; from S5R2 1\\.2	)\\*/' ${file}`"
@@ -2470,7 +2560,7 @@ extern int memcmp();\
 
 
     #
-    # Fix  80:  Sun_Rusers_Semi
+    # Fix  83:  Sun_Rusers_Semi
     #
     case "${file}" in ./rpcsvc/rusers.h )
     if ( test -n "`egrep '_cnt$' ${file}`"
@@ -2491,7 +2581,7 @@ extern int memcmp();\
 
 
     #
-    # Fix  81:  Sun_Signal
+    # Fix  84:  Sun_Signal
     #
     case "${file}" in ./sys/signal.h | \
 	./signal.h )
@@ -2520,7 +2610,7 @@ void	(*signal(...))(...);\
 
 
     #
-    # Fix  82:  Sun_Auth_Proto
+    # Fix  85:  Sun_Auth_Proto
     #
     case "${file}" in ./rpc/auth.h | \
 	./rpc/clnt.h | \
@@ -2549,7 +2639,7 @@ void	(*signal(...))(...);\
 
 
     #
-    # Fix  83:  Sunos_Matherr_Decl
+    # Fix  86:  Sunos_Matherr_Decl
     #
     case "${file}" in ./math.h )
     fixlist="${fixlist}
@@ -2570,7 +2660,7 @@ struct exception;
 
 
     #
-    # Fix  84:  Sunos_Strlen
+    # Fix  87:  Sunos_Strlen
     #
     case "${file}" in ./strings.h )
     fixlist="${fixlist}
@@ -2588,7 +2678,7 @@ struct exception;
 
 
     #
-    # Fix  85:  Systypes
+    # Fix  88:  Systypes
     #
     case "${file}" in ./sys/types.h | \
 	./stdlib.h | \
@@ -2642,7 +2732,7 @@ typedef __SIZE_TYPE__ size_t;\
 
 
     #
-    # Fix  86:  Systypes_For_Aix
+    # Fix  89:  Systypes_For_Aix
     #
     case "${file}" in ./sys/types.h )
     if ( test -n "`egrep 'typedef[ 	][ 	]*[A-Za-z_][ 	A-Za-z_]*[ 	]size_t' ${file}`"
@@ -2673,7 +2763,7 @@ typedef __SIZE_TYPE__ size_t;\
 
 
     #
-    # Fix  87:  Sysv68_String
+    # Fix  90:  Sysv68_String
     #
     case "${file}" in ./string.h )
     fixlist="${fixlist}
@@ -2701,7 +2791,7 @@ extern unsigned int\
 
 
     #
-    # Fix  88:  Sysz_Stdlib_For_Sun
+    # Fix  91:  Sysz_Stdlib_For_Sun
     #
     case "${file}" in ./stdlib.h )
     fixlist="${fixlist}
@@ -2732,7 +2822,7 @@ extern unsigned int\
 
 
     #
-    # Fix  89:  Sysz_Stdtypes_For_Sun
+    # Fix  92:  Sysz_Stdtypes_For_Sun
     #
     case "${file}" in ./sys/stdtypes.h )
     fixlist="${fixlist}
@@ -2770,7 +2860,7 @@ extern unsigned int\
 
 
     #
-    # Fix  90:  Tinfo_Cplusplus
+    # Fix  93:  Tinfo_Cplusplus
     #
     case "${file}" in ./tinfo.h )
     fixlist="${fixlist}
@@ -2788,7 +2878,7 @@ extern unsigned int\
 
 
     #
-    # Fix  91:  Ultrix_Ansi_Compat
+    # Fix  94:  Ultrix_Ansi_Compat
     #
     case "${file}" in ./ansi_compat.h )
     if ( test -n "`egrep 'ULTRIX' ${file}`"
@@ -2812,7 +2902,7 @@ extern unsigned int\
 
 
     #
-    # Fix  92:  Ultrix_Fix_Fixproto
+    # Fix  95:  Ultrix_Fix_Fixproto
     #
     case "${file}" in ./sys/utsname.h )
     if ( test -n "`egrep 'ULTRIX' ${file}`"
@@ -2835,7 +2925,7 @@ struct utsname;
 
 
     #
-    # Fix  93:  Ultrix_Atof_Param
+    # Fix  96:  Ultrix_Atof_Param
     #
     case "${file}" in ./math.h )
     fixlist="${fixlist}
@@ -2857,7 +2947,7 @@ struct utsname;
 
 
     #
-    # Fix  94:  Ultrix_Const
+    # Fix  97:  Ultrix_Const
     #
     case "${file}" in ./stdio.h )
     fixlist="${fixlist}
@@ -2883,7 +2973,7 @@ struct utsname;
 
 
     #
-    # Fix  95:  Ultrix_Ifdef
+    # Fix  98:  Ultrix_Ifdef
     #
     case "${file}" in ./sys/file.h )
     if ( test -n "`egrep '#ifdef KERNEL' ${file}`"
@@ -2904,7 +2994,7 @@ struct utsname;
 
 
     #
-    # Fix  96:  Ultrix_Nested_Cmnt
+    # Fix  99:  Ultrix_Nested_Cmnt
     #
     case "${file}" in ./rpc/svc.h )
     fixlist="${fixlist}
@@ -2922,7 +3012,7 @@ struct utsname;
 
 
     #
-    # Fix  97:  Ultrix_Static
+    # Fix 100:  Ultrix_Static
     #
     case "${file}" in ./machine/cpu.h )
     if ( test -n "`egrep '#include \"r[34]_cpu' ${file}`"
@@ -2945,7 +3035,7 @@ struct utsname;
 
 
     #
-    # Fix  98:  Undefine_Null
+    # Fix 101:  Undefine_Null
     #
     if ( test -n "`egrep '^#[ 	]*define[ 	]*[ 	]NULL[ 	]' ${file}`"
        ) > /dev/null 2>&1 ; then
@@ -2969,7 +3059,7 @@ struct utsname;
 
 
     #
-    # Fix  99:  Unixware7_Byteorder_Fix
+    # Fix 102:  Unixware7_Byteorder_Fix
     #
     case "${file}" in ./arpa/inet.h )
     case "$target_canonical" in *-*-sysv4* | \
@@ -2999,7 +3089,7 @@ struct utsname;
 
 
     #
-    # Fix 100:  Va_I960_Macro
+    # Fix 103:  Va_I960_Macro
     #
     case "${file}" in ./arch/i960/archI960.h )
     if ( test -n "`egrep '__(vsiz|vali|vpad|alignof__)' ${file}`"
@@ -3023,7 +3113,7 @@ struct utsname;
 
 
     #
-    # Fix 101:  Void_Null
+    # Fix 104:  Void_Null
     #
     case "${file}" in ./curses.h | \
 	./dbm.h | \
@@ -3054,7 +3144,7 @@ struct utsname;
 
 
     #
-    # Fix 102:  Vxworks_Gcc_Problem
+    # Fix 105:  Vxworks_Gcc_Problem
     #
     case "${file}" in ./types/vxTypesBase.h )
     if ( test -n "`egrep '__GNUC_TYPEOF_FEATURE_BROKEN_USE_DEFAULT_UNTIL_FIXED__' ${file}`"
@@ -3096,7 +3186,7 @@ struct utsname;
 
 
     #
-    # Fix 103:  Vxworks_Needs_Vxtypes
+    # Fix 106:  Vxworks_Needs_Vxtypes
     #
     case "${file}" in ./time.h )
     if ( test -n "`egrep 'uint_t[ 	][ 	]*_clocks_per_sec' ${file}`"
@@ -3117,7 +3207,7 @@ struct utsname;
 
 
     #
-    # Fix 104:  Vxworks_Needs_Vxworks
+    # Fix 107:  Vxworks_Needs_Vxworks
     #
     case "${file}" in ./sys/stat.h )
     if ( test -n "`egrep '#[ 	]define[ 	][ 	]*__INCstath' ${file}`"
@@ -3145,7 +3235,7 @@ struct utsname;
 
 
     #
-    # Fix 105:  Vxworks_Time
+    # Fix 108:  Vxworks_Time
     #
     case "${file}" in ./time.h )
     if ( test -n "`egrep 'VOIDFUNCPTR' ${file}`"
@@ -3179,7 +3269,7 @@ typedef void (*__gcc_VOIDFUNCPTR) ();\
 
 
     #
-    # Fix 106:  X11_Class
+    # Fix 109:  X11_Class
     #
     case "${file}" in ./X11/ShellP.h )
     if ( test  -a \
@@ -3208,7 +3298,7 @@ typedef void (*__gcc_VOIDFUNCPTR) ();\
 
 
     #
-    # Fix 107:  X11_Class_Usage
+    # Fix 110:  X11_Class_Usage
     #
     case "${file}" in ./Xm/BaseClassI.h )
     if ( test  -a \
@@ -3230,7 +3320,7 @@ typedef void (*__gcc_VOIDFUNCPTR) ();\
 
 
     #
-    # Fix 108:  X11_New
+    # Fix 111:  X11_New
     #
     case "${file}" in ./Xm/Traversal.h )
     if ( test  -a \
@@ -3260,7 +3350,7 @@ typedef void (*__gcc_VOIDFUNCPTR) ();\
 
 
     #
-    # Fix 109:  X11_Sprintf
+    # Fix 112:  X11_Sprintf
     #
     case "${file}" in ./X11*/Xmu.h )
     fixlist="${fixlist}
diff --git a/gcc/fixinc/mkfixinc.sh b/gcc/fixinc/mkfixinc.sh
index 10bd27fe9a2..ae0dbbd074c 100755
--- a/gcc/fixinc/mkfixinc.sh
+++ b/gcc/fixinc/mkfixinc.sh
@@ -14,17 +14,13 @@ fixincludes="${target}"
 
 case $machine in
 	i[34567]86-*-linux-gnu*)
-		fixincludes=fixinc.x86-linux-gnu
+		:
 		;;
 
 	*-*-sysv4*)
 		fixincludes=fixinc.svr4
 		;;
 
-	mips-dec-bsd*)
-		:
-		;;
-
 	i[34567]86-*-sysv5* | \
 	i[34567]86-*-udk* | \
 	i[34567]86-*-solaris2.[0-4] | \
@@ -62,7 +58,6 @@ case $machine in
 		fixincludes=fixinc.sco
 		;;
 
-	alpha*-*-linux-gnu* | \
 	alpha*-dec-vms* | \
 	arm-semi-aout | armel-semi-aout | \
 	arm-semi-aof | armel-semi-aof | \