remove unused files
[platform/upstream/gcc48.git] / fixincludes / fixincl.x
index e6d07d8..e28a842 100644 (file)
@@ -2,11 +2,11 @@
  * 
  * DO NOT EDIT THIS FILE   (fixincl.x)
  * 
- * It has been AutoGen-ed  March 26, 2012 at 10:53:21 AM by AutoGen 5.10
+ * It has been AutoGen-ed  Thursday May 16, 2013 at 03:34:25 PM MEST
  * From the definitions    inclhack.def
  * and the template file   fixincl
  */
-/* DO NOT SVN-MERGE THIS FILE, EITHER Mon Mar 26 10:53:21 EDT 2012
+/* DO NOT SVN-MERGE THIS FILE, EITHER Thu May 16 15:34:25 MEST 2013
  *
  * You must regenerate it.  Use the ./genfixes script.
  *
@@ -15,7 +15,7 @@
  * certain ANSI-incompatible system header files which are fixed to work
  * correctly with ANSI C and placed in a directory that GNU C will search.
  *
- * This file contains 224 fixup descriptions.
+ * This file contains 226 fixup descriptions.
  *
  * See README for more information.
  *
@@ -101,6 +101,60 @@ extern off64_t ftello(FILE *) __asm__(\"ftello64\");\n\
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
+ *  Description of Aab_Aix_Fcntl fix
+ */
+tSCC zAab_Aix_FcntlName[] =
+     "AAB_aix_fcntl";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zAab_Aix_FcntlList[] =
+  "fcntl.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzAab_Aix_FcntlMachs[] = {
+        "*-*-aix*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zAab_Aix_FcntlSelect0[] =
+       "define open[ \t]open64";
+
+#define    AAB_AIX_FCNTL_TEST_CT  1
+static tTestDesc aAab_Aix_FcntlTests[] = {
+  { TT_EGREP,    zAab_Aix_FcntlSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Aab_Aix_Fcntl
+ */
+static const char* apzAab_Aix_FcntlPatch[] = {
+    "wrap",
+    "",
+    "\n\
+#if defined __GNUG__ && defined _LARGE_FILES && defined __cplusplus\n\
+#define __need__aix_fcntl_h_fix\n\
+#ifdef __need__aix_fcntl_h_fix\n\
+#undef open\n\
+#undef creat\n\
+#undef openat\n\
+/* Alias the symbols using asm */\n\
+extern \"C\" {\n\
+extern int open(const char *, int, ...) __asm__(\"open64\");\n\
+extern int creat(const char *, mode_t) __asm__(\"creat64\");\n\
+#if (_XOPEN_SOURCE >= 700)\n\
+extern int openat(int, const char *, int, ...) __asm__(\"open64at\");\n\
+#endif\n\
+}\n\
+#endif\n\
+#endif\n",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
  *  Description of Aab_Darwin7_9_Long_Double_Funcs fix
  */
 tSCC zAab_Darwin7_9_Long_Double_FuncsName[] =
@@ -215,44 +269,6 @@ static const char* apzAab_Darwin7_9_Long_Double_FuncsPatch[] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Aab_Darwin7_9_Long_Double_Funcs_2 fix
- */
-tSCC zAab_Darwin7_9_Long_Double_Funcs_2Name[] =
-     "AAB_darwin7_9_long_double_funcs_2";
-
-/*
- *  File name selection pattern
- */
-tSCC zAab_Darwin7_9_Long_Double_Funcs_2List[] =
-  "math.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-tSCC* apzAab_Darwin7_9_Long_Double_Funcs_2Machs[] = {
-        "*-*-darwin7.9*",
-        (const char*)NULL };
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zAab_Darwin7_9_Long_Double_Funcs_2Select0[] =
-       "#include[ \\t]+\\\"";
-
-#define    AAB_DARWIN7_9_LONG_DOUBLE_FUNCS_2_TEST_CT  1
-static tTestDesc aAab_Darwin7_9_Long_Double_Funcs_2Tests[] = {
-  { TT_EGREP,    zAab_Darwin7_9_Long_Double_Funcs_2Select0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Aab_Darwin7_9_Long_Double_Funcs_2
- */
-static const char* apzAab_Darwin7_9_Long_Double_Funcs_2Patch[] = {
-    "format",
-    "%1<%2.h>",
-    "([ \\t]*#[ \\t]*include[ \\t]+)\"([a-z0-9/]+)\\.h\"",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
  *  Description of Aab_Fd_Zero_Asm_Posix_Types_H fix
  */
 tSCC zAab_Fd_Zero_Asm_Posix_Types_HName[] =
@@ -485,6 +501,241 @@ static const char* apzAab_Sun_MemcpyPatch[] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
+ *  Description of Aab_Vxworks_Assert fix
+ */
+tSCC zAab_Vxworks_AssertName[] =
+     "AAB_vxworks_assert";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zAab_Vxworks_AssertList[] =
+  "assert.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzAab_Vxworks_AssertMachs[] = {
+        "*-*-vxworks*",
+        (const char*)NULL };
+#define AAB_VXWORKS_ASSERT_TEST_CT  0
+#define aAab_Vxworks_AssertTests   (tTestDesc*)NULL
+
+/*
+ *  Fix Command Arguments for Aab_Vxworks_Assert
+ */
+static const char* apzAab_Vxworks_AssertPatch[] = {
+"#ifndef _ASSERT_H\n\
+#define _ASSERT_H\n\n\
+#ifdef assert\n\
+#undef assert\n\
+#endif\n\n\
+#if defined(__STDC__) || defined(__cplusplus)\n\
+extern void __assert (const char*);\n\
+#else\n\
+extern void __assert ();\n\
+#endif\n\n\
+#ifdef NDEBUG\n\
+#define assert(ign) ((void)0)\n\
+#else\n\n\
+#define ASSERT_STRINGIFY(str) ASSERT_STRINGIFY_HELPER(str)\n\
+#define ASSERT_STRINGIFY_HELPER(str) #str\n\n\
+#define assert(test) ((void) \\\n\
+        ((test) ? ((void)0) : \\\n\
+        __assert(\"Assertion failed: \" ASSERT_STRINGIFY(test) \", file \" \\\n\
+        __FILE__ \", line \" ASSERT_STRINGIFY(__LINE__) \"\\n\")))\n\n\
+#endif\n\n\
+#endif",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Aab_Vxworks_Regs_Vxtypes fix
+ */
+tSCC zAab_Vxworks_Regs_VxtypesName[] =
+     "AAB_vxworks_regs_vxtypes";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zAab_Vxworks_Regs_VxtypesList[] =
+  "regs.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzAab_Vxworks_Regs_VxtypesMachs[] = {
+        "*-*-vxworks*",
+        (const char*)NULL };
+#define AAB_VXWORKS_REGS_VXTYPES_TEST_CT  0
+#define aAab_Vxworks_Regs_VxtypesTests   (tTestDesc*)NULL
+
+/*
+ *  Fix Command Arguments for Aab_Vxworks_Regs_Vxtypes
+ */
+static const char* apzAab_Vxworks_Regs_VxtypesPatch[] = {
+"#ifndef _REGS_H\n\
+#define _REGS_H\n\
+#include <types/vxTypesOld.h>\n\
+#include_next <arch/../regs.h>\n\
+#endif",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Aab_Vxworks_Stdint fix
+ */
+tSCC zAab_Vxworks_StdintName[] =
+     "AAB_vxworks_stdint";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zAab_Vxworks_StdintList[] =
+  "stdint.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzAab_Vxworks_StdintMachs[] = {
+        "*-*-vxworks*",
+        (const char*)NULL };
+#define AAB_VXWORKS_STDINT_TEST_CT  0
+#define aAab_Vxworks_StdintTests   (tTestDesc*)NULL
+
+/*
+ *  Fix Command Arguments for Aab_Vxworks_Stdint
+ */
+static const char* apzAab_Vxworks_StdintPatch[] = {
+"#ifndef _STDINT_H\n\
+#define _STDINT_H\n\
+/* get int*_t, uint*_t */\n\
+#include <types/vxTypes.h>\n\n\
+/* get legacy vxworks types for compatibility */\n\
+#include <types/vxTypesOld.h>\n\n\
+typedef long intptr_t;\n\
+typedef unsigned long uintptr_t;\n\n\
+typedef int64_t intmax_t;\n\
+typedef uint64_t uintmax_t;\n\n\
+typedef int8_t int_least8_t;\n\
+typedef int16_t int_least16_t;\n\
+typedef int32_t int_least32_t;\n\
+typedef int64_t int_least64_t;\n\n\
+typedef uint8_t uint_least8_t;\n\
+typedef uint16_t uint_least16_t;\n\
+typedef uint32_t uint_least32_t;\n\
+typedef uint64_t uint_least64_t;\n\n\
+typedef int8_t int_fast8_t;\n\
+typedef int int_fast16_t;\n\
+typedef int32_t int_fast32_t;\n\
+typedef int64_t int_fast64_t;\n\n\
+typedef uint8_t uint_fast8_t;\n\
+typedef unsigned int uint_fast16_t;\n\
+typedef uint32_t uint_fast32_t;\n\
+typedef uint64_t uint_fast64_t;\n\n\
+/* Ranges */\n\
+#define UINT8_MAX (~(uint8_t)0)\n\
+#define UINT8_MIN 0\n\
+#define UINT16_MAX (~(uint16_t)0)\n\
+#define UINT16_MIN 0\n\
+#define UINT32_MAX (~(uint32_t)0)\n\
+#define UINT32_MIN 0\n\
+#define UINT64_MAX (~(uint64_t)0)\n\
+#define UINT64_MIN 0\n\n\
+#define UINTPTR_MAX (~(uintptr_t)0)\n\
+#define UINTPTR_MIN 0\n\n\
+/* Need to do int_fast16_t as well, as type\n\
+   size may be architecture dependent */\n\
+#define UINT_FAST16_MAX (~(uint_fast16_t)0)\n\
+#define UINT_FAST16_MAX 0\n\n\
+#define INT8_MAX (UINT8_MAX>>1)\n\
+#define INT8_MIN (INT8_MAX+1)\n\
+#define INT16_MAX (UINT16_MAX>>1)\n\
+#define INT16_MIN (INT16_MAX+1)\n\
+#define INT32_MAX (UINT32_MAX>>1)\n\
+#define INT32_MIN (INT32_MAX+1)\n\
+#define INT64_MAX (UINT64_MAX>>1)\n\
+#define INT64_MIN (INT64_MAX+1)\n\n\
+#define INTPTR_MAX (UINTPTR_MAX>>1)\n\
+#define INTPTR_MIN (INTPTR_MAX+1)\t\n\n\
+#define INT_FAST16_MAX (UINT_FAST16_MAX>>1)\n\
+#define INT_FAST16_MIN (INT_FAST16_MAX+1)\n\n\
+/* now define equiv. constants */\n\
+#define UINT_FAST8_MAX UINT8_MAX\n\
+#define UINT_FAST8_MIN UINT_FAST8_MIN\n\
+#define INT_FAST8_MAX INT8_MAX\n\
+#define INT_FAST8_MIN INT8_MIN\n\
+#define UINT_FAST32_MAX UINT32_MAX\n\
+#define UINT_FAST32_MIN UINT32_MIN\n\
+#define INT_FAST32_MAX INT32_MAX\n\
+#define INT_FAST32_MIN INT32_MIN\n\
+#define UINT_FAST64_MAX UINT64_MAX\n\
+#define UINT_FAST64_MIN UINT64_MIN\n\
+#define INT_FAST64_MAX INT64_MAX\n\
+#define INT_FAST64_MIN INT64_MIN\n\n\
+#define UINT_LEAST8_MAX UINT8_MAX\n\
+#define UINT_LEAST8_MIN UINT8_MIN\n\
+#define INT_LEAST8_MAX INT8_MAX\n\
+#define INT_LEAST8_MIN INT8_MIN\n\
+#define UINT_LEAST16_MAX UINT16_MAX\n\
+#define UINT_LEAST16_MIN UINT16_MIN\n\
+#define INT_LEAST16_MAX INT16_MAX\n\
+#define INT_LEAST16_MIN INT16_MIN\n\
+#define UINT_LEAST32_MAX UINT32_MAX\n\
+#define UINT_LEAST32_MIN UINT32_MIN\n\
+#define INT_LEAST32_MAX INT32_MAX\n\
+#define INT_LEAST32_MIN INT32_MIN\n\
+#define UINT_LEAST64_MAX UINT64_MAX\n\
+#define UINT_LEAST64_MIN UINT64_MIN\n\
+#define INT_LEAST64_MAX INT64_MAX\n\
+#define INT_LEAST64_MIN INT64_MIN\n\n\
+#define UINTMAX_MAX UINT64_MAX\n\
+#define UINTMAX_MIN UINT64_MIN\n\
+#define INTMAX_MAX INT64_MAX\n\
+#define INTMAX_MIN INT64_MIN\n\n\
+#endif",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Aab_Vxworks_Unistd fix
+ */
+tSCC zAab_Vxworks_UnistdName[] =
+     "AAB_vxworks_unistd";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zAab_Vxworks_UnistdList[] =
+  "unistd.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzAab_Vxworks_UnistdMachs[] = {
+        "*-*-vxworks*",
+        (const char*)NULL };
+#define AAB_VXWORKS_UNISTD_TEST_CT  0
+#define aAab_Vxworks_UnistdTests   (tTestDesc*)NULL
+
+/*
+ *  Fix Command Arguments for Aab_Vxworks_Unistd
+ */
+static const char* apzAab_Vxworks_UnistdPatch[] = {
+"#ifndef _UNISTD_H\n\
+#define _UNISTD_H\n\
+#include_next <unistd.h>\n\
+#include <ioLib.h>\n\
+#ifndef STDIN_FILENO\n\
+#define STDIN_FILENO 0\n\
+#endif\n\
+#ifndef STDOUT_FILENO\n\
+#define STDOUT_FILENO 1\n\
+#endif\n\
+#ifndef STDERR_FILENO\n\
+#define STDERR_FILENO 2\n\
+#endif\n\
+#endif /* _UNISTD_H */",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
  *  Description of Aix_Complex fix
  */
 tSCC zAix_ComplexName[] =
@@ -674,6 +925,123 @@ static const char* apzAix_Once_Init_2Patch[] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
+ *  Description of Aix_Mutex_Initializer_1 fix
+ */
+tSCC zAix_Mutex_Initializer_1Name[] =
+     "aix_mutex_initializer_1";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zAix_Mutex_Initializer_1List[] =
+  "pthread.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzAix_Mutex_Initializer_1Machs[] = {
+        "*-*-aix*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zAix_Mutex_Initializer_1Select0[] =
+       "#define[ \t]PTHREAD_MUTEX_INITIALIZER \\\\\n\
+\\{ \\\\\n";
+
+#define    AIX_MUTEX_INITIALIZER_1_TEST_CT  1
+static tTestDesc aAix_Mutex_Initializer_1Tests[] = {
+  { TT_EGREP,    zAix_Mutex_Initializer_1Select0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Aix_Mutex_Initializer_1
+ */
+static const char* apzAix_Mutex_Initializer_1Patch[] = {
+    "format",
+    "#define PTHREAD_MUTEX_INITIALIZER \\\n\
+{{ \\\n",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Aix_Cond_Initializer_1 fix
+ */
+tSCC zAix_Cond_Initializer_1Name[] =
+     "aix_cond_initializer_1";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zAix_Cond_Initializer_1List[] =
+  "pthread.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzAix_Cond_Initializer_1Machs[] = {
+        "*-*-aix*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zAix_Cond_Initializer_1Select0[] =
+       "#define[ \t]PTHREAD_COND_INITIALIZER \\\\\n\
+\\{ \\\\\n";
+
+#define    AIX_COND_INITIALIZER_1_TEST_CT  1
+static tTestDesc aAix_Cond_Initializer_1Tests[] = {
+  { TT_EGREP,    zAix_Cond_Initializer_1Select0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Aix_Cond_Initializer_1
+ */
+static const char* apzAix_Cond_Initializer_1Patch[] = {
+    "format",
+    "#define PTHREAD_COND_INITIALIZER \\\n\
+{{ \\\n",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Aix_Rwlock_Initializer_1 fix
+ */
+tSCC zAix_Rwlock_Initializer_1Name[] =
+     "aix_rwlock_initializer_1";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zAix_Rwlock_Initializer_1List[] =
+  "pthread.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzAix_Rwlock_Initializer_1Machs[] = {
+        "*-*-aix*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zAix_Rwlock_Initializer_1Select0[] =
+       "#define[ \t]PTHREAD_RWLOCK_INITIALIZER \\\\\n\
+\\{ \\\\\n";
+
+#define    AIX_RWLOCK_INITIALIZER_1_TEST_CT  1
+static tTestDesc aAix_Rwlock_Initializer_1Tests[] = {
+  { TT_EGREP,    zAix_Rwlock_Initializer_1Select0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Aix_Rwlock_Initializer_1
+ */
+static const char* apzAix_Rwlock_Initializer_1Patch[] = {
+    "format",
+    "#define PTHREAD_RWLOCK_INITIALIZER \\\n\
+{{ \\\n",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
  *  Description of Aix_Pthread fix
  */
 tSCC zAix_PthreadName[] =
@@ -1064,254 +1432,107 @@ static const char* apzAlpha___AssertPatch[] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Alpha___Extern_Prefix fix
+ *  Description of Alpha_Assert fix
  */
-tSCC zAlpha___Extern_PrefixName[] =
-     "alpha___extern_prefix";
+tSCC zAlpha_AssertName[] =
+     "alpha_assert";
 
 /*
  *  File name selection pattern
  */
-#define zAlpha___Extern_PrefixList (char*)NULL
+tSCC zAlpha_AssertList[] =
+  "assert.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzAlpha___Extern_PrefixMachs[] = {
-        "alpha*-dec-osf*",
-        (const char*)NULL };
+#define apzAlpha_AssertMachs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zAlpha___Extern_PrefixSelect0[] =
-       "(.*)(defined\\(__DECC\\)|def[ \t]*__DECC)[ \t]*\n\
-(#[ \t]*pragma[ \t]*extern_prefix.*)";
+tSCC zAlpha_AssertSelect0[] =
+       "(#[ \t]*define assert\\(EX\\).*)\\(\\(int\\) \\(EX\\)\\)";
 
-#define    ALPHA___EXTERN_PREFIX_TEST_CT  1
-static tTestDesc aAlpha___Extern_PrefixTests[] = {
-  { TT_EGREP,    zAlpha___Extern_PrefixSelect0, (regex_t*)NULL }, };
+#define    ALPHA_ASSERT_TEST_CT  1
+static tTestDesc aAlpha_AssertTests[] = {
+  { TT_EGREP,    zAlpha_AssertSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Alpha___Extern_Prefix
+ *  Fix Command Arguments for Alpha_Assert
  */
-static const char* apzAlpha___Extern_PrefixPatch[] = {
+static const char* apzAlpha_AssertPatch[] = {
     "format",
-    "%1 (defined(__DECC) || defined(__PRAGMA_EXTERN_PREFIX))\n\
-%3",
+    "%1(EX)",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Alpha___Extern_Prefix_Standards fix
+ *  Description of Alpha_Getopt fix
  */
-tSCC zAlpha___Extern_Prefix_StandardsName[] =
-     "alpha___extern_prefix_standards";
+tSCC zAlpha_GetoptName[] =
+     "alpha_getopt";
 
 /*
  *  File name selection pattern
  */
-tSCC zAlpha___Extern_Prefix_StandardsList[] =
-  "standards.h\0";
+tSCC zAlpha_GetoptList[] =
+  "stdio.h\0stdlib.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzAlpha___Extern_Prefix_StandardsMachs[] = {
-        "alpha*-dec-osf*",
-        (const char*)NULL };
+#define apzAlpha_GetoptMachs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zAlpha___Extern_Prefix_StandardsSelect0[] =
-       ".*!defined\\(_LIBC_POLLUTION_H_\\) && !defined\\(__DECC\\)";
+tSCC zAlpha_GetoptSelect0[] =
+       "getopt\\(int, char \\*\\[\\], *char \\*\\)";
 
-#define    ALPHA___EXTERN_PREFIX_STANDARDS_TEST_CT  1
-static tTestDesc aAlpha___Extern_Prefix_StandardsTests[] = {
-  { TT_EGREP,    zAlpha___Extern_Prefix_StandardsSelect0, (regex_t*)NULL }, };
+#define    ALPHA_GETOPT_TEST_CT  1
+static tTestDesc aAlpha_GetoptTests[] = {
+  { TT_EGREP,    zAlpha_GetoptSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Alpha___Extern_Prefix_Standards
+ *  Fix Command Arguments for Alpha_Getopt
  */
-static const char* apzAlpha___Extern_Prefix_StandardsPatch[] = {
+static const char* apzAlpha_GetoptPatch[] = {
     "format",
-    "%0 && !defined(__PRAGMA_EXTERN_PREFIX)",
+    "getopt(int, char *const[], const char *)",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Alpha___Extern_Prefix_Sys_Stat fix
+ *  Description of Alpha_If_Semicolon fix
  */
-tSCC zAlpha___Extern_Prefix_Sys_StatName[] =
-     "alpha___extern_prefix_sys_stat";
+tSCC zAlpha_If_SemicolonName[] =
+     "alpha_if_semicolon";
 
 /*
  *  File name selection pattern
  */
-tSCC zAlpha___Extern_Prefix_Sys_StatList[] =
-  "sys/stat.h\0sys/mount.h\0";
+tSCC zAlpha_If_SemicolonList[] =
+  "net/if.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzAlpha___Extern_Prefix_Sys_StatMachs[] = {
-        "alpha*-dec-osf5*",
-        (const char*)NULL };
+#define apzAlpha_If_SemicolonMachs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zAlpha___Extern_Prefix_Sys_StatSelect0[] =
-       "#[ \t]*if[ \t]*defined\\(__DECC\\)";
+tSCC zAlpha_If_SemicolonSelect0[] =
+       "struct[ \t]+sockaddr[ \t]+vmif_paddr[ \t]+/\\*";
 
-#define    ALPHA___EXTERN_PREFIX_SYS_STAT_TEST_CT  1
-static tTestDesc aAlpha___Extern_Prefix_Sys_StatTests[] = {
-  { TT_EGREP,    zAlpha___Extern_Prefix_Sys_StatSelect0, (regex_t*)NULL }, };
+#define    ALPHA_IF_SEMICOLON_TEST_CT  1
+static tTestDesc aAlpha_If_SemicolonTests[] = {
+  { TT_EGREP,    zAlpha_If_SemicolonSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Alpha___Extern_Prefix_Sys_Stat
+ *  Fix Command Arguments for Alpha_If_Semicolon
  */
-static const char* apzAlpha___Extern_Prefix_Sys_StatPatch[] = {
+static const char* apzAlpha_If_SemicolonPatch[] = {
     "format",
-    "%0 || defined(__PRAGMA_EXTERN_PREFIX)",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Alpha_Assert fix
- */
-tSCC zAlpha_AssertName[] =
-     "alpha_assert";
-
-/*
- *  File name selection pattern
- */
-tSCC zAlpha_AssertList[] =
-  "assert.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-#define apzAlpha_AssertMachs (const char**)NULL
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zAlpha_AssertSelect0[] =
-       "(#[ \t]*define assert\\(EX\\).*)\\(\\(int\\) \\(EX\\)\\)";
-
-#define    ALPHA_ASSERT_TEST_CT  1
-static tTestDesc aAlpha_AssertTests[] = {
-  { TT_EGREP,    zAlpha_AssertSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Alpha_Assert
- */
-static const char* apzAlpha_AssertPatch[] = {
-    "format",
-    "%1(EX)",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Alpha_Bad_Lval fix
- */
-tSCC zAlpha_Bad_LvalName[] =
-     "alpha_bad_lval";
-
-/*
- *  File name selection pattern
- */
-#define zAlpha_Bad_LvalList (char*)NULL
-/*
- *  Machine/OS name selection pattern
- */
-tSCC* apzAlpha_Bad_LvalMachs[] = {
-        "alpha*-dec-osf*",
-        (const char*)NULL };
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zAlpha_Bad_LvalSelect0[] =
-       "^[ \t]*#[ \t]*pragma[ \t]+extern_prefix";
-
-#define    ALPHA_BAD_LVAL_TEST_CT  1
-static tTestDesc aAlpha_Bad_LvalTests[] = {
-  { TT_EGREP,    zAlpha_Bad_LvalSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Alpha_Bad_Lval
- */
-static const char* apzAlpha_Bad_LvalPatch[] = { sed_cmd_z,
-    "-e", "s/^[ \t]*#[ \t]*define[ \t][ \t]*\\([^(]*\\)\\(([^)]*)\\)[ \t]*\\(_.*\\)\\1\\2[ \t]*$/#define \\1 \\3\\1/",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Alpha_Getopt fix
- */
-tSCC zAlpha_GetoptName[] =
-     "alpha_getopt";
-
-/*
- *  File name selection pattern
- */
-tSCC zAlpha_GetoptList[] =
-  "stdio.h\0stdlib.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-#define apzAlpha_GetoptMachs (const char**)NULL
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zAlpha_GetoptSelect0[] =
-       "getopt\\(int, char \\*\\[\\], *char \\*\\)";
-
-#define    ALPHA_GETOPT_TEST_CT  1
-static tTestDesc aAlpha_GetoptTests[] = {
-  { TT_EGREP,    zAlpha_GetoptSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Alpha_Getopt
- */
-static const char* apzAlpha_GetoptPatch[] = {
-    "format",
-    "getopt(int, char *const[], const char *)",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Alpha_If_Semicolon fix
- */
-tSCC zAlpha_If_SemicolonName[] =
-     "alpha_if_semicolon";
-
-/*
- *  File name selection pattern
- */
-tSCC zAlpha_If_SemicolonList[] =
-  "net/if.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-#define apzAlpha_If_SemicolonMachs (const char**)NULL
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zAlpha_If_SemicolonSelect0[] =
-       "struct[ \t]+sockaddr[ \t]+vmif_paddr[ \t]+/\\*";
-
-#define    ALPHA_IF_SEMICOLON_TEST_CT  1
-static tTestDesc aAlpha_If_SemicolonTests[] = {
-  { TT_EGREP,    zAlpha_If_SemicolonSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Alpha_If_Semicolon
- */
-static const char* apzAlpha_If_SemicolonPatch[] = {
-    "format",
-    "struct sockaddr vmif_paddr;\t/*",
+    "struct sockaddr vmif_paddr;\t/*",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -1351,126 +1572,6 @@ static const char* apzAlpha_ParensPatch[] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Alpha_Pthread fix
- */
-tSCC zAlpha_PthreadName[] =
-     "alpha_pthread";
-
-/*
- *  File name selection pattern
- */
-tSCC zAlpha_PthreadList[] =
-  "pthread.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-tSCC* apzAlpha_PthreadMachs[] = {
-        "alpha*-dec-osf*",
-        (const char*)NULL };
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zAlpha_PthreadSelect0[] =
-       "((#[ \t]*if)([ \t]*defined[ \t]*\\(_PTHREAD_ENV_DECC\\)|def _PTHREAD_ENV_DECC)(.*))\n\
-(#[ \t]*define _PTHREAD_USE_PTDNAM_)";
-
-#define    ALPHA_PTHREAD_TEST_CT  1
-static tTestDesc aAlpha_PthreadTests[] = {
-  { TT_EGREP,    zAlpha_PthreadSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Alpha_Pthread
- */
-static const char* apzAlpha_PthreadPatch[] = {
-    "format",
-    "%2 defined (_PTHREAD_ENV_DECC)%4 || defined (__PRAGMA_EXTERN_PREFIX)\n\
-%5",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Alpha_Pthread_Gcc fix
- */
-tSCC zAlpha_Pthread_GccName[] =
-     "alpha_pthread_gcc";
-
-/*
- *  File name selection pattern
- */
-tSCC zAlpha_Pthread_GccList[] =
-  "pthread.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-tSCC* apzAlpha_Pthread_GccMachs[] = {
-        "alpha*-dec-osf*",
-        (const char*)NULL };
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zAlpha_Pthread_GccSelect0[] =
-       "#else\n\
-# error <pthread.h>: unrecognized compiler.";
-
-#define    ALPHA_PTHREAD_GCC_TEST_CT  1
-static tTestDesc aAlpha_Pthread_GccTests[] = {
-  { TT_EGREP,    zAlpha_Pthread_GccSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Alpha_Pthread_Gcc
- */
-static const char* apzAlpha_Pthread_GccPatch[] = {
-    "format",
-    "#elif defined (__GNUC__)\n\
-# define _PTHREAD_ENV_GCC\n\
-%0",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Alpha_Pthread_Init fix
- */
-tSCC zAlpha_Pthread_InitName[] =
-     "alpha_pthread_init";
-
-/*
- *  File name selection pattern
- */
-tSCC zAlpha_Pthread_InitList[] =
-  "pthread.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-tSCC* apzAlpha_Pthread_InitMachs[] = {
-        "alpha*-dec-osf*",
-        (const char*)NULL };
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zAlpha_Pthread_InitSelect0[] =
-       " \\* @\\(#\\).RCSfile: pthread\\.h,v \\$ .Revision: 1\\.1\\.33\\.21 \\$ \\(DEC\\) .Date: 2000/08/15 15:30:13 \\$";
-
-#define    ALPHA_PTHREAD_INIT_TEST_CT  1
-static tTestDesc aAlpha_Pthread_InitTests[] = {
-  { TT_EGREP,    zAlpha_Pthread_InitSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Alpha_Pthread_Init
- */
-static const char* apzAlpha_Pthread_InitPatch[] = { sed_cmd_z,
-    "-e", "s@MVALID\\(.*\\)A}@MVALID\\1A, 0, 0, 0, 0, 0, 0 }@\n\
-s@MVALID\\(.*\\)_}@MVALID\\1_, 0, 0, 0, 0 }@\n\
-s@CVALID\\(.*\\)A}@CVALID\\1A, 0, 0, 0, 0 }@\n\
-s@CVALID\\(.*\\)_}@CVALID\\1_, 0, 0 }@\n\
-s@WVALID\\(.*\\)A}@WVALID\\1A, 0, 0, 0, 0, 0, 0, 0, 0, 0 }@\n\
-s@WVALID\\(.*\\)_}@WVALID\\1_, 0, 0, 0, 0, 0, 0, 0 }@\n",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
  *  Description of Alpha_Sbrk fix
  */
 tSCC zAlpha_SbrkName[] =
@@ -1854,7 +1955,7 @@ tSCC zBroken_NanList[] =
  *  content selection pattern - do fix if pattern found
  */
 tSCC zBroken_NanSelect0[] =
-       "#if defined(__APPLE_CC__) && (__APPLE_CC__ >= 1345)";
+       "#if defined\\(__APPLE_CC__\\) && \\(__APPLE_CC__ >= 1345\\)";
 
 /*
  *  content bypass pattern - skip fix if pattern found
@@ -2067,6 +2168,44 @@ extern \"C\" {\n\
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
+ *  Description of Darwin_9_Long_Double_Funcs_2 fix
+ */
+tSCC zDarwin_9_Long_Double_Funcs_2Name[] =
+     "darwin_9_long_double_funcs_2";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zDarwin_9_Long_Double_Funcs_2List[] =
+  "math.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzDarwin_9_Long_Double_Funcs_2Machs[] = {
+        "*-*-darwin7.9*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zDarwin_9_Long_Double_Funcs_2Select0[] =
+       "#include[ \\t]+\\\"";
+
+#define    DARWIN_9_LONG_DOUBLE_FUNCS_2_TEST_CT  1
+static tTestDesc aDarwin_9_Long_Double_Funcs_2Tests[] = {
+  { TT_EGREP,    zDarwin_9_Long_Double_Funcs_2Select0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Darwin_9_Long_Double_Funcs_2
+ */
+static const char* apzDarwin_9_Long_Double_Funcs_2Patch[] = {
+    "format",
+    "%1<%2.h>",
+    "([ \\t]*#[ \\t]*include[ \\t]+)\"([a-z0-9/]+)\\.h\"",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
  *  Description of Darwin_Externc fix
  */
 tSCC zDarwin_ExterncName[] =
@@ -4316,733 +4455,341 @@ static const char* apzHpux_Inttype_Int8_TPatch[] = {
  *  Description of Hpux_Imaginary_I fix
  */
 tSCC zHpux_Imaginary_IName[] =
-     "hpux_imaginary_i";
-
-/*
- *  File name selection pattern
- */
-tSCC zHpux_Imaginary_IList[] =
-  "complex.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-tSCC* apzHpux_Imaginary_IMachs[] = {
-        "ia64-hp-hpux11.*",
-        (const char*)NULL };
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zHpux_Imaginary_ISelect0[] =
-       "^[ \t]*#[ \t]*define[ \t]*_Complex_I.*";
-
-#define    HPUX_IMAGINARY_I_TEST_CT  1
-static tTestDesc aHpux_Imaginary_ITests[] = {
-  { TT_EGREP,    zHpux_Imaginary_ISelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Hpux_Imaginary_I
- */
-static const char* apzHpux_Imaginary_IPatch[] = {
-    "format",
-    "#define _Complex_I (__extension__ 1.0iF)",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Huge_Val_Hex fix
- */
-tSCC zHuge_Val_HexName[] =
-     "huge_val_hex";
-
-/*
- *  File name selection pattern
- */
-tSCC zHuge_Val_HexList[] =
-  "bits/huge_val.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-#define apzHuge_Val_HexMachs (const char**)NULL
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zHuge_Val_HexSelect0[] =
-       "^#[ \t]*define[ \t]*HUGE_VAL[ \t].*0x1\\.0p.*";
-
-/*
- *  content bypass pattern - skip fix if pattern found
- */
-tSCC zHuge_Val_HexBypass0[] =
-       "__builtin_huge_val";
-
-#define    HUGE_VAL_HEX_TEST_CT  2
-static tTestDesc aHuge_Val_HexTests[] = {
-  { TT_NEGREP,   zHuge_Val_HexBypass0, (regex_t*)NULL },
-  { TT_EGREP,    zHuge_Val_HexSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Huge_Val_Hex
- */
-static const char* apzHuge_Val_HexPatch[] = {
-    "format",
-    "#define HUGE_VAL (__builtin_huge_val())\n",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Huge_Valf_Hex fix
- */
-tSCC zHuge_Valf_HexName[] =
-     "huge_valf_hex";
-
-/*
- *  File name selection pattern
- */
-tSCC zHuge_Valf_HexList[] =
-  "bits/huge_val.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-#define apzHuge_Valf_HexMachs (const char**)NULL
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zHuge_Valf_HexSelect0[] =
-       "^#[ \t]*define[ \t]*HUGE_VALF[ \t].*0x1\\.0p.*";
-
-/*
- *  content bypass pattern - skip fix if pattern found
- */
-tSCC zHuge_Valf_HexBypass0[] =
-       "__builtin_huge_valf";
-
-#define    HUGE_VALF_HEX_TEST_CT  2
-static tTestDesc aHuge_Valf_HexTests[] = {
-  { TT_NEGREP,   zHuge_Valf_HexBypass0, (regex_t*)NULL },
-  { TT_EGREP,    zHuge_Valf_HexSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Huge_Valf_Hex
- */
-static const char* apzHuge_Valf_HexPatch[] = {
-    "format",
-    "#define HUGE_VALF (__builtin_huge_valf())\n",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Huge_Vall_Hex fix
- */
-tSCC zHuge_Vall_HexName[] =
-     "huge_vall_hex";
-
-/*
- *  File name selection pattern
- */
-tSCC zHuge_Vall_HexList[] =
-  "bits/huge_val.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-#define apzHuge_Vall_HexMachs (const char**)NULL
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zHuge_Vall_HexSelect0[] =
-       "^#[ \t]*define[ \t]*HUGE_VALL[ \t].*0x1\\.0p.*";
-
-/*
- *  content bypass pattern - skip fix if pattern found
- */
-tSCC zHuge_Vall_HexBypass0[] =
-       "__builtin_huge_vall";
-
-#define    HUGE_VALL_HEX_TEST_CT  2
-static tTestDesc aHuge_Vall_HexTests[] = {
-  { TT_NEGREP,   zHuge_Vall_HexBypass0, (regex_t*)NULL },
-  { TT_EGREP,    zHuge_Vall_HexSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Huge_Vall_Hex
- */
-static const char* apzHuge_Vall_HexPatch[] = {
-    "format",
-    "#define HUGE_VALL (__builtin_huge_vall())\n",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Int_Abort_Free_And_Exit fix
- */
-tSCC zInt_Abort_Free_And_ExitName[] =
-     "int_abort_free_and_exit";
-
-/*
- *  File name selection pattern
- */
-tSCC zInt_Abort_Free_And_ExitList[] =
-  "stdlib.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-#define apzInt_Abort_Free_And_ExitMachs (const char**)NULL
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zInt_Abort_Free_And_ExitSelect0[] =
-       "int[ \t]+(abort|free|exit)[ \t]*\\(";
-
-/*
- *  content bypass pattern - skip fix if pattern found
- */
-tSCC zInt_Abort_Free_And_ExitBypass0[] =
-       "_CLASSIC_ANSI_TYPES";
-
-#define    INT_ABORT_FREE_AND_EXIT_TEST_CT  2
-static tTestDesc aInt_Abort_Free_And_ExitTests[] = {
-  { TT_NEGREP,   zInt_Abort_Free_And_ExitBypass0, (regex_t*)NULL },
-  { TT_EGREP,    zInt_Abort_Free_And_ExitSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Int_Abort_Free_And_Exit
- */
-static const char* apzInt_Abort_Free_And_ExitPatch[] = {
-    "format",
-    "void\t%1(",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Io_Quotes_Def fix
- */
-tSCC zIo_Quotes_DefName[] =
-     "io_quotes_def";
-
-/*
- *  File name selection pattern
- */
-#define zIo_Quotes_DefList (char*)NULL
-/*
- *  Machine/OS name selection pattern
- */
-#define apzIo_Quotes_DefMachs (const char**)NULL
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zIo_Quotes_DefSelect0[] =
-       "define[ \t]+[A-Z0-9_]+IO[A-Z]*\\([a-zA-Z][,)]";
-
-#define    IO_QUOTES_DEF_TEST_CT  1
-static tTestDesc aIo_Quotes_DefTests[] = {
-  { TT_EGREP,    zIo_Quotes_DefSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Io_Quotes_Def
- */
-static const char* apzIo_Quotes_DefPatch[] = {
-    "char_macro_def",
-    "IO",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Io_Quotes_Use fix
- */
-tSCC zIo_Quotes_UseName[] =
-     "io_quotes_use";
-
-/*
- *  File name selection pattern
- */
-#define zIo_Quotes_UseList (char*)NULL
-/*
- *  Machine/OS name selection pattern
- */
-#define apzIo_Quotes_UseMachs (const char**)NULL
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zIo_Quotes_UseSelect0[] =
-       "define[ \t]+[A-Z0-9_]+[ \t]+[A-Z0-9_]+IO[A-Z]*[ \t]*\\( *[^,']";
-
-#define    IO_QUOTES_USE_TEST_CT  1
-static tTestDesc aIo_Quotes_UseTests[] = {
-  { TT_EGREP,    zIo_Quotes_UseSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Io_Quotes_Use
- */
-static const char* apzIo_Quotes_UsePatch[] = {
-    "char_macro_use",
-    "IO",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Ip_Missing_Semi fix
- */
-tSCC zIp_Missing_SemiName[] =
-     "ip_missing_semi";
-
-/*
- *  File name selection pattern
- */
-tSCC zIp_Missing_SemiList[] =
-  "netinet/ip.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-#define apzIp_Missing_SemiMachs (const char**)NULL
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zIp_Missing_SemiSelect0[] =
-       "}$";
-
-#define    IP_MISSING_SEMI_TEST_CT  1
-static tTestDesc aIp_Missing_SemiTests[] = {
-  { TT_EGREP,    zIp_Missing_SemiSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Ip_Missing_Semi
- */
-static const char* apzIp_Missing_SemiPatch[] = { sed_cmd_z,
-    "-e", "/^struct/,/^};/s/}$/};/",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Irix___Restrict fix
- */
-tSCC zIrix___RestrictName[] =
-     "irix___restrict";
-
-/*
- *  File name selection pattern
- */
-tSCC zIrix___RestrictList[] =
-  "internal/sgimacros.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-tSCC* apzIrix___RestrictMachs[] = {
-        "mips-sgi-irix6.5",
-        (const char*)NULL };
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zIrix___RestrictSelect0[] =
-       "(#ifdef __c99\n\
-)(#[ \t]*define __restrict restrict)";
-
-#define    IRIX___RESTRICT_TEST_CT  1
-static tTestDesc aIrix___RestrictTests[] = {
-  { TT_EGREP,    zIrix___RestrictSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Irix___Restrict
- */
-static const char* apzIrix___RestrictPatch[] = {
-    "format",
-    "%1#  ifndef __cplusplus\n\
-%2\n\
-#  endif",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Irix___Generic1 fix
- */
-tSCC zIrix___Generic1Name[] =
-     "irix___generic1";
+     "hpux_imaginary_i";
 
 /*
  *  File name selection pattern
  */
-tSCC zIrix___Generic1List[] =
-  "internal/math_core.h\0";
+tSCC zHpux_Imaginary_IList[] =
+  "complex.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzIrix___Generic1Machs[] = {
-        "mips-sgi-irix6.5",
+tSCC* apzHpux_Imaginary_IMachs[] = {
+        "ia64-hp-hpux11.*",
         (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zIrix___Generic1Select0[] =
-       "#define ([a-z]+)\\(x\\) *__generic.*";
+tSCC zHpux_Imaginary_ISelect0[] =
+       "^[ \t]*#[ \t]*define[ \t]*_Complex_I.*";
 
-#define    IRIX___GENERIC1_TEST_CT  1
-static tTestDesc aIrix___Generic1Tests[] = {
-  { TT_EGREP,    zIrix___Generic1Select0, (regex_t*)NULL }, };
+#define    HPUX_IMAGINARY_I_TEST_CT  1
+static tTestDesc aHpux_Imaginary_ITests[] = {
+  { TT_EGREP,    zHpux_Imaginary_ISelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Irix___Generic1
+ *  Fix Command Arguments for Hpux_Imaginary_I
  */
-static const char* apzIrix___Generic1Patch[] = {
+static const char* apzHpux_Imaginary_IPatch[] = {
     "format",
-    "extern int %1(double);\n\
-extern int %1f(float);\n\
-extern int %1l(long double);\n\
-#define %1(x) (sizeof(x) == sizeof(double) ? _%1(x) \\\n\
-               : sizeof(x) == sizeof(float) ? _%1f(x) \\\n\
-               : _%1l(x))\n",
+    "#define _Complex_I (__extension__ 1.0iF)",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Irix___Generic2 fix
+ *  Description of Huge_Val_Hex fix
  */
-tSCC zIrix___Generic2Name[] =
-     "irix___generic2";
+tSCC zHuge_Val_HexName[] =
+     "huge_val_hex";
 
 /*
  *  File name selection pattern
  */
-tSCC zIrix___Generic2List[] =
-  "internal/math_core.h\0";
+tSCC zHuge_Val_HexList[] =
+  "bits/huge_val.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzIrix___Generic2Machs[] = {
-        "mips-sgi-irix6.5",
-        (const char*)NULL };
+#define apzHuge_Val_HexMachs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zIrix___Generic2Select0[] =
-       "#define ([a-z]+)\\(x,y\\) *__generic.*";
+tSCC zHuge_Val_HexSelect0[] =
+       "^#[ \t]*define[ \t]*HUGE_VAL[ \t].*0x1\\.0p.*";
+
+/*
+ *  content bypass pattern - skip fix if pattern found
+ */
+tSCC zHuge_Val_HexBypass0[] =
+       "__builtin_huge_val";
 
-#define    IRIX___GENERIC2_TEST_CT  1
-static tTestDesc aIrix___Generic2Tests[] = {
-  { TT_EGREP,    zIrix___Generic2Select0, (regex_t*)NULL }, };
+#define    HUGE_VAL_HEX_TEST_CT  2
+static tTestDesc aHuge_Val_HexTests[] = {
+  { TT_NEGREP,   zHuge_Val_HexBypass0, (regex_t*)NULL },
+  { TT_EGREP,    zHuge_Val_HexSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Irix___Generic2
+ *  Fix Command Arguments for Huge_Val_Hex
  */
-static const char* apzIrix___Generic2Patch[] = {
+static const char* apzHuge_Val_HexPatch[] = {
     "format",
-    "#define %1(x,y) \\\n\
-  ((sizeof(x)<=4 && sizeof(y)<=4) ? _%1f(x,y) \\\n\
-   : (sizeof(x)<=8 && sizeof(y)<=8) ? _%1(x,y) \\\n\
-   : _%1l(x,y))\n",
+    "#define HUGE_VAL (__builtin_huge_val())\n",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Irix_Asm_Apostrophe fix
+ *  Description of Huge_Valf_Hex fix
  */
-tSCC zIrix_Asm_ApostropheName[] =
-     "irix_asm_apostrophe";
+tSCC zHuge_Valf_HexName[] =
+     "huge_valf_hex";
 
 /*
  *  File name selection pattern
  */
-tSCC zIrix_Asm_ApostropheList[] =
-  "sys/asm.h\0";
+tSCC zHuge_Valf_HexList[] =
+  "bits/huge_val.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzIrix_Asm_ApostropheMachs (const char**)NULL
+#define apzHuge_Valf_HexMachs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zIrix_Asm_ApostropheSelect0[] =
-       "^[ \t]*#.*[Ww]e're";
+tSCC zHuge_Valf_HexSelect0[] =
+       "^#[ \t]*define[ \t]*HUGE_VALF[ \t].*0x1\\.0p.*";
+
+/*
+ *  content bypass pattern - skip fix if pattern found
+ */
+tSCC zHuge_Valf_HexBypass0[] =
+       "__builtin_huge_valf";
 
-#define    IRIX_ASM_APOSTROPHE_TEST_CT  1
-static tTestDesc aIrix_Asm_ApostropheTests[] = {
-  { TT_EGREP,    zIrix_Asm_ApostropheSelect0, (regex_t*)NULL }, };
+#define    HUGE_VALF_HEX_TEST_CT  2
+static tTestDesc aHuge_Valf_HexTests[] = {
+  { TT_NEGREP,   zHuge_Valf_HexBypass0, (regex_t*)NULL },
+  { TT_EGREP,    zHuge_Valf_HexSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Irix_Asm_Apostrophe
+ *  Fix Command Arguments for Huge_Valf_Hex
  */
-static const char* apzIrix_Asm_ApostrophePatch[] = {
+static const char* apzHuge_Valf_HexPatch[] = {
     "format",
-    "%1 are",
-    "^([ \t]*#.*[Ww]e)'re",
+    "#define HUGE_VALF (__builtin_huge_valf())\n",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Irix_Complex fix
+ *  Description of Huge_Vall_Hex fix
  */
-tSCC zIrix_ComplexName[] =
-     "irix_complex";
+tSCC zHuge_Vall_HexName[] =
+     "huge_vall_hex";
 
 /*
  *  File name selection pattern
  */
-tSCC zIrix_ComplexList[] =
-  "complex.h\0";
+tSCC zHuge_Vall_HexList[] =
+  "bits/huge_val.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzIrix_ComplexMachs[] = {
-        "mips-sgi-irix6.5",
-        (const char*)NULL };
+#define apzHuge_Vall_HexMachs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zIrix_ComplexSelect0[] =
-       "#define[ \t]_Complex_I[ \t]\\(\\(float[ \t]_Complex\\)[ \t]\\(__I__\\)\\)";
+tSCC zHuge_Vall_HexSelect0[] =
+       "^#[ \t]*define[ \t]*HUGE_VALL[ \t].*0x1\\.0p.*";
+
+/*
+ *  content bypass pattern - skip fix if pattern found
+ */
+tSCC zHuge_Vall_HexBypass0[] =
+       "__builtin_huge_vall";
 
-#define    IRIX_COMPLEX_TEST_CT  1
-static tTestDesc aIrix_ComplexTests[] = {
-  { TT_EGREP,    zIrix_ComplexSelect0, (regex_t*)NULL }, };
+#define    HUGE_VALL_HEX_TEST_CT  2
+static tTestDesc aHuge_Vall_HexTests[] = {
+  { TT_NEGREP,   zHuge_Vall_HexBypass0, (regex_t*)NULL },
+  { TT_EGREP,    zHuge_Vall_HexSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Irix_Complex
+ *  Fix Command Arguments for Huge_Vall_Hex
  */
-static const char* apzIrix_ComplexPatch[] = { sed_cmd_z,
-    "-e", "s/#define[ \t]_Complex_I[ \t]((float[ \t]_Complex)[ \t](__I__))/#define _Complex_I (__extension__ 1.0iF)/",
-    "-e", "/#define[ \t]imaginary[ \t]_Imaginary/d",
-    "-e", "/#define[ \t]_Imaginary_I/d",
-    "-e", "s/#define[ \t]I[ \t]_Imaginary_I/#define I _Complex_I/",
+static const char* apzHuge_Vall_HexPatch[] = {
+    "format",
+    "#define HUGE_VALL (__builtin_huge_vall())\n",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Irix_Limits_Const fix
+ *  Description of Int_Abort_Free_And_Exit fix
  */
-tSCC zIrix_Limits_ConstName[] =
-     "irix_limits_const";
+tSCC zInt_Abort_Free_And_ExitName[] =
+     "int_abort_free_and_exit";
 
 /*
  *  File name selection pattern
  */
-tSCC zIrix_Limits_ConstList[] =
-  "fixinc-test-limits.h\0limits.h\0";
+tSCC zInt_Abort_Free_And_ExitList[] =
+  "stdlib.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzIrix_Limits_ConstMachs (const char**)NULL
+#define apzInt_Abort_Free_And_ExitMachs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zIrix_Limits_ConstSelect0[] =
-       "^extern const ";
+tSCC zInt_Abort_Free_And_ExitSelect0[] =
+       "int[ \t]+(abort|free|exit)[ \t]*\\(";
 
-#define    IRIX_LIMITS_CONST_TEST_CT  1
-static tTestDesc aIrix_Limits_ConstTests[] = {
-  { TT_EGREP,    zIrix_Limits_ConstSelect0, (regex_t*)NULL }, };
+/*
+ *  content bypass pattern - skip fix if pattern found
+ */
+tSCC zInt_Abort_Free_And_ExitBypass0[] =
+       "_CLASSIC_ANSI_TYPES";
+
+#define    INT_ABORT_FREE_AND_EXIT_TEST_CT  2
+static tTestDesc aInt_Abort_Free_And_ExitTests[] = {
+  { TT_NEGREP,   zInt_Abort_Free_And_ExitBypass0, (regex_t*)NULL },
+  { TT_EGREP,    zInt_Abort_Free_And_ExitSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Irix_Limits_Const
+ *  Fix Command Arguments for Int_Abort_Free_And_Exit
  */
-static const char* apzIrix_Limits_ConstPatch[] = {
+static const char* apzInt_Abort_Free_And_ExitPatch[] = {
     "format",
-    "extern __const ",
+    "void\t%1(",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Irix_Pthread_Init fix
+ *  Description of Io_Quotes_Def fix
  */
-tSCC zIrix_Pthread_InitName[] =
-     "irix_pthread_init";
+tSCC zIo_Quotes_DefName[] =
+     "io_quotes_def";
 
 /*
  *  File name selection pattern
  */
-tSCC zIrix_Pthread_InitList[] =
-  "pthread.h\0";
+#define zIo_Quotes_DefList (char*)NULL
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzIrix_Pthread_InitMachs[] = {
-        "mips-sgi-irix6.5",
-        (const char*)NULL };
+#define apzIo_Quotes_DefMachs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zIrix_Pthread_InitSelect0[] =
-       "^(#define[ \t]+PTHREAD_.*_INITIALIZER[ \t]+)(\\{ 0 \\})";
+tSCC zIo_Quotes_DefSelect0[] =
+       "define[ \t]+[A-Z0-9_]+IO[A-Z]*\\([a-zA-Z][,)]";
 
-#define    IRIX_PTHREAD_INIT_TEST_CT  1
-static tTestDesc aIrix_Pthread_InitTests[] = {
-  { TT_EGREP,    zIrix_Pthread_InitSelect0, (regex_t*)NULL }, };
+#define    IO_QUOTES_DEF_TEST_CT  1
+static tTestDesc aIo_Quotes_DefTests[] = {
+  { TT_EGREP,    zIo_Quotes_DefSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Irix_Pthread_Init
+ *  Fix Command Arguments for Io_Quotes_Def
  */
-static const char* apzIrix_Pthread_InitPatch[] = {
-    "format",
-    "%1{ %2 }",
+static const char* apzIo_Quotes_DefPatch[] = {
+    "char_macro_def",
+    "IO",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Irix_Socklen_T fix
+ *  Description of Io_Quotes_Use fix
  */
-tSCC zIrix_Socklen_TName[] =
-     "irix_socklen_t";
+tSCC zIo_Quotes_UseName[] =
+     "io_quotes_use";
 
 /*
  *  File name selection pattern
  */
-tSCC zIrix_Socklen_TList[] =
-  "sys/socket.h\0";
+#define zIo_Quotes_UseList (char*)NULL
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzIrix_Socklen_TMachs[] = {
-        "mips-sgi-irix6.5",
-        (const char*)NULL };
+#define apzIo_Quotes_UseMachs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zIrix_Socklen_TSelect0[] =
-       "(#define _SOCKLEN_T\n\
-)(typedef u_int32_t socklen_t;)";
+tSCC zIo_Quotes_UseSelect0[] =
+       "define[ \t]+[A-Z0-9_]+[ \t]+[A-Z0-9_]+IO[A-Z]*[ \t]*\\( *[^,']";
 
-#define    IRIX_SOCKLEN_T_TEST_CT  1
-static tTestDesc aIrix_Socklen_TTests[] = {
-  { TT_EGREP,    zIrix_Socklen_TSelect0, (regex_t*)NULL }, };
+#define    IO_QUOTES_USE_TEST_CT  1
+static tTestDesc aIo_Quotes_UseTests[] = {
+  { TT_EGREP,    zIo_Quotes_UseSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Irix_Socklen_T
+ *  Fix Command Arguments for Io_Quotes_Use
  */
-static const char* apzIrix_Socklen_TPatch[] = {
-    "format",
-    "%1#if _NO_XOPEN4 && _NO_XOPEN5\n\
-typedef int socklen_t;\n\
-#else\n\
-%2\n\
-#endif /* _NO_XOPEN4 && _NO_XOPEN5 */",
+static const char* apzIo_Quotes_UsePatch[] = {
+    "char_macro_use",
+    "IO",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Irix_Stdint_C99_Mode fix
+ *  Description of Ip_Missing_Semi fix
  */
-tSCC zIrix_Stdint_C99_ModeName[] =
-     "irix_stdint_c99_mode";
+tSCC zIp_Missing_SemiName[] =
+     "ip_missing_semi";
 
 /*
  *  File name selection pattern
  */
-tSCC zIrix_Stdint_C99_ModeList[] =
-  "stdint.h\0";
+tSCC zIp_Missing_SemiList[] =
+  "netinet/ip.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzIrix_Stdint_C99_ModeMachs[] = {
-        "mips-sgi-irix6.5",
-        (const char*)NULL };
+#define apzIp_Missing_SemiMachs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zIrix_Stdint_C99_ModeSelect0[] =
-       "(#ifndef __c99\n\
-)(#error This header file is to be used only for c99 mode compilations)";
+tSCC zIp_Missing_SemiSelect0[] =
+       "}$";
 
-#define    IRIX_STDINT_C99_MODE_TEST_CT  1
-static tTestDesc aIrix_Stdint_C99_ModeTests[] = {
-  { TT_EGREP,    zIrix_Stdint_C99_ModeSelect0, (regex_t*)NULL }, };
+#define    IP_MISSING_SEMI_TEST_CT  1
+static tTestDesc aIp_Missing_SemiTests[] = {
+  { TT_EGREP,    zIp_Missing_SemiSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Irix_Stdint_C99_Mode
+ *  Fix Command Arguments for Ip_Missing_Semi
  */
-static const char* apzIrix_Stdint_C99_ModePatch[] = {
-    "format",
-    "#if 0\n\
-%2",
+static const char* apzIp_Missing_SemiPatch[] = { sed_cmd_z,
+    "-e", "/^struct/,/^};/s/}$/};/",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Irix_Stdint_C99_Types fix
+ *  Description of Irix_Limits_Const fix
  */
-tSCC zIrix_Stdint_C99_TypesName[] =
-     "irix_stdint_c99_types";
+tSCC zIrix_Limits_ConstName[] =
+     "irix_limits_const";
 
 /*
  *  File name selection pattern
  */
-tSCC zIrix_Stdint_C99_TypesList[] =
-  "stdint-irix65.h\0stdint.h\0";
+tSCC zIrix_Limits_ConstList[] =
+  "fixinc-test-limits.h\0limits.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzIrix_Stdint_C99_TypesMachs[] = {
-        "mips-sgi-irix6.5",
-        (const char*)NULL };
-#define IRIX_STDINT_C99_TYPES_TEST_CT  0
-#define aIrix_Stdint_C99_TypesTests   (tTestDesc*)NULL
+#define apzIrix_Limits_ConstMachs (const char**)NULL
 
 /*
- *  Fix Command Arguments for Irix_Stdint_C99_Types
- */
-static const char* apzIrix_Stdint_C99_TypesPatch[] = { sed_cmd_z,
-    "-e", "s@^#define INT64_MIN.*(-0x7fffffffffffffff - 1)$@#define INT64_MIN               (-0x7fffffffffffffffLL - 1)@",
-    "-e", "s@^#define INT64_MAX.*0x7fffffffffffffff$@#define INT64_MAX               0x7fffffffffffffffLL@",
-    "-e", "s@^#define UINT32_MAX.*0xffffffff$@#define UINT32_MAX              0xffffffffU@",
-    "-e", "s@^#define UINT64_MAX.*0xffffffffffffffff$@#define UINT64_MAX              0xffffffffffffffffULL@",
-    "-e", "s@^#define INTPTR_MIN.*INT32_MIN$@#define INTPTR_MIN              (-0x7fffffffL - 1)@",
-    "-e", "s@^#define INTPTR_MAX.*INT32_MAX$@#define INTPTR_MAX              0x7fffffffL@",
-    "-e", "s@^#define UINTPTR_MAX.*UINT32_MAX$@#define UINTPTR_MAX             0xffffffffUL@",
-    "-e", "s@^#define INTPTR_MIN.*INT64_MIN@#define INTPTR_MIN              (-0x7fffffffffffffffL - 1)@",
-    "-e", "s@^#define INTPTR_MAX.*INT64_MAX$@#define INTPTR_MAX              0x7fffffffffffffffL@",
-    "-e", "s@^#define UINTPTR_MAX.*UINT64_MAX$@#define UINTPTR_MAX             0xffffffffffffffffUL@",
-    "-e", "s@^#define PTRDIFF_MIN.*INT64_MIN$@#define PTRDIFF_MIN             (-0x7fffffffffffffffL - 1)@",
-    "-e", "s@^#define PTRDIFF_MAX.*INT64_MAX$@#define PTRDIFF_MAX             0x7fffffffffffffffL@",
-    "-e", "s@^#define SIZE_MAX.*UINT64_MAX$@#define SIZE_MAX                0xffffffffffffffffUL@",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Irix_Stdint_C99_Macros fix
+ *  content selection pattern - do fix if pattern found
  */
-tSCC zIrix_Stdint_C99_MacrosName[] =
-     "irix_stdint_c99_macros";
+tSCC zIrix_Limits_ConstSelect0[] =
+       "^extern const ";
 
-/*
- *  File name selection pattern
- */
-tSCC zIrix_Stdint_C99_MacrosList[] =
-  "stdint-irix65.h\0stdint.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-tSCC* apzIrix_Stdint_C99_MacrosMachs[] = {
-        "mips-sgi-irix6.5",
-        (const char*)NULL };
-#define IRIX_STDINT_C99_MACROS_TEST_CT  0
-#define aIrix_Stdint_C99_MacrosTests   (tTestDesc*)NULL
+#define    IRIX_LIMITS_CONST_TEST_CT  1
+static tTestDesc aIrix_Limits_ConstTests[] = {
+  { TT_EGREP,    zIrix_Limits_ConstSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Irix_Stdint_C99_Macros
+ *  Fix Command Arguments for Irix_Limits_Const
  */
-static const char* apzIrix_Stdint_C99_MacrosPatch[] = { sed_cmd_z,
-    "-e", "s@^#define INT8_C(x).*int.*_t.*$@#define INT8_C(x)               (x)@",
-    "-e", "s@^#define INT16_C(x).*int.*_t.*$@#define INT16_C(x)              (x)@",
-    "-e", "s@^#define INT32_C(x).*int.*_t.*$@#define INT32_C(x)              (x)@",
-    "-e", "s@^#define INT64_C(x).*int.*_t.*$@#define INT64_C(x)              (x ## LL)@",
-    "-e", "s@^#define UINT8_C(x).*int.*_t.*$@#define UINT8_C(x)              (x)@",
-    "-e", "s@^#define UINT16_C(x).*int.*_t.*$@#define UINT16_C(x)             (x)@",
-    "-e", "s@^#define UINT32_C(x).*int.*_t.*$@#define UINT32_C(x)             (x ## U)@",
-    "-e", "s@^#define UINT64_C(x).*int.*_t.*$@#define UINT64_C(x)             (x ## ULL)@",
-    "-e", "s@^#define INTMAX_C(x).*int.*_t.*$@#define INTMAX_C(x)             (x ## LL)@",
-    "-e", "s@^#define UINTMAX_C(x).*int.*_t.*$@#define UINTMAX_C(x)            (x ## ULL)@",
+static const char* apzIrix_Limits_ConstPatch[] = {
+    "format",
+    "extern __const ",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -5056,7 +4803,7 @@ tSCC zIrix_Stdio_Va_ListName[] =
  *  File name selection pattern
  */
 tSCC zIrix_Stdio_Va_ListList[] =
-  "stdio.h\0internal/stdio_core.h\0";
+  "stdio.h\0";
 /*
  *  Machine/OS name selection pattern
  */
@@ -5082,45 +4829,6 @@ static const char* apzIrix_Stdio_Va_ListPatch[] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Irix_Wcsftime fix
- */
-tSCC zIrix_WcsftimeName[] =
-     "irix_wcsftime";
-
-/*
- *  File name selection pattern
- */
-tSCC zIrix_WcsftimeList[] =
-  "internal/wchar_core.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-tSCC* apzIrix_WcsftimeMachs[] = {
-        "mips-sgi-irix6.5",
-        (const char*)NULL };
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zIrix_WcsftimeSelect0[] =
-       "#if _NO_XOPEN5\n\
-(extern size_t[ \t]+wcsftime.*const char *.*)";
-
-#define    IRIX_WCSFTIME_TEST_CT  1
-static tTestDesc aIrix_WcsftimeTests[] = {
-  { TT_EGREP,    zIrix_WcsftimeSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Irix_Wcsftime
- */
-static const char* apzIrix_WcsftimePatch[] = {
-    "format",
-    "#if _NO_XOPEN5 && !defined(__c99)\n\
-%1",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
  *  Description of Kandr_Concat fix
  */
 tSCC zKandr_ConcatName[] =
@@ -6437,58 +6145,20 @@ tSCC* apzSolaris_Complex_CxxMachs[] = {
         "*-*-solaris2.*",
         (const char*)NULL };
 #define SOLARIS_COMPLEX_CXX_TEST_CT  0
-#define aSolaris_Complex_CxxTests   (tTestDesc*)NULL
-
-/*
- *  Fix Command Arguments for Solaris_Complex_Cxx
- */
-static const char* apzSolaris_Complex_CxxPatch[] = { sed_cmd_z,
-    "-e", "/#if[ \t]*!defined(__cplusplus)/c\\\n\
-#ifdef\t__cplusplus\\\n\
-extern \"C\" {\\\n\
-#endif",
-    "-e", "/#endif[ \t]*\\/\\* !defined(__cplusplus) \\*\\//c\\\n\
-#ifdef\t__cplusplus\\\n\
-}\\\n\
-#endif",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Solaris_Cond_Init fix
- */
-tSCC zSolaris_Cond_InitName[] =
-     "solaris_cond_init";
-
-/*
- *  File name selection pattern
- */
-tSCC zSolaris_Cond_InitList[] =
-  "pthread.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-tSCC* apzSolaris_Cond_InitMachs[] = {
-        "*-*-solaris2.8",
-        (const char*)NULL };
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zSolaris_Cond_InitSelect0[] =
-       "@\\(#\\)pthread.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
-
-#define    SOLARIS_COND_INIT_TEST_CT  1
-static tTestDesc aSolaris_Cond_InitTests[] = {
-  { TT_EGREP,    zSolaris_Cond_InitSelect0, (regex_t*)NULL }, };
+#define aSolaris_Complex_CxxTests   (tTestDesc*)NULL
 
 /*
- *  Fix Command Arguments for Solaris_Cond_Init
+ *  Fix Command Arguments for Solaris_Complex_Cxx
  */
-static const char* apzSolaris_Cond_InitPatch[] = {
-    "format",
-    "%1, 0x4356%2",
-    "^(#define[ \t]+PTHREAD_COND_INITIALIZER[ \t]+\\{.*0)(\\},[ \t]*0\\}.*)$",
+static const char* apzSolaris_Complex_CxxPatch[] = { sed_cmd_z,
+    "-e", "/#if[ \t]*!defined(__cplusplus)/c\\\n\
+#ifdef\t__cplusplus\\\n\
+extern \"C\" {\\\n\
+#endif",
+    "-e", "/#endif[ \t]*\\/\\* !defined(__cplusplus) \\*\\//c\\\n\
+#ifdef\t__cplusplus\\\n\
+}\\\n\
+#endif",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -6993,7 +6663,7 @@ static tTestDesc aSolaris_Pow_Int_OverloadTests[] = {
  */
 static const char* apzSolaris_Pow_Int_OverloadPatch[] = {
     "format",
-    "#ifndef __GXX_EXPERIMENTAL_CXX0X__\n\
+    "#if __cplusplus < 201103L\n\
 %0\n\
 #endif",
     (char*)NULL };
@@ -7460,7 +7130,7 @@ tSCC zSolaris_Sys_Va_ListList[] =
  *  Machine/OS name selection pattern
  */
 tSCC* apzSolaris_Sys_Va_ListMachs[] = {
-        "*-*-solaris2.[89]",
+        "*-*-solaris2.9",
         (const char*)NULL };
 
 /*
@@ -7573,7 +7243,7 @@ tSCC zStdio_Va_ListName[] =
  *  File name selection pattern
  */
 tSCC zStdio_Va_ListList[] =
-  "stdio.h\0internal/stdio_core.h\0internal/wchar_core.h\0";
+  "stdio.h\0";
 /*
  *  Machine/OS name selection pattern
  */
@@ -8233,15 +7903,8 @@ tSCC zSvr4_ProfilList[] =
 tSCC zSvr4_ProfilSelect0[] =
        "profil\\(unsigned short \\*, unsigned int, unsigned int, unsigned int\\)";
 
-/*
- *  content bypass pattern - skip fix if pattern found
- */
-tSCC zSvr4_ProfilBypass0[] =
-       "Silicon Graphics";
-
-#define    SVR4_PROFIL_TEST_CT  2
+#define    SVR4_PROFIL_TEST_CT  1
 static tTestDesc aSvr4_ProfilTests[] = {
-  { TT_NEGREP,   zSvr4_ProfilBypass0, (regex_t*)NULL },
   { TT_EGREP,    zSvr4_ProfilSelect0, (regex_t*)NULL }, };
 
 /*
@@ -8510,203 +8173,469 @@ tSCC zUltrix_ConstList[] =
 tSCC zUltrix_ConstSelect0[] =
        "perror\\( char \\*";
 
-#define    ULTRIX_CONST_TEST_CT  1
-static tTestDesc aUltrix_ConstTests[] = {
-  { TT_EGREP,    zUltrix_ConstSelect0, (regex_t*)NULL }, };
+#define    ULTRIX_CONST_TEST_CT  1
+static tTestDesc aUltrix_ConstTests[] = {
+  { TT_EGREP,    zUltrix_ConstSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Ultrix_Const
+ */
+static const char* apzUltrix_ConstPatch[] = {
+    "format",
+    "%1 const %3 *__",
+    "([ \t*](perror|fputs|fwrite|scanf|fscanf)\\(.*)[ \t]+(char|void) \\*__",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Ultrix_Const2 fix
+ */
+tSCC zUltrix_Const2Name[] =
+     "ultrix_const2";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zUltrix_Const2List[] =
+  "stdio.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzUltrix_Const2Machs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zUltrix_Const2Select0[] =
+       "\\*fopen\\( char \\*";
+
+#define    ULTRIX_CONST2_TEST_CT  1
+static tTestDesc aUltrix_Const2Tests[] = {
+  { TT_EGREP,    zUltrix_Const2Select0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Ultrix_Const2
+ */
+static const char* apzUltrix_Const2Patch[] = {
+    "format",
+    "%1( const char *%3, const char *",
+    "([ \t*](fopen|sscanf|popen|tempnam))\\([ \t]*char[ \t]*\\*([^,]*),[ \t]*char[ \t]*\\*[ \t]*",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Va_I960_Macro fix
+ */
+tSCC zVa_I960_MacroName[] =
+     "va_i960_macro";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zVa_I960_MacroList[] =
+  "arch/i960/archI960.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzVa_I960_MacroMachs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zVa_I960_MacroSelect0[] =
+       "__(vsiz|vali|vpad|alignof__)";
+
+#define    VA_I960_MACRO_TEST_CT  1
+static tTestDesc aVa_I960_MacroTests[] = {
+  { TT_EGREP,    zVa_I960_MacroSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Va_I960_Macro
+ */
+static const char* apzVa_I960_MacroPatch[] = {
+    "format",
+    "__vx%1",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Vms_Define_Can_Use_Extern_Prefix fix
+ */
+tSCC zVms_Define_Can_Use_Extern_PrefixName[] =
+     "vms_define_can_use_extern_prefix";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zVms_Define_Can_Use_Extern_PrefixList[] =
+  "rtldef/decc$types.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzVms_Define_Can_Use_Extern_PrefixMachs[] = {
+        "*-*-*vms*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zVms_Define_Can_Use_Extern_PrefixSelect0[] =
+       "#[ \t]*else\n\
+#[ \t]*if defined\\(__DECCXX\\)\n\
+#[ \t]*define __CAN_USE_EXTERN_PREFIX 1\n";
+
+#define    VMS_DEFINE_CAN_USE_EXTERN_PREFIX_TEST_CT  1
+static tTestDesc aVms_Define_Can_Use_Extern_PrefixTests[] = {
+  { TT_EGREP,    zVms_Define_Can_Use_Extern_PrefixSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Vms_Define_Can_Use_Extern_Prefix
+ */
+static const char* apzVms_Define_Can_Use_Extern_PrefixPatch[] = {
+    "format",
+    "%0#    elif defined (__GNUC__)\n\
+#\tdefine __CAN_USE_EXTERN_PREFIX 1\n",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Vms_Use_Pragma_Extern_Model fix
+ */
+tSCC zVms_Use_Pragma_Extern_ModelName[] =
+     "vms_use_pragma_extern_model";
+
+/*
+ *  File name selection pattern
+ */
+#define zVms_Use_Pragma_Extern_ModelList (char*)NULL
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzVms_Use_Pragma_Extern_ModelMachs[] = {
+        "*-*-*vms*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zVms_Use_Pragma_Extern_ModelSelect0[] =
+       "#if defined\\(__DECC\\) \\|\\| defined\\(__DECCXX\\)\n\
+# pragma extern_model __save\n";
+
+#define    VMS_USE_PRAGMA_EXTERN_MODEL_TEST_CT  1
+static tTestDesc aVms_Use_Pragma_Extern_ModelTests[] = {
+  { TT_EGREP,    zVms_Use_Pragma_Extern_ModelSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Vms_Use_Pragma_Extern_Model
+ */
+static const char* apzVms_Use_Pragma_Extern_ModelPatch[] = {
+    "format",
+    "#if defined(__DECC) || defined(__DECCXX) || defined(__GNUC__)\n\
+# pragma extern_model __save\n",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Vms_Disable_Decc_String_Builtins fix
+ */
+tSCC zVms_Disable_Decc_String_BuiltinsName[] =
+     "vms_disable_decc_string_builtins";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zVms_Disable_Decc_String_BuiltinsList[] =
+  "rtldef/string.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzVms_Disable_Decc_String_BuiltinsMachs[] = {
+        "*-*-*vms*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zVms_Disable_Decc_String_BuiltinsSelect0[] =
+       "#if !defined\\(__VAX\\)\n";
+
+#define    VMS_DISABLE_DECC_STRING_BUILTINS_TEST_CT  1
+static tTestDesc aVms_Disable_Decc_String_BuiltinsTests[] = {
+  { TT_EGREP,    zVms_Disable_Decc_String_BuiltinsSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Vms_Disable_Decc_String_Builtins
+ */
+static const char* apzVms_Disable_Decc_String_BuiltinsPatch[] = {
+    "format",
+    "#if !defined(__VAX) && !defined(__GNUC__)\n",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Vms_Use_Quoted_Include fix
+ */
+tSCC zVms_Use_Quoted_IncludeName[] =
+     "vms_use_quoted_include";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zVms_Use_Quoted_IncludeList[] =
+  "rtldef/wait.h\0starlet_c/pthread.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzVms_Use_Quoted_IncludeMachs[] = {
+        "*-*-*vms*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zVms_Use_Quoted_IncludeSelect0[] =
+       "(#[ \t]*include[ \t]+)<(resource|builtins)\\.h>";
+
+#define    VMS_USE_QUOTED_INCLUDE_TEST_CT  1
+static tTestDesc aVms_Use_Quoted_IncludeTests[] = {
+  { TT_EGREP,    zVms_Use_Quoted_IncludeSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Vms_Use_Quoted_Include
+ */
+static const char* apzVms_Use_Quoted_IncludePatch[] = {
+    "format",
+    "%1<sys/%2.h>",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Vms_Add_Missing_Braces fix
+ */
+tSCC zVms_Add_Missing_BracesName[] =
+     "vms_add_missing_braces";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zVms_Add_Missing_BracesList[] =
+  "rtldef/signal.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzVms_Add_Missing_BracesMachs[] = {
+        "*-*-*vms*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zVms_Add_Missing_BracesSelect0[] =
+       "(_SIG_[A-Z]+_SET[ \t]+= \\{)(0x[0F]+, 0x[0F]+)";
+
+#define    VMS_ADD_MISSING_BRACES_TEST_CT  1
+static tTestDesc aVms_Add_Missing_BracesTests[] = {
+  { TT_EGREP,    zVms_Add_Missing_BracesSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Ultrix_Const
+ *  Fix Command Arguments for Vms_Add_Missing_Braces
  */
-static const char* apzUltrix_ConstPatch[] = {
+static const char* apzVms_Add_Missing_BracesPatch[] = {
     "format",
-    "%1 const %3 *__",
-    "([ \t*](perror|fputs|fwrite|scanf|fscanf)\\(.*)[ \t]+(char|void) \\*__",
+    "%1 {%2} ",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Ultrix_Const2 fix
+ *  Description of Vms_Do_Not_Redeclare_Hostalias fix
  */
-tSCC zUltrix_Const2Name[] =
-     "ultrix_const2";
+tSCC zVms_Do_Not_Redeclare_HostaliasName[] =
+     "vms_do_not_redeclare_hostalias";
 
 /*
  *  File name selection pattern
  */
-tSCC zUltrix_Const2List[] =
-  "stdio.h\0";
+tSCC zVms_Do_Not_Redeclare_HostaliasList[] =
+  "rtldef/resolv.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzUltrix_Const2Machs (const char**)NULL
+tSCC* apzVms_Do_Not_Redeclare_HostaliasMachs[] = {
+        "*-*-*vms*",
+        (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zUltrix_Const2Select0[] =
-       "\\*fopen\\( char \\*";
+tSCC zVms_Do_Not_Redeclare_HostaliasSelect0[] =
+       "(void[ \t]+fp_nquery \\(const u_char \\*, int, FILE \\*\\);)\n\
+(__char_ptr32[ \t]+hostalias \\(const char \\*\\);)";
 
-#define    ULTRIX_CONST2_TEST_CT  1
-static tTestDesc aUltrix_Const2Tests[] = {
-  { TT_EGREP,    zUltrix_Const2Select0, (regex_t*)NULL }, };
+#define    VMS_DO_NOT_REDECLARE_HOSTALIAS_TEST_CT  1
+static tTestDesc aVms_Do_Not_Redeclare_HostaliasTests[] = {
+  { TT_EGREP,    zVms_Do_Not_Redeclare_HostaliasSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Ultrix_Const2
+ *  Fix Command Arguments for Vms_Do_Not_Redeclare_Hostalias
  */
-static const char* apzUltrix_Const2Patch[] = {
+static const char* apzVms_Do_Not_Redeclare_HostaliasPatch[] = {
     "format",
-    "%1( const char *%3, const char *",
-    "([ \t*](fopen|sscanf|popen|tempnam))\\([ \t]*char[ \t]*\\*([^,]*),[ \t]*char[ \t]*\\*[ \t]*",
+    "%1\n\
+/* %2 */",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Va_I960_Macro fix
+ *  Description of Vms_Decc_Builtin fix
  */
-tSCC zVa_I960_MacroName[] =
-     "va_i960_macro";
+tSCC zVms_Decc_BuiltinName[] =
+     "vms_decc_builtin";
 
 /*
  *  File name selection pattern
  */
-tSCC zVa_I960_MacroList[] =
-  "arch/i960/archI960.h\0";
+tSCC zVms_Decc_BuiltinList[] =
+  "rtldef/string.h\0rtldef/time.h\0rtldef/strings.h\0rtldef/socket.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzVa_I960_MacroMachs (const char**)NULL
+tSCC* apzVms_Decc_BuiltinMachs[] = {
+        "*-*-*vms*",
+        (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zVa_I960_MacroSelect0[] =
-       "__(vsiz|vali|vpad|alignof__)";
+tSCC zVms_Decc_BuiltinSelect0[] =
+       "(__MEMSET|__MEMMOVE|__MEMCPY|__STRLEN|__STRCPY)";
 
-#define    VA_I960_MACRO_TEST_CT  1
-static tTestDesc aVa_I960_MacroTests[] = {
-  { TT_EGREP,    zVa_I960_MacroSelect0, (regex_t*)NULL }, };
+#define    VMS_DECC_BUILTIN_TEST_CT  1
+static tTestDesc aVms_Decc_BuiltinTests[] = {
+  { TT_EGREP,    zVms_Decc_BuiltinSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Va_I960_Macro
+ *  Fix Command Arguments for Vms_Decc_Builtin
  */
-static const char* apzVa_I960_MacroPatch[] = {
-    "format",
-    "__vx%1",
+static const char* apzVms_Decc_BuiltinPatch[] = { sed_cmd_z,
+    "-e", "s@__MEMSET@memset@",
+    "-e", "s@__MEMMOVE@memmove@",
+    "-e", "s@__MEMCPY@memcpy@",
+    "-e", "s@__STRLEN@strlen@",
+    "-e", "s@__STRCPY@strcpy@",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Vms_Define_Can_Use_Extern_Prefix fix
+ *  Description of Vms_No_64bit_Getopt fix
  */
-tSCC zVms_Define_Can_Use_Extern_PrefixName[] =
-     "vms_define_can_use_extern_prefix";
+tSCC zVms_No_64bit_GetoptName[] =
+     "vms_no_64bit_getopt";
 
 /*
  *  File name selection pattern
  */
-tSCC zVms_Define_Can_Use_Extern_PrefixList[] =
-  "rtldef/decc$types.h\0";
+tSCC zVms_No_64bit_GetoptList[] =
+  "rtldef/stdio.h\0rtldef/unistd.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzVms_Define_Can_Use_Extern_PrefixMachs[] = {
+tSCC* apzVms_No_64bit_GetoptMachs[] = {
         "*-*-*vms*",
         (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zVms_Define_Can_Use_Extern_PrefixSelect0[] =
-       "#[ \t]*else\n\
-#[ \t]*if defined\\(__DECCXX\\)\n\
-#[ \t]*define __CAN_USE_EXTERN_PREFIX 1\n";
+tSCC zVms_No_64bit_GetoptSelect0[] =
+       "^[ \t]*(extern[ \t]*)?(int[ \t]*(getopt|optind|opterr|optopt)|(char \\*optarg))([ \t]*\\(.*\\))?;\n";
 
-#define    VMS_DEFINE_CAN_USE_EXTERN_PREFIX_TEST_CT  1
-static tTestDesc aVms_Define_Can_Use_Extern_PrefixTests[] = {
-  { TT_EGREP,    zVms_Define_Can_Use_Extern_PrefixSelect0, (regex_t*)NULL }, };
+#define    VMS_NO_64BIT_GETOPT_TEST_CT  1
+static tTestDesc aVms_No_64bit_GetoptTests[] = {
+  { TT_EGREP,    zVms_No_64bit_GetoptSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Vms_Define_Can_Use_Extern_Prefix
+ *  Fix Command Arguments for Vms_No_64bit_Getopt
  */
-static const char* apzVms_Define_Can_Use_Extern_PrefixPatch[] = {
+static const char* apzVms_No_64bit_GetoptPatch[] = {
     "format",
-    "%0#    elif defined (__GNUC__)\n\
-#\tdefine __CAN_USE_EXTERN_PREFIX 1\n",
+    "#if __INITIAL_POINTER_SIZE != 64 /* getopt is short ptr only.  */\n\
+%0#endif\n",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Vms_Use_Pragma_Extern_Model fix
+ *  Description of Vms_Forward_Declare_Struct fix
  */
-tSCC zVms_Use_Pragma_Extern_ModelName[] =
-     "vms_use_pragma_extern_model";
+tSCC zVms_Forward_Declare_StructName[] =
+     "vms_forward_declare_struct";
 
 /*
  *  File name selection pattern
  */
-#define zVms_Use_Pragma_Extern_ModelList (char*)NULL
+tSCC zVms_Forward_Declare_StructList[] =
+  "rtldef/if.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzVms_Use_Pragma_Extern_ModelMachs[] = {
+tSCC* apzVms_Forward_Declare_StructMachs[] = {
         "*-*-*vms*",
         (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zVms_Use_Pragma_Extern_ModelSelect0[] =
-       "#if defined\\(__DECC\\) \\|\\| defined\\(__DECCXX\\)\n\
-# pragma extern_model __save\n";
+tSCC zVms_Forward_Declare_StructSelect0[] =
+       "(/\\* forward decls for C\\+\\+ \\*/\n\
+)#ifdef __cplusplus\n";
 
-#define    VMS_USE_PRAGMA_EXTERN_MODEL_TEST_CT  1
-static tTestDesc aVms_Use_Pragma_Extern_ModelTests[] = {
-  { TT_EGREP,    zVms_Use_Pragma_Extern_ModelSelect0, (regex_t*)NULL }, };
+#define    VMS_FORWARD_DECLARE_STRUCT_TEST_CT  1
+static tTestDesc aVms_Forward_Declare_StructTests[] = {
+  { TT_EGREP,    zVms_Forward_Declare_StructSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Vms_Use_Pragma_Extern_Model
+ *  Fix Command Arguments for Vms_Forward_Declare_Struct
  */
-static const char* apzVms_Use_Pragma_Extern_ModelPatch[] = {
+static const char* apzVms_Forward_Declare_StructPatch[] = {
     "format",
-    "#if defined(__DECC) || defined(__DECCXX) || defined(__GNUC__)\n\
-# pragma extern_model __save\n",
+    "%1#if defined (__cplusplus) || defined (__GNUC__)\n",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Vms_Disable_Decc_String_Builtins fix
+ *  Description of Vms_Use_Fast_Setjmp fix
  */
-tSCC zVms_Disable_Decc_String_BuiltinsName[] =
-     "vms_disable_decc_string_builtins";
+tSCC zVms_Use_Fast_SetjmpName[] =
+     "vms_use_fast_setjmp";
 
 /*
  *  File name selection pattern
  */
-tSCC zVms_Disable_Decc_String_BuiltinsList[] =
-  "rtldef/string.h\0";
+tSCC zVms_Use_Fast_SetjmpList[] =
+  "rtldef/setjmp.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzVms_Disable_Decc_String_BuiltinsMachs[] = {
+tSCC* apzVms_Use_Fast_SetjmpMachs[] = {
         "*-*-*vms*",
         (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zVms_Disable_Decc_String_BuiltinsSelect0[] =
-       "#if !defined\\(__VAX\\)\n";
+tSCC zVms_Use_Fast_SetjmpSelect0[] =
+       "(#[ \t]*if[ \t]*defined\\(__FAST_SETJMP\\)[ \t]*\\|\\|)";
 
-#define    VMS_DISABLE_DECC_STRING_BUILTINS_TEST_CT  1
-static tTestDesc aVms_Disable_Decc_String_BuiltinsTests[] = {
-  { TT_EGREP,    zVms_Disable_Decc_String_BuiltinsSelect0, (regex_t*)NULL }, };
+#define    VMS_USE_FAST_SETJMP_TEST_CT  1
+static tTestDesc aVms_Use_Fast_SetjmpTests[] = {
+  { TT_EGREP,    zVms_Use_Fast_SetjmpSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Vms_Disable_Decc_String_Builtins
+ *  Fix Command Arguments for Vms_Use_Fast_Setjmp
  */
-static const char* apzVms_Disable_Decc_String_BuiltinsPatch[] = {
+static const char* apzVms_Use_Fast_SetjmpPatch[] = {
     "format",
-    "#if !defined(__VAX) && !defined(__GNUC__)\n",
+    "%0 defined (__GNUC__) ||",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -8805,6 +8734,68 @@ static const char* apzVxworks_Gcc_ProblemPatch[] = { sed_cmd_z,
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
+ *  Description of Vxworks_Ioctl_Macro fix
+ */
+tSCC zVxworks_Ioctl_MacroName[] =
+     "vxworks_ioctl_macro";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zVxworks_Ioctl_MacroList[] =
+  "ioLib.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzVxworks_Ioctl_MacroMachs[] = {
+        "*-*-vxworks*",
+        (const char*)NULL };
+#define VXWORKS_IOCTL_MACRO_TEST_CT  0
+#define aVxworks_Ioctl_MacroTests   (tTestDesc*)NULL
+
+/*
+ *  Fix Command Arguments for Vxworks_Ioctl_Macro
+ */
+static const char* apzVxworks_Ioctl_MacroPatch[] = {
+    "format",
+    "%0\n\
+#define ioctl(fd, func, arg) (ioctl)(fd, func, (int)(arg))\n",
+    "extern[\t ]+int[\t ]+ioctl[\t ]*\\([\t ,[:alnum:]]*\\);",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Vxworks_Mkdir_Macro fix
+ */
+tSCC zVxworks_Mkdir_MacroName[] =
+     "vxworks_mkdir_macro";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zVxworks_Mkdir_MacroList[] =
+  "sys/stat.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzVxworks_Mkdir_MacroMachs[] = {
+        "*-*-vxworks*",
+        (const char*)NULL };
+#define VXWORKS_MKDIR_MACRO_TEST_CT  0
+#define aVxworks_Mkdir_MacroTests   (tTestDesc*)NULL
+
+/*
+ *  Fix Command Arguments for Vxworks_Mkdir_Macro
+ */
+static const char* apzVxworks_Mkdir_MacroPatch[] = {
+    "format",
+    "%0\n\
+#define mkdir(dir, ...) ((void)0, ##__VA_ARGS__, (mkdir)(dir))\n",
+    "extern[\t ]+STATUS[\t ]+mkdir[\t ]*\\([\t ]*const[\t ]+char[\t ]*\\*[\t ]*(|[_[:alpha:]][_[:alnum:]]*)\\)[\t ]*;",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
  *  Description of Vxworks_Needs_Vxtypes fix
  */
 tSCC zVxworks_Needs_VxtypesName[] =
@@ -8888,6 +8879,42 @@ static const char* apzVxworks_Needs_VxworksPatch[] = { sed_cmd_z,
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
+ *  Description of Vxworks_Regs fix
+ */
+tSCC zVxworks_RegsName[] =
+     "vxworks_regs";
+
+/*
+ *  File name selection pattern
+ */
+#define zVxworks_RegsList (char*)NULL
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzVxworks_RegsMachs[] = {
+        "*-*-vxworks*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zVxworks_RegsSelect0[] =
+       "#[\t ]*include[\t ]+[<\"]regs.h[>\"]";
+
+#define    VXWORKS_REGS_TEST_CT  1
+static tTestDesc aVxworks_RegsTests[] = {
+  { TT_EGREP,    zVxworks_RegsSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Vxworks_Regs
+ */
+static const char* apzVxworks_RegsPatch[] = {
+    "format",
+    "#include <arch/../regs.h>",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
  *  Description of Vxworks_Time fix
  */
 tSCC zVxworks_TimeName[] =
@@ -8938,6 +8965,36 @@ typedef void (*__gcc_VOIDFUNCPTR) ();\n\
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
+ *  Description of Vxworks_Write_Const fix
+ */
+tSCC zVxworks_Write_ConstName[] =
+     "vxworks_write_const";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zVxworks_Write_ConstList[] =
+  "ioLib.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzVxworks_Write_ConstMachs[] = {
+        "*-*-vxworks*",
+        (const char*)NULL };
+#define VXWORKS_WRITE_CONST_TEST_CT  0
+#define aVxworks_Write_ConstTests   (tTestDesc*)NULL
+
+/*
+ *  Fix Command Arguments for Vxworks_Write_Const
+ */
+static const char* apzVxworks_Write_ConstPatch[] = {
+    "format",
+    "extern int  write (int, const char*, size_t);",
+    "extern[\t ]+int[\t ]+write[\t ]*\\([\t ]*int[\t ]*,[\t ]*char[\t ]*\\*[\t ]*,[\t ]*size_t[\t ]*\\)[\t ]*;",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
  *  Description of X11_Class fix
  */
 tSCC zX11_ClassName[] =
@@ -9101,32 +9158,141 @@ static const char* apzX11_SprintfPatch[] = {
 #endif /* !defined __STDC__ */",
     (char*)NULL };
 
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Feraiseexcept_Nosse_Invalid fix
+ */
+tSCC zFeraiseexcept_Nosse_InvalidName[] =
+     "feraiseexcept_nosse_invalid";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zFeraiseexcept_Nosse_InvalidList[] =
+  "bits/fenv.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzFeraiseexcept_Nosse_InvalidMachs[] = {
+        "i[34567]86-*-linux*",
+        "x86*-linux*",
+        "amd64-*-linux*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zFeraiseexcept_Nosse_InvalidSelect0[] =
+       "^([\t ]*)__asm__ __volatile__ \\(\"divss %0, %0 *\" : : \"x\" \\(__f\\)\\);$";
+
+/*
+ *  content bypass pattern - skip fix if pattern found
+ */
+tSCC zFeraiseexcept_Nosse_InvalidBypass0[] =
+       "\"fdiv .*; fwait\"";
+
+#define    FERAISEEXCEPT_NOSSE_INVALID_TEST_CT  2
+static tTestDesc aFeraiseexcept_Nosse_InvalidTests[] = {
+  { TT_NEGREP,   zFeraiseexcept_Nosse_InvalidBypass0, (regex_t*)NULL },
+  { TT_EGREP,    zFeraiseexcept_Nosse_InvalidSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Feraiseexcept_Nosse_Invalid
+ */
+static const char* apzFeraiseexcept_Nosse_InvalidPatch[] = {
+    "format",
+    "# ifdef __SSE_MATH__\n\
+%0\n\
+# else\n\
+%1__asm__ __volatile__ (\"fdiv %%%%st, %%%%st(0); fwait\"\n\
+%1\t\t\t: \"=t\" (__f) : \"0\" (__f));\n\
+# endif",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Feraiseexcept_Nosse_Divbyzero fix
+ */
+tSCC zFeraiseexcept_Nosse_DivbyzeroName[] =
+     "feraiseexcept_nosse_divbyzero";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zFeraiseexcept_Nosse_DivbyzeroList[] =
+  "bits/fenv.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzFeraiseexcept_Nosse_DivbyzeroMachs[] = {
+        "i[34567]86-*-linux*",
+        "x86*-linux*",
+        "amd64-*-linux*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zFeraiseexcept_Nosse_DivbyzeroSelect0[] =
+       "^([\t ]*)__asm__ __volatile__ \\(\"divss %1, %0 *\" : : \"x\" \\(__f\\), \"x\" \\(__g\\)\\);$";
+
+/*
+ *  content bypass pattern - skip fix if pattern found
+ */
+tSCC zFeraiseexcept_Nosse_DivbyzeroBypass0[] =
+       "\"fdivp .*; fwait\"";
+
+#define    FERAISEEXCEPT_NOSSE_DIVBYZERO_TEST_CT  2
+static tTestDesc aFeraiseexcept_Nosse_DivbyzeroTests[] = {
+  { TT_NEGREP,   zFeraiseexcept_Nosse_DivbyzeroBypass0, (regex_t*)NULL },
+  { TT_EGREP,    zFeraiseexcept_Nosse_DivbyzeroSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Feraiseexcept_Nosse_Divbyzero
+ */
+static const char* apzFeraiseexcept_Nosse_DivbyzeroPatch[] = {
+    "format",
+    "# ifdef __SSE_MATH__\n\
+%0\n\
+# else\n\
+%1__asm__ __volatile__ (\"fdivp %%%%st, %%%%st(1); fwait\"\n\
+%1\t\t\t: \"=t\" (__f) : \"0\" (__f), \"u\" (__g) : \"st(1)\");\n\
+# endif",
+    (char*)NULL };
+
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  List of all fixes
  */
-#define REGEX_COUNT          266
-#define MACH_LIST_SIZE_LIMIT 181
-#define FIX_COUNT            224
+#define REGEX_COUNT          264
+#define MACH_LIST_SIZE_LIMIT 187
+#define FIX_COUNT            226
 
 /*
  *  Enumerate the fixes
  */
 typedef enum {
     AAB_AIX_STDIO_FIXIDX,
+    AAB_AIX_FCNTL_FIXIDX,
     AAB_DARWIN7_9_LONG_DOUBLE_FUNCS_FIXIDX,
-    AAB_DARWIN7_9_LONG_DOUBLE_FUNCS_2_FIXIDX,
     AAB_FD_ZERO_ASM_POSIX_TYPES_H_FIXIDX,
     AAB_FD_ZERO_GNU_TYPES_H_FIXIDX,
     AAB_FD_ZERO_SELECTBITS_H_FIXIDX,
     AAB_SOLARIS_SYS_VARARGS_H_FIXIDX,
     AAB_SUN_MEMCPY_FIXIDX,
+    AAB_VXWORKS_ASSERT_FIXIDX,
+    AAB_VXWORKS_REGS_VXTYPES_FIXIDX,
+    AAB_VXWORKS_STDINT_FIXIDX,
+    AAB_VXWORKS_UNISTD_FIXIDX,
     AIX_COMPLEX_FIXIDX,
     AIX_MALLOC_FIXIDX,
     AIX_NET_IF_ARP_FIXIDX,
     AIX_ONCE_INIT_1_FIXIDX,
     AIX_ONCE_INIT_2_FIXIDX,
+    AIX_MUTEX_INITIALIZER_1_FIXIDX,
+    AIX_COND_INITIALIZER_1_FIXIDX,
+    AIX_RWLOCK_INITIALIZER_1_FIXIDX,
     AIX_PTHREAD_FIXIDX,
     AIX_STDINT_1_FIXIDX,
     AIX_STDINT_2_FIXIDX,
@@ -9137,17 +9303,10 @@ typedef enum {
     AIX_SYSWAIT_2_FIXIDX,
     AIX_VOLATILE_FIXIDX,
     ALPHA___ASSERT_FIXIDX,
-    ALPHA___EXTERN_PREFIX_FIXIDX,
-    ALPHA___EXTERN_PREFIX_STANDARDS_FIXIDX,
-    ALPHA___EXTERN_PREFIX_SYS_STAT_FIXIDX,
     ALPHA_ASSERT_FIXIDX,
-    ALPHA_BAD_LVAL_FIXIDX,
     ALPHA_GETOPT_FIXIDX,
     ALPHA_IF_SEMICOLON_FIXIDX,
     ALPHA_PARENS_FIXIDX,
-    ALPHA_PTHREAD_FIXIDX,
-    ALPHA_PTHREAD_GCC_FIXIDX,
-    ALPHA_PTHREAD_INIT_FIXIDX,
     ALPHA_SBRK_FIXIDX,
     AVOID_BOOL_DEFINE_FIXIDX,
     AVOID_BOOL_TYPE_FIXIDX,
@@ -9163,6 +9322,7 @@ typedef enum {
     CTRL_QUOTES_DEF_FIXIDX,
     CTRL_QUOTES_USE_FIXIDX,
     CXX_UNREADY_FIXIDX,
+    DARWIN_9_LONG_DOUBLE_FUNCS_2_FIXIDX,
     DARWIN_EXTERNC_FIXIDX,
     DARWIN_GCC4_BREAKAGE_FIXIDX,
     DARWIN_PRIVATE_EXTERN_FIXIDX,
@@ -9226,19 +9386,8 @@ typedef enum {
     IO_QUOTES_DEF_FIXIDX,
     IO_QUOTES_USE_FIXIDX,
     IP_MISSING_SEMI_FIXIDX,
-    IRIX___RESTRICT_FIXIDX,
-    IRIX___GENERIC1_FIXIDX,
-    IRIX___GENERIC2_FIXIDX,
-    IRIX_ASM_APOSTROPHE_FIXIDX,
-    IRIX_COMPLEX_FIXIDX,
     IRIX_LIMITS_CONST_FIXIDX,
-    IRIX_PTHREAD_INIT_FIXIDX,
-    IRIX_SOCKLEN_T_FIXIDX,
-    IRIX_STDINT_C99_MODE_FIXIDX,
-    IRIX_STDINT_C99_TYPES_FIXIDX,
-    IRIX_STDINT_C99_MACROS_FIXIDX,
     IRIX_STDIO_VA_LIST_FIXIDX,
-    IRIX_WCSFTIME_FIXIDX,
     KANDR_CONCAT_FIXIDX,
     LINUX_IA64_UCONTEXT_FIXIDX,
     LYNXOS_NO_WARNING_IN_SYS_TIME_H_FIXIDX,
@@ -9273,7 +9422,6 @@ typedef enum {
     SOLARIS___RESTRICT_FIXIDX,
     SOLARIS_COMPLEX_FIXIDX,
     SOLARIS_COMPLEX_CXX_FIXIDX,
-    SOLARIS_COND_INIT_FIXIDX,
     SOLARIS_CXX_LINKAGE_FIXIDX,
     SOLARIS_GETC_STRICT_STDC_FIXIDX,
     SOLARIS_LONGJMP_NORETURN_FIXIDX,
@@ -9329,15 +9477,28 @@ typedef enum {
     VMS_DEFINE_CAN_USE_EXTERN_PREFIX_FIXIDX,
     VMS_USE_PRAGMA_EXTERN_MODEL_FIXIDX,
     VMS_DISABLE_DECC_STRING_BUILTINS_FIXIDX,
+    VMS_USE_QUOTED_INCLUDE_FIXIDX,
+    VMS_ADD_MISSING_BRACES_FIXIDX,
+    VMS_DO_NOT_REDECLARE_HOSTALIAS_FIXIDX,
+    VMS_DECC_BUILTIN_FIXIDX,
+    VMS_NO_64BIT_GETOPT_FIXIDX,
+    VMS_FORWARD_DECLARE_STRUCT_FIXIDX,
+    VMS_USE_FAST_SETJMP_FIXIDX,
     VOID_NULL_FIXIDX,
     VXWORKS_GCC_PROBLEM_FIXIDX,
+    VXWORKS_IOCTL_MACRO_FIXIDX,
+    VXWORKS_MKDIR_MACRO_FIXIDX,
     VXWORKS_NEEDS_VXTYPES_FIXIDX,
     VXWORKS_NEEDS_VXWORKS_FIXIDX,
+    VXWORKS_REGS_FIXIDX,
     VXWORKS_TIME_FIXIDX,
+    VXWORKS_WRITE_CONST_FIXIDX,
     X11_CLASS_FIXIDX,
     X11_CLASS_USAGE_FIXIDX,
     X11_NEW_FIXIDX,
-    X11_SPRINTF_FIXIDX
+    X11_SPRINTF_FIXIDX,
+    FERAISEEXCEPT_NOSSE_INVALID_FIXIDX,
+    FERAISEEXCEPT_NOSSE_DIVBYZERO_FIXIDX
 } t_fixinc_idx;
 
 tFixDesc fixDescList[ FIX_COUNT ] = {
@@ -9346,16 +9507,16 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      AAB_AIX_STDIO_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aAab_Aix_StdioTests,   apzAab_Aix_StdioPatch, 0 },
 
+  {  zAab_Aix_FcntlName,    zAab_Aix_FcntlList,
+     apzAab_Aix_FcntlMachs,
+     AAB_AIX_FCNTL_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aAab_Aix_FcntlTests,   apzAab_Aix_FcntlPatch, 0 },
+
   {  zAab_Darwin7_9_Long_Double_FuncsName,    zAab_Darwin7_9_Long_Double_FuncsList,
      apzAab_Darwin7_9_Long_Double_FuncsMachs,
      AAB_DARWIN7_9_LONG_DOUBLE_FUNCS_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT,
      aAab_Darwin7_9_Long_Double_FuncsTests,   apzAab_Darwin7_9_Long_Double_FuncsPatch, 0 },
 
-  {  zAab_Darwin7_9_Long_Double_Funcs_2Name,    zAab_Darwin7_9_Long_Double_Funcs_2List,
-     apzAab_Darwin7_9_Long_Double_Funcs_2Machs,
-     AAB_DARWIN7_9_LONG_DOUBLE_FUNCS_2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aAab_Darwin7_9_Long_Double_Funcs_2Tests,   apzAab_Darwin7_9_Long_Double_Funcs_2Patch, 0 },
-
   {  zAab_Fd_Zero_Asm_Posix_Types_HName,    zAab_Fd_Zero_Asm_Posix_Types_HList,
      apzAab_Fd_Zero_Asm_Posix_Types_HMachs,
      AAB_FD_ZERO_ASM_POSIX_TYPES_H_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT,
@@ -9381,6 +9542,26 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      AAB_SUN_MEMCPY_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT,
      aAab_Sun_MemcpyTests,   apzAab_Sun_MemcpyPatch, 0 },
 
+  {  zAab_Vxworks_AssertName,    zAab_Vxworks_AssertList,
+     apzAab_Vxworks_AssertMachs,
+     AAB_VXWORKS_ASSERT_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT,
+     aAab_Vxworks_AssertTests,   apzAab_Vxworks_AssertPatch, 0 },
+
+  {  zAab_Vxworks_Regs_VxtypesName,    zAab_Vxworks_Regs_VxtypesList,
+     apzAab_Vxworks_Regs_VxtypesMachs,
+     AAB_VXWORKS_REGS_VXTYPES_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT,
+     aAab_Vxworks_Regs_VxtypesTests,   apzAab_Vxworks_Regs_VxtypesPatch, 0 },
+
+  {  zAab_Vxworks_StdintName,    zAab_Vxworks_StdintList,
+     apzAab_Vxworks_StdintMachs,
+     AAB_VXWORKS_STDINT_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT,
+     aAab_Vxworks_StdintTests,   apzAab_Vxworks_StdintPatch, 0 },
+
+  {  zAab_Vxworks_UnistdName,    zAab_Vxworks_UnistdList,
+     apzAab_Vxworks_UnistdMachs,
+     AAB_VXWORKS_UNISTD_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT,
+     aAab_Vxworks_UnistdTests,   apzAab_Vxworks_UnistdPatch, 0 },
+
   {  zAix_ComplexName,    zAix_ComplexList,
      apzAix_ComplexMachs,
      AIX_COMPLEX_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -9406,6 +9587,21 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      AIX_ONCE_INIT_2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aAix_Once_Init_2Tests,   apzAix_Once_Init_2Patch, 0 },
 
+  {  zAix_Mutex_Initializer_1Name,    zAix_Mutex_Initializer_1List,
+     apzAix_Mutex_Initializer_1Machs,
+     AIX_MUTEX_INITIALIZER_1_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aAix_Mutex_Initializer_1Tests,   apzAix_Mutex_Initializer_1Patch, 0 },
+
+  {  zAix_Cond_Initializer_1Name,    zAix_Cond_Initializer_1List,
+     apzAix_Cond_Initializer_1Machs,
+     AIX_COND_INITIALIZER_1_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aAix_Cond_Initializer_1Tests,   apzAix_Cond_Initializer_1Patch, 0 },
+
+  {  zAix_Rwlock_Initializer_1Name,    zAix_Rwlock_Initializer_1List,
+     apzAix_Rwlock_Initializer_1Machs,
+     AIX_RWLOCK_INITIALIZER_1_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aAix_Rwlock_Initializer_1Tests,   apzAix_Rwlock_Initializer_1Patch, 0 },
+
   {  zAix_PthreadName,    zAix_PthreadList,
      apzAix_PthreadMachs,
      AIX_PTHREAD_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -9456,31 +9652,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      ALPHA___ASSERT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aAlpha___AssertTests,   apzAlpha___AssertPatch, 0 },
 
-  {  zAlpha___Extern_PrefixName,    zAlpha___Extern_PrefixList,
-     apzAlpha___Extern_PrefixMachs,
-     ALPHA___EXTERN_PREFIX_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aAlpha___Extern_PrefixTests,   apzAlpha___Extern_PrefixPatch, 0 },
-
-  {  zAlpha___Extern_Prefix_StandardsName,    zAlpha___Extern_Prefix_StandardsList,
-     apzAlpha___Extern_Prefix_StandardsMachs,
-     ALPHA___EXTERN_PREFIX_STANDARDS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aAlpha___Extern_Prefix_StandardsTests,   apzAlpha___Extern_Prefix_StandardsPatch, 0 },
-
-  {  zAlpha___Extern_Prefix_Sys_StatName,    zAlpha___Extern_Prefix_Sys_StatList,
-     apzAlpha___Extern_Prefix_Sys_StatMachs,
-     ALPHA___EXTERN_PREFIX_SYS_STAT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aAlpha___Extern_Prefix_Sys_StatTests,   apzAlpha___Extern_Prefix_Sys_StatPatch, 0 },
-
   {  zAlpha_AssertName,    zAlpha_AssertList,
      apzAlpha_AssertMachs,
      ALPHA_ASSERT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aAlpha_AssertTests,   apzAlpha_AssertPatch, 0 },
 
-  {  zAlpha_Bad_LvalName,    zAlpha_Bad_LvalList,
-     apzAlpha_Bad_LvalMachs,
-     ALPHA_BAD_LVAL_TEST_CT, FD_MACH_ONLY,
-     aAlpha_Bad_LvalTests,   apzAlpha_Bad_LvalPatch, 0 },
-
   {  zAlpha_GetoptName,    zAlpha_GetoptList,
      apzAlpha_GetoptMachs,
      ALPHA_GETOPT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -9496,21 +9672,6 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      ALPHA_PARENS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aAlpha_ParensTests,   apzAlpha_ParensPatch, 0 },
 
-  {  zAlpha_PthreadName,    zAlpha_PthreadList,
-     apzAlpha_PthreadMachs,
-     ALPHA_PTHREAD_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aAlpha_PthreadTests,   apzAlpha_PthreadPatch, 0 },
-
-  {  zAlpha_Pthread_GccName,    zAlpha_Pthread_GccList,
-     apzAlpha_Pthread_GccMachs,
-     ALPHA_PTHREAD_GCC_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aAlpha_Pthread_GccTests,   apzAlpha_Pthread_GccPatch, 0 },
-
-  {  zAlpha_Pthread_InitName,    zAlpha_Pthread_InitList,
-     apzAlpha_Pthread_InitMachs,
-     ALPHA_PTHREAD_INIT_TEST_CT, FD_MACH_ONLY,
-     aAlpha_Pthread_InitTests,   apzAlpha_Pthread_InitPatch, 0 },
-
   {  zAlpha_SbrkName,    zAlpha_SbrkList,
      apzAlpha_SbrkMachs,
      ALPHA_SBRK_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -9586,6 +9747,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      CXX_UNREADY_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aCxx_UnreadyTests,   apzCxx_UnreadyPatch, 0 },
 
+  {  zDarwin_9_Long_Double_Funcs_2Name,    zDarwin_9_Long_Double_Funcs_2List,
+     apzDarwin_9_Long_Double_Funcs_2Machs,
+     DARWIN_9_LONG_DOUBLE_FUNCS_2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aDarwin_9_Long_Double_Funcs_2Tests,   apzDarwin_9_Long_Double_Funcs_2Patch, 0 },
+
   {  zDarwin_ExterncName,    zDarwin_ExterncList,
      apzDarwin_ExterncMachs,
      DARWIN_EXTERNC_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -9901,71 +10067,16 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      IP_MISSING_SEMI_TEST_CT, FD_MACH_ONLY,
      aIp_Missing_SemiTests,   apzIp_Missing_SemiPatch, 0 },
 
-  {  zIrix___RestrictName,    zIrix___RestrictList,
-     apzIrix___RestrictMachs,
-     IRIX___RESTRICT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aIrix___RestrictTests,   apzIrix___RestrictPatch, 0 },
-
-  {  zIrix___Generic1Name,    zIrix___Generic1List,
-     apzIrix___Generic1Machs,
-     IRIX___GENERIC1_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aIrix___Generic1Tests,   apzIrix___Generic1Patch, 0 },
-
-  {  zIrix___Generic2Name,    zIrix___Generic2List,
-     apzIrix___Generic2Machs,
-     IRIX___GENERIC2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aIrix___Generic2Tests,   apzIrix___Generic2Patch, 0 },
-
-  {  zIrix_Asm_ApostropheName,    zIrix_Asm_ApostropheList,
-     apzIrix_Asm_ApostropheMachs,
-     IRIX_ASM_APOSTROPHE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aIrix_Asm_ApostropheTests,   apzIrix_Asm_ApostrophePatch, 0 },
-
-  {  zIrix_ComplexName,    zIrix_ComplexList,
-     apzIrix_ComplexMachs,
-     IRIX_COMPLEX_TEST_CT, FD_MACH_ONLY,
-     aIrix_ComplexTests,   apzIrix_ComplexPatch, 0 },
-
   {  zIrix_Limits_ConstName,    zIrix_Limits_ConstList,
      apzIrix_Limits_ConstMachs,
      IRIX_LIMITS_CONST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aIrix_Limits_ConstTests,   apzIrix_Limits_ConstPatch, 0 },
 
-  {  zIrix_Pthread_InitName,    zIrix_Pthread_InitList,
-     apzIrix_Pthread_InitMachs,
-     IRIX_PTHREAD_INIT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aIrix_Pthread_InitTests,   apzIrix_Pthread_InitPatch, 0 },
-
-  {  zIrix_Socklen_TName,    zIrix_Socklen_TList,
-     apzIrix_Socklen_TMachs,
-     IRIX_SOCKLEN_T_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aIrix_Socklen_TTests,   apzIrix_Socklen_TPatch, 0 },
-
-  {  zIrix_Stdint_C99_ModeName,    zIrix_Stdint_C99_ModeList,
-     apzIrix_Stdint_C99_ModeMachs,
-     IRIX_STDINT_C99_MODE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aIrix_Stdint_C99_ModeTests,   apzIrix_Stdint_C99_ModePatch, 0 },
-
-  {  zIrix_Stdint_C99_TypesName,    zIrix_Stdint_C99_TypesList,
-     apzIrix_Stdint_C99_TypesMachs,
-     IRIX_STDINT_C99_TYPES_TEST_CT, FD_MACH_ONLY,
-     aIrix_Stdint_C99_TypesTests,   apzIrix_Stdint_C99_TypesPatch, 0 },
-
-  {  zIrix_Stdint_C99_MacrosName,    zIrix_Stdint_C99_MacrosList,
-     apzIrix_Stdint_C99_MacrosMachs,
-     IRIX_STDINT_C99_MACROS_TEST_CT, FD_MACH_ONLY,
-     aIrix_Stdint_C99_MacrosTests,   apzIrix_Stdint_C99_MacrosPatch, 0 },
-
   {  zIrix_Stdio_Va_ListName,    zIrix_Stdio_Va_ListList,
      apzIrix_Stdio_Va_ListMachs,
      IRIX_STDIO_VA_LIST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aIrix_Stdio_Va_ListTests,   apzIrix_Stdio_Va_ListPatch, 0 },
 
-  {  zIrix_WcsftimeName,    zIrix_WcsftimeList,
-     apzIrix_WcsftimeMachs,
-     IRIX_WCSFTIME_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aIrix_WcsftimeTests,   apzIrix_WcsftimePatch, 0 },
-
   {  zKandr_ConcatName,    zKandr_ConcatList,
      apzKandr_ConcatMachs,
      KANDR_CONCAT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -10136,11 +10247,6 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      SOLARIS_COMPLEX_CXX_TEST_CT, FD_MACH_ONLY,
      aSolaris_Complex_CxxTests,   apzSolaris_Complex_CxxPatch, 0 },
 
-  {  zSolaris_Cond_InitName,    zSolaris_Cond_InitList,
-     apzSolaris_Cond_InitMachs,
-     SOLARIS_COND_INIT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aSolaris_Cond_InitTests,   apzSolaris_Cond_InitPatch, 0 },
-
   {  zSolaris_Cxx_LinkageName,    zSolaris_Cxx_LinkageList,
      apzSolaris_Cxx_LinkageMachs,
      SOLARIS_CXX_LINKAGE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -10416,6 +10522,41 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      VMS_DISABLE_DECC_STRING_BUILTINS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aVms_Disable_Decc_String_BuiltinsTests,   apzVms_Disable_Decc_String_BuiltinsPatch, 0 },
 
+  {  zVms_Use_Quoted_IncludeName,    zVms_Use_Quoted_IncludeList,
+     apzVms_Use_Quoted_IncludeMachs,
+     VMS_USE_QUOTED_INCLUDE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aVms_Use_Quoted_IncludeTests,   apzVms_Use_Quoted_IncludePatch, 0 },
+
+  {  zVms_Add_Missing_BracesName,    zVms_Add_Missing_BracesList,
+     apzVms_Add_Missing_BracesMachs,
+     VMS_ADD_MISSING_BRACES_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aVms_Add_Missing_BracesTests,   apzVms_Add_Missing_BracesPatch, 0 },
+
+  {  zVms_Do_Not_Redeclare_HostaliasName,    zVms_Do_Not_Redeclare_HostaliasList,
+     apzVms_Do_Not_Redeclare_HostaliasMachs,
+     VMS_DO_NOT_REDECLARE_HOSTALIAS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aVms_Do_Not_Redeclare_HostaliasTests,   apzVms_Do_Not_Redeclare_HostaliasPatch, 0 },
+
+  {  zVms_Decc_BuiltinName,    zVms_Decc_BuiltinList,
+     apzVms_Decc_BuiltinMachs,
+     VMS_DECC_BUILTIN_TEST_CT, FD_MACH_ONLY,
+     aVms_Decc_BuiltinTests,   apzVms_Decc_BuiltinPatch, 0 },
+
+  {  zVms_No_64bit_GetoptName,    zVms_No_64bit_GetoptList,
+     apzVms_No_64bit_GetoptMachs,
+     VMS_NO_64BIT_GETOPT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aVms_No_64bit_GetoptTests,   apzVms_No_64bit_GetoptPatch, 0 },
+
+  {  zVms_Forward_Declare_StructName,    zVms_Forward_Declare_StructList,
+     apzVms_Forward_Declare_StructMachs,
+     VMS_FORWARD_DECLARE_STRUCT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aVms_Forward_Declare_StructTests,   apzVms_Forward_Declare_StructPatch, 0 },
+
+  {  zVms_Use_Fast_SetjmpName,    zVms_Use_Fast_SetjmpList,
+     apzVms_Use_Fast_SetjmpMachs,
+     VMS_USE_FAST_SETJMP_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aVms_Use_Fast_SetjmpTests,   apzVms_Use_Fast_SetjmpPatch, 0 },
+
   {  zVoid_NullName,    zVoid_NullList,
      apzVoid_NullMachs,
      VOID_NULL_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -10426,6 +10567,16 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      VXWORKS_GCC_PROBLEM_TEST_CT, FD_MACH_ONLY,
      aVxworks_Gcc_ProblemTests,   apzVxworks_Gcc_ProblemPatch, 0 },
 
+  {  zVxworks_Ioctl_MacroName,    zVxworks_Ioctl_MacroList,
+     apzVxworks_Ioctl_MacroMachs,
+     VXWORKS_IOCTL_MACRO_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aVxworks_Ioctl_MacroTests,   apzVxworks_Ioctl_MacroPatch, 0 },
+
+  {  zVxworks_Mkdir_MacroName,    zVxworks_Mkdir_MacroList,
+     apzVxworks_Mkdir_MacroMachs,
+     VXWORKS_MKDIR_MACRO_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aVxworks_Mkdir_MacroTests,   apzVxworks_Mkdir_MacroPatch, 0 },
+
   {  zVxworks_Needs_VxtypesName,    zVxworks_Needs_VxtypesList,
      apzVxworks_Needs_VxtypesMachs,
      VXWORKS_NEEDS_VXTYPES_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -10436,11 +10587,21 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      VXWORKS_NEEDS_VXWORKS_TEST_CT, FD_MACH_ONLY,
      aVxworks_Needs_VxworksTests,   apzVxworks_Needs_VxworksPatch, 0 },
 
+  {  zVxworks_RegsName,    zVxworks_RegsList,
+     apzVxworks_RegsMachs,
+     VXWORKS_REGS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aVxworks_RegsTests,   apzVxworks_RegsPatch, 0 },
+
   {  zVxworks_TimeName,    zVxworks_TimeList,
      apzVxworks_TimeMachs,
      VXWORKS_TIME_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aVxworks_TimeTests,   apzVxworks_TimePatch, 0 },
 
+  {  zVxworks_Write_ConstName,    zVxworks_Write_ConstList,
+     apzVxworks_Write_ConstMachs,
+     VXWORKS_WRITE_CONST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aVxworks_Write_ConstTests,   apzVxworks_Write_ConstPatch, 0 },
+
   {  zX11_ClassName,    zX11_ClassList,
      apzX11_ClassMachs,
      X11_CLASS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -10459,5 +10620,15 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
   {  zX11_SprintfName,    zX11_SprintfList,
      apzX11_SprintfMachs,
      X11_SPRINTF_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aX11_SprintfTests,   apzX11_SprintfPatch, 0 }
+     aX11_SprintfTests,   apzX11_SprintfPatch, 0 },
+
+  {  zFeraiseexcept_Nosse_InvalidName,    zFeraiseexcept_Nosse_InvalidList,
+     apzFeraiseexcept_Nosse_InvalidMachs,
+     FERAISEEXCEPT_NOSSE_INVALID_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aFeraiseexcept_Nosse_InvalidTests,   apzFeraiseexcept_Nosse_InvalidPatch, 0 },
+
+  {  zFeraiseexcept_Nosse_DivbyzeroName,    zFeraiseexcept_Nosse_DivbyzeroList,
+     apzFeraiseexcept_Nosse_DivbyzeroMachs,
+     FERAISEEXCEPT_NOSSE_DIVBYZERO_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aFeraiseexcept_Nosse_DivbyzeroTests,   apzFeraiseexcept_Nosse_DivbyzeroPatch, 0 }
 };