OSDN Git Service

PR lto/53831
[pf3gnuchains/gcc-fork.git] / fixincludes / fixincl.x
index cc25834..50a553f 100644 (file)
@@ -2,11 +2,11 @@
  * 
  * DO NOT EDIT THIS FILE   (fixincl.x)
  * 
- * It has been AutoGen-ed  September 22, 2011 at 04:28:52 PM by AutoGen 5.11.1
+ * It has been AutoGen-ed  Saturday September 29, 2012 at 01:58:03 PM PDT
  * From the definitions    inclhack.def
  * and the template file   fixincl
  */
-/* DO NOT SVN-MERGE THIS FILE, EITHER Thu Sep 22 16:28:52 CEST 2011
+/* DO NOT SVN-MERGE THIS FILE, EITHER Sat Sep 29 13:58:03 PDT 2012
  *
  * 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 220 fixup descriptions.
+ * This file contains 216 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[] =
@@ -522,6 +576,43 @@ static const char* apzAix_ComplexPatch[] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
+ *  Description of Aix_Malloc fix
+ */
+tSCC zAix_MallocName[] =
+     "aix_malloc";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zAix_MallocList[] =
+  "malloc.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzAix_MallocMachs[] = {
+        "*-*-aix*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zAix_MallocSelect0[] =
+       "#ifdef __cplusplus";
+
+#define    AIX_MALLOC_TEST_CT  1
+static tTestDesc aAix_MallocTests[] = {
+  { TT_EGREP,    zAix_MallocSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Aix_Malloc
+ */
+static const char* apzAix_MallocPatch[] = {
+    "format",
+    "#if (defined(__cplusplus) && defined(__IBMCPP__))",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
  *  Description of Aix_Net_If_Arp fix
  */
 tSCC zAix_Net_If_ArpName[] =
@@ -559,6 +650,201 @@ static const char* apzAix_Net_If_ArpPatch[] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
+ *  Description of Aix_Once_Init_1 fix
+ */
+tSCC zAix_Once_Init_1Name[] =
+     "aix_once_init_1";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zAix_Once_Init_1List[] =
+  "pthread.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzAix_Once_Init_1Machs[] = {
+        "*-*-aix*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zAix_Once_Init_1Select0[] =
+       "#define[ \t]PTHREAD_ONCE_INIT \\\\\n\
+\\{ \\\\\n";
+
+#define    AIX_ONCE_INIT_1_TEST_CT  1
+static tTestDesc aAix_Once_Init_1Tests[] = {
+  { TT_EGREP,    zAix_Once_Init_1Select0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Aix_Once_Init_1
+ */
+static const char* apzAix_Once_Init_1Patch[] = {
+    "format",
+    "#define PTHREAD_ONCE_INIT \\\n\
+{{ \\\n",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Aix_Once_Init_2 fix
+ */
+tSCC zAix_Once_Init_2Name[] =
+     "aix_once_init_2";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zAix_Once_Init_2List[] =
+  "pthread.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzAix_Once_Init_2Machs[] = {
+        "*-*-aix*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zAix_Once_Init_2Select0[] =
+       "[ \t]0 \\\\\n\
+\\}\n";
+
+#define    AIX_ONCE_INIT_2_TEST_CT  1
+static tTestDesc aAix_Once_Init_2Tests[] = {
+  { TT_EGREP,    zAix_Once_Init_2Select0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Aix_Once_Init_2
+ */
+static const char* apzAix_Once_Init_2Patch[] = {
+    "format",
+    "\t0 \\\n\
+}}\n",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  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[] =
@@ -949,118 +1235,6 @@ static const char* apzAlpha___AssertPatch[] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Alpha___Extern_Prefix fix
- */
-tSCC zAlpha___Extern_PrefixName[] =
-     "alpha___extern_prefix";
-
-/*
- *  File name selection pattern
- */
-#define zAlpha___Extern_PrefixList (char*)NULL
-/*
- *  Machine/OS name selection pattern
- */
-tSCC* apzAlpha___Extern_PrefixMachs[] = {
-        "alpha*-dec-osf*",
-        (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.*)";
-
-#define    ALPHA___EXTERN_PREFIX_TEST_CT  1
-static tTestDesc aAlpha___Extern_PrefixTests[] = {
-  { TT_EGREP,    zAlpha___Extern_PrefixSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Alpha___Extern_Prefix
- */
-static const char* apzAlpha___Extern_PrefixPatch[] = {
-    "format",
-    "%1 (defined(__DECC) || defined(__PRAGMA_EXTERN_PREFIX))\n\
-%3",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Alpha___Extern_Prefix_Standards fix
- */
-tSCC zAlpha___Extern_Prefix_StandardsName[] =
-     "alpha___extern_prefix_standards";
-
-/*
- *  File name selection pattern
- */
-tSCC zAlpha___Extern_Prefix_StandardsList[] =
-  "standards.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-tSCC* apzAlpha___Extern_Prefix_StandardsMachs[] = {
-        "alpha*-dec-osf*",
-        (const char*)NULL };
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zAlpha___Extern_Prefix_StandardsSelect0[] =
-       ".*!defined\\(_LIBC_POLLUTION_H_\\) && !defined\\(__DECC\\)";
-
-#define    ALPHA___EXTERN_PREFIX_STANDARDS_TEST_CT  1
-static tTestDesc aAlpha___Extern_Prefix_StandardsTests[] = {
-  { TT_EGREP,    zAlpha___Extern_Prefix_StandardsSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Alpha___Extern_Prefix_Standards
- */
-static const char* apzAlpha___Extern_Prefix_StandardsPatch[] = {
-    "format",
-    "%0 && !defined(__PRAGMA_EXTERN_PREFIX)",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Alpha___Extern_Prefix_Sys_Stat fix
- */
-tSCC zAlpha___Extern_Prefix_Sys_StatName[] =
-     "alpha___extern_prefix_sys_stat";
-
-/*
- *  File name selection pattern
- */
-tSCC zAlpha___Extern_Prefix_Sys_StatList[] =
-  "sys/stat.h\0sys/mount.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-tSCC* apzAlpha___Extern_Prefix_Sys_StatMachs[] = {
-        "alpha*-dec-osf5*",
-        (const char*)NULL };
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zAlpha___Extern_Prefix_Sys_StatSelect0[] =
-       "#[ \t]*if[ \t]*defined\\(__DECC\\)";
-
-#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 }, };
-
-/*
- *  Fix Command Arguments for Alpha___Extern_Prefix_Sys_Stat
- */
-static const char* apzAlpha___Extern_Prefix_Sys_StatPatch[] = {
-    "format",
-    "%0 || defined(__PRAGMA_EXTERN_PREFIX)",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
  *  Description of Alpha_Assert fix
  */
 tSCC zAlpha_AssertName[] =
@@ -1096,41 +1270,6 @@ static const char* apzAlpha_AssertPatch[] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  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[] =
@@ -1214,144 +1353,24 @@ tSCC zAlpha_ParensList[] =
 /*
  *  Machine/OS name selection pattern
  */
-#define apzAlpha_ParensMachs (const char**)NULL
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zAlpha_ParensSelect0[] =
-       "#ifndef\\(__mips64\\)";
-
-#define    ALPHA_PARENS_TEST_CT  1
-static tTestDesc aAlpha_ParensTests[] = {
-  { TT_EGREP,    zAlpha_ParensSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Alpha_Parens
- */
-static const char* apzAlpha_ParensPatch[] = {
-    "format",
-    "#ifndef __mips64",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  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 };
+#define apzAlpha_ParensMachs (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 \\$";
+tSCC zAlpha_ParensSelect0[] =
+       "#ifndef\\(__mips64\\)";
 
-#define    ALPHA_PTHREAD_INIT_TEST_CT  1
-static tTestDesc aAlpha_Pthread_InitTests[] = {
-  { TT_EGREP,    zAlpha_Pthread_InitSelect0, (regex_t*)NULL }, };
+#define    ALPHA_PARENS_TEST_CT  1
+static tTestDesc aAlpha_ParensTests[] = {
+  { TT_EGREP,    zAlpha_ParensSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Alpha_Pthread_Init
+ *  Fix Command Arguments for Alpha_Parens
  */
-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",
+static const char* apzAlpha_ParensPatch[] = {
+    "format",
+    "#ifndef __mips64",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -1802,6 +1821,41 @@ int vfscanf(FILE *, const char *, __builtin_va_list) __asm__ (_BSD_STRING(__USER
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
+ *  Description of Cdef_Cplusplus fix
+ */
+tSCC zCdef_CplusplusName[] =
+     "cdef_cplusplus";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zCdef_CplusplusList[] =
+  "sys/cdefs.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzCdef_CplusplusMachs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zCdef_CplusplusSelect0[] =
+       "\\[\\[noreturn\\]\\]";
+
+#define    CDEF_CPLUSPLUS_TEST_CT  1
+static tTestDesc aCdef_CplusplusTests[] = {
+  { TT_EGREP,    zCdef_CplusplusSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Cdef_Cplusplus
+ */
+static const char* apzCdef_CplusplusPatch[] = {
+    "format",
+    "__attribute__((__noreturn__))",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
  *  Description of Ctrl_Quotes_Def fix
  */
 tSCC zCtrl_Quotes_DefName[] =
@@ -4470,203 +4524,6 @@ static const char* apzIp_Missing_SemiPatch[] = { sed_cmd_z,
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  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";
-
-/*
- *  File name selection pattern
- */
-tSCC zIrix___Generic1List[] =
-  "internal/math_core.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-tSCC* apzIrix___Generic1Machs[] = {
-        "mips-sgi-irix6.5",
-        (const char*)NULL };
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zIrix___Generic1Select0[] =
-       "#define ([a-z]+)\\(x\\) *__generic.*";
-
-#define    IRIX___GENERIC1_TEST_CT  1
-static tTestDesc aIrix___Generic1Tests[] = {
-  { TT_EGREP,    zIrix___Generic1Select0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Irix___Generic1
- */
-static const char* apzIrix___Generic1Patch[] = {
-    "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",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Irix___Generic2 fix
- */
-tSCC zIrix___Generic2Name[] =
-     "irix___generic2";
-
-/*
- *  File name selection pattern
- */
-tSCC zIrix___Generic2List[] =
-  "internal/math_core.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-tSCC* apzIrix___Generic2Machs[] = {
-        "mips-sgi-irix6.5",
-        (const char*)NULL };
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zIrix___Generic2Select0[] =
-       "#define ([a-z]+)\\(x,y\\) *__generic.*";
-
-#define    IRIX___GENERIC2_TEST_CT  1
-static tTestDesc aIrix___Generic2Tests[] = {
-  { TT_EGREP,    zIrix___Generic2Select0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Irix___Generic2
- */
-static const char* apzIrix___Generic2Patch[] = {
-    "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",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Irix_Asm_Apostrophe fix
- */
-tSCC zIrix_Asm_ApostropheName[] =
-     "irix_asm_apostrophe";
-
-/*
- *  File name selection pattern
- */
-tSCC zIrix_Asm_ApostropheList[] =
-  "sys/asm.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-#define apzIrix_Asm_ApostropheMachs (const char**)NULL
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zIrix_Asm_ApostropheSelect0[] =
-       "^[ \t]*#.*[Ww]e're";
-
-#define    IRIX_ASM_APOSTROPHE_TEST_CT  1
-static tTestDesc aIrix_Asm_ApostropheTests[] = {
-  { TT_EGREP,    zIrix_Asm_ApostropheSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Irix_Asm_Apostrophe
- */
-static const char* apzIrix_Asm_ApostrophePatch[] = {
-    "format",
-    "%1 are",
-    "^([ \t]*#.*[Ww]e)'re",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Irix_Complex fix
- */
-tSCC zIrix_ComplexName[] =
-     "irix_complex";
-
-/*
- *  File name selection pattern
- */
-tSCC zIrix_ComplexList[] =
-  "complex.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-tSCC* apzIrix_ComplexMachs[] = {
-        "mips-sgi-irix6.5",
-        (const char*)NULL };
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zIrix_ComplexSelect0[] =
-       "#define[ \t]_Complex_I[ \t]\\(\\(float[ \t]_Complex\\)[ \t]\\(__I__\\)\\)";
-
-#define    IRIX_COMPLEX_TEST_CT  1
-static tTestDesc aIrix_ComplexTests[] = {
-  { TT_EGREP,    zIrix_ComplexSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Irix_Complex
- */
-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/",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
  *  Description of Irix_Limits_Const fix
  */
 tSCC zIrix_Limits_ConstName[] =
@@ -4681,218 +4538,23 @@ tSCC zIrix_Limits_ConstList[] =
  *  Machine/OS name selection pattern
  */
 #define apzIrix_Limits_ConstMachs (const char**)NULL
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zIrix_Limits_ConstSelect0[] =
-       "^extern const ";
-
-#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_Limits_Const
- */
-static const char* apzIrix_Limits_ConstPatch[] = {
-    "format",
-    "extern __const ",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Irix_Pthread_Init fix
- */
-tSCC zIrix_Pthread_InitName[] =
-     "irix_pthread_init";
-
-/*
- *  File name selection pattern
- */
-tSCC zIrix_Pthread_InitList[] =
-  "pthread.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-tSCC* apzIrix_Pthread_InitMachs[] = {
-        "mips-sgi-irix6.5",
-        (const char*)NULL };
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zIrix_Pthread_InitSelect0[] =
-       "^(#define[ \t]+PTHREAD_.*_INITIALIZER[ \t]+)(\\{ 0 \\})";
-
-#define    IRIX_PTHREAD_INIT_TEST_CT  1
-static tTestDesc aIrix_Pthread_InitTests[] = {
-  { TT_EGREP,    zIrix_Pthread_InitSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Irix_Pthread_Init
- */
-static const char* apzIrix_Pthread_InitPatch[] = {
-    "format",
-    "%1{ %2 }",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Irix_Socklen_T fix
- */
-tSCC zIrix_Socklen_TName[] =
-     "irix_socklen_t";
-
-/*
- *  File name selection pattern
- */
-tSCC zIrix_Socklen_TList[] =
-  "sys/socket.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-tSCC* apzIrix_Socklen_TMachs[] = {
-        "mips-sgi-irix6.5",
-        (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;)";
-
-#define    IRIX_SOCKLEN_T_TEST_CT  1
-static tTestDesc aIrix_Socklen_TTests[] = {
-  { TT_EGREP,    zIrix_Socklen_TSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Irix_Socklen_T
- */
-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 */",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Irix_Stdint_C99_Mode fix
- */
-tSCC zIrix_Stdint_C99_ModeName[] =
-     "irix_stdint_c99_mode";
-
-/*
- *  File name selection pattern
- */
-tSCC zIrix_Stdint_C99_ModeList[] =
-  "stdint.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-tSCC* apzIrix_Stdint_C99_ModeMachs[] = {
-        "mips-sgi-irix6.5",
-        (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)";
-
-#define    IRIX_STDINT_C99_MODE_TEST_CT  1
-static tTestDesc aIrix_Stdint_C99_ModeTests[] = {
-  { TT_EGREP,    zIrix_Stdint_C99_ModeSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Irix_Stdint_C99_Mode
- */
-static const char* apzIrix_Stdint_C99_ModePatch[] = {
-    "format",
-    "#if 0\n\
-%2",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Irix_Stdint_C99_Types fix
- */
-tSCC zIrix_Stdint_C99_TypesName[] =
-     "irix_stdint_c99_types";
-
-/*
- *  File name selection pattern
- */
-tSCC zIrix_Stdint_C99_TypesList[] =
-  "stdint-irix65.h\0stdint.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
-
-/*
- *  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
- */
-tSCC zIrix_Stdint_C99_MacrosName[] =
-     "irix_stdint_c99_macros";
-
-/*
- *  File name selection pattern
- */
-tSCC zIrix_Stdint_C99_MacrosList[] =
-  "stdint-irix65.h\0stdint.h\0";
+
 /*
- *  Machine/OS name selection pattern
+ *  content selection pattern - do fix if pattern found
  */
-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
+tSCC zIrix_Limits_ConstSelect0[] =
+       "^extern const ";
+
+#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 };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -4906,7 +4568,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
  */
@@ -4932,45 +4594,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[] =
@@ -6305,44 +5928,6 @@ extern \"C\" {\\\n\
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  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 }, };
-
-/*
- *  Fix Command Arguments for Solaris_Cond_Init
- */
-static const char* apzSolaris_Cond_InitPatch[] = {
-    "format",
-    "%1, 0x4356%2",
-    "^(#define[ \t]+PTHREAD_COND_INITIALIZER[ \t]+\\{.*0)(\\},[ \t]*0\\}.*)$",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
  *  Description of Solaris_Cxx_Linkage fix
  */
 tSCC zSolaris_Cxx_LinkageName[] =
@@ -7310,7 +6895,7 @@ tSCC zSolaris_Sys_Va_ListList[] =
  *  Machine/OS name selection pattern
  */
 tSCC* apzSolaris_Sys_Va_ListMachs[] = {
-        "*-*-solaris2.[89]",
+        "*-*-solaris2.9",
         (const char*)NULL };
 
 /*
@@ -7423,7 +7008,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
  */
@@ -8083,15 +7668,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 }, };
 
 /*
@@ -8561,6 +8139,272 @@ static const char* apzVms_Disable_Decc_String_BuiltinsPatch[] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
+ *  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 Vms_Add_Missing_Braces
+ */
+static const char* apzVms_Add_Missing_BracesPatch[] = {
+    "format",
+    "%1 {%2} ",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Vms_Do_Not_Redeclare_Hostalias fix
+ */
+tSCC zVms_Do_Not_Redeclare_HostaliasName[] =
+     "vms_do_not_redeclare_hostalias";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zVms_Do_Not_Redeclare_HostaliasList[] =
+  "rtldef/resolv.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzVms_Do_Not_Redeclare_HostaliasMachs[] = {
+        "*-*-*vms*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zVms_Do_Not_Redeclare_HostaliasSelect0[] =
+       "(void[ \t]+fp_nquery \\(const u_char \\*, int, FILE \\*\\);)\n\
+(__char_ptr32[ \t]+hostalias \\(const char \\*\\);)";
+
+#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 Vms_Do_Not_Redeclare_Hostalias
+ */
+static const char* apzVms_Do_Not_Redeclare_HostaliasPatch[] = {
+    "format",
+    "%1\n\
+/* %2 */",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Vms_Decc_Builtin fix
+ */
+tSCC zVms_Decc_BuiltinName[] =
+     "vms_decc_builtin";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zVms_Decc_BuiltinList[] =
+  "rtldef/string.h\0rtldef/time.h\0rtldef/strings.h\0rtldef/socket.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzVms_Decc_BuiltinMachs[] = {
+        "*-*-*vms*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zVms_Decc_BuiltinSelect0[] =
+       "(__MEMSET|__MEMMOVE|__MEMCPY|__STRLEN|__STRCPY)";
+
+#define    VMS_DECC_BUILTIN_TEST_CT  1
+static tTestDesc aVms_Decc_BuiltinTests[] = {
+  { TT_EGREP,    zVms_Decc_BuiltinSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Vms_Decc_Builtin
+ */
+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_No_64bit_Getopt fix
+ */
+tSCC zVms_No_64bit_GetoptName[] =
+     "vms_no_64bit_getopt";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zVms_No_64bit_GetoptList[] =
+  "rtldef/stdio.h\0rtldef/unistd.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzVms_No_64bit_GetoptMachs[] = {
+        "*-*-*vms*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zVms_No_64bit_GetoptSelect0[] =
+       "^[ \t]*(extern[ \t]*)?(int[ \t]*(getopt|optind|opterr|optopt)|(char \\*optarg))([ \t]*\\(.*\\))?;\n";
+
+#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_No_64bit_Getopt
+ */
+static const char* apzVms_No_64bit_GetoptPatch[] = {
+    "format",
+    "#if __INITIAL_POINTER_SIZE != 64 /* getopt is short ptr only.  */\n\
+%0#endif\n",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Vms_Forward_Declare_Struct fix
+ */
+tSCC zVms_Forward_Declare_StructName[] =
+     "vms_forward_declare_struct";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zVms_Forward_Declare_StructList[] =
+  "rtldef/if.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzVms_Forward_Declare_StructMachs[] = {
+        "*-*-*vms*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zVms_Forward_Declare_StructSelect0[] =
+       "(/\\* forward decls for C\\+\\+ \\*/\n\
+)#ifdef __cplusplus\n";
+
+#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_Forward_Declare_Struct
+ */
+static const char* apzVms_Forward_Declare_StructPatch[] = {
+    "format",
+    "%1#if defined (__cplusplus) || defined (__GNUC__)\n",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Vms_Use_Fast_Setjmp fix
+ */
+tSCC zVms_Use_Fast_SetjmpName[] =
+     "vms_use_fast_setjmp";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zVms_Use_Fast_SetjmpList[] =
+  "rtldef/setjmp.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzVms_Use_Fast_SetjmpMachs[] = {
+        "*-*-*vms*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zVms_Use_Fast_SetjmpSelect0[] =
+       "(#[ \t]*if[ \t]*defined\\(__FAST_SETJMP\\)[ \t]*\\|\\|)";
+
+#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_Use_Fast_Setjmp
+ */
+static const char* apzVms_Use_Fast_SetjmpPatch[] = {
+    "format",
+    "%0 defined (__GNUC__) ||",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
  *  Description of Void_Null fix
  */
 tSCC zVoid_NullName[] =
@@ -8587,10 +8431,13 @@ tSCC zVoid_NullSelect0[] =
  */
 tSCC zVoid_NullBypass0[] =
        "__cplusplus";
+tSCC zVoid_NullBypass1[] =
+       "__null";
 
-#define    VOID_NULL_TEST_CT  2
+#define    VOID_NULL_TEST_CT  3
 static tTestDesc aVoid_NullTests[] = {
   { TT_NEGREP,   zVoid_NullBypass0, (regex_t*)NULL },
+  { TT_NEGREP,   zVoid_NullBypass1, (regex_t*)NULL },
   { TT_EGREP,    zVoid_NullSelect0, (regex_t*)NULL }, };
 
 /*
@@ -8953,15 +8800,16 @@ static const char* apzX11_SprintfPatch[] = {
  *
  *  List of all fixes
  */
-#define REGEX_COUNT          261
+#define REGEX_COUNT          259
 #define MACH_LIST_SIZE_LIMIT 181
-#define FIX_COUNT            220
+#define FIX_COUNT            216
 
 /*
  *  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,
@@ -8970,7 +8818,13 @@ typedef enum {
     AAB_SOLARIS_SYS_VARARGS_H_FIXIDX,
     AAB_SUN_MEMCPY_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,
@@ -8981,17 +8835,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,
@@ -9003,6 +8850,7 @@ typedef enum {
     BROKEN_CABS_FIXIDX,
     BROKEN_NAN_FIXIDX,
     BSD_STDIO_ATTRS_CONFLICT_FIXIDX,
+    CDEF_CPLUSPLUS_FIXIDX,
     CTRL_QUOTES_DEF_FIXIDX,
     CTRL_QUOTES_USE_FIXIDX,
     CXX_UNREADY_FIXIDX,
@@ -9069,19 +8917,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,
@@ -9116,7 +8953,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,
@@ -9172,6 +9008,13 @@ 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_NEEDS_VXTYPES_FIXIDX,
@@ -9189,6 +9032,11 @@ 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,
@@ -9229,11 +9077,41 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      AIX_COMPLEX_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aAix_ComplexTests,   apzAix_ComplexPatch, 0 },
 
+  {  zAix_MallocName,    zAix_MallocList,
+     apzAix_MallocMachs,
+     AIX_MALLOC_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aAix_MallocTests,   apzAix_MallocPatch, 0 },
+
   {  zAix_Net_If_ArpName,    zAix_Net_If_ArpList,
      apzAix_Net_If_ArpMachs,
      AIX_NET_IF_ARP_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aAix_Net_If_ArpTests,   apzAix_Net_If_ArpPatch, 0 },
 
+  {  zAix_Once_Init_1Name,    zAix_Once_Init_1List,
+     apzAix_Once_Init_1Machs,
+     AIX_ONCE_INIT_1_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aAix_Once_Init_1Tests,   apzAix_Once_Init_1Patch, 0 },
+
+  {  zAix_Once_Init_2Name,    zAix_Once_Init_2List,
+     apzAix_Once_Init_2Machs,
+     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,
@@ -9284,31 +9162,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,
@@ -9324,21 +9182,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,
@@ -9394,6 +9237,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      BSD_STDIO_ATTRS_CONFLICT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aBsd_Stdio_Attrs_ConflictTests,   apzBsd_Stdio_Attrs_ConflictPatch, 0 },
 
+  {  zCdef_CplusplusName,    zCdef_CplusplusList,
+     apzCdef_CplusplusMachs,
+     CDEF_CPLUSPLUS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aCdef_CplusplusTests,   apzCdef_CplusplusPatch, 0 },
+
   {  zCtrl_Quotes_DefName,    zCtrl_Quotes_DefList,
      apzCtrl_Quotes_DefMachs,
      CTRL_QUOTES_DEF_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -9724,71 +9572,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,
@@ -9959,11 +9752,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,
@@ -10239,6 +10027,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,