configure.tgt (x86_64): Tune -m32 multilib to generic.
[gcc.git] / fixincludes / fixincl.x
index b6a804dcb413f52940b60881cf825076fba7f205..eb98f44958dc127ae88752fef6286afd431e9e0f 100644 (file)
@@ -2,11 +2,11 @@
  * 
  * DO NOT EDIT THIS FILE   (fixincl.x)
  * 
- * It has been AutoGen-ed  Wednesday March 14, 2012 at 03:19:50 PM MET
+ * It has been AutoGen-ed  October 21, 2014 at 10:18:16 AM by AutoGen 5.16.2
  * From the definitions    inclhack.def
  * and the template file   fixincl
  */
-/* DO NOT SVN-MERGE THIS FILE, EITHER Wed Mar 14 15:19:50 MET 2012
+/* DO NOT SVN-MERGE THIS FILE, EITHER Tue Oct 21 10:18:17 CEST 2014
  *
  * 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 211 fixup descriptions.
+ * This file contains 223 fixup descriptions.
  *
  * See README for more information.
  *
@@ -99,6 +99,60 @@ extern off64_t ftello(FILE *) __asm__(\"ftello64\");\n\
 #endif\n",
     (char*)NULL };
 
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  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
@@ -213,44 +267,6 @@ static const char* apzAab_Darwin7_9_Long_Double_FuncsPatch[] = {
 #endif /* __MATH__ */",
     (char*)NULL };
 
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  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
@@ -483,6 +499,280 @@ static const char* apzAab_Sun_MemcpyPatch[] = {
 #endif /* __memory_h__ */",
     (char*)NULL };
 
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  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_Assert fix
+ */
+tSCC zAix_AssertName[] =
+     "aix_assert";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zAix_AssertList[] =
+  "assert.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzAix_AssertMachs[] = {
+        "*-*-aix*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zAix_AssertSelect0[] =
+       "#define[ \t]static_assert[ \t]_Static_assert";
+
+#define    AIX_ASSERT_TEST_CT  1
+static tTestDesc aAix_AssertTests[] = {
+  { TT_EGREP,    zAix_AssertSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Aix_Assert
+ */
+static const char* apzAix_AssertPatch[] = {
+    "format",
+    "#ifndef __cplusplus\n\
+%0\n\
+#endif",
+    (char*)NULL };
+
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  Description of Aix_Complex fix
@@ -520,6 +810,43 @@ static const char* apzAix_ComplexPatch[] = {
     "#define _Complex_I (__extension__ 1.0iF)",
     (char*)NULL };
 
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  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
@@ -557,6 +884,60 @@ static const char* apzAix_Net_If_ArpPatch[] = {
     "typedef struct _fc_softc {",
     (char*)NULL };
 
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Aix_Null fix
+ */
+tSCC zAix_NullName[] =
+     "aix_null";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zAix_NullList[] =
+  "curses.h\0dbm.h\0locale.h\0stdio.h\0stdlib.h\0string.h\0time.h\0unistd.h\0wchar.h\0sys/dir.h\0sys/param.h\0sys/types.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzAix_NullMachs[] = {
+        "*-*-aix*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zAix_NullSelect0[] =
+       "#define[ \t]+NULL[ \t]+\\(*0L*\\)*";
+
+/*
+ *  content bypass pattern - skip fix if pattern found
+ */
+tSCC zAix_NullBypass0[] =
+       "__null";
+
+#define    AIX_NULL_TEST_CT  2
+static tTestDesc aAix_NullTests[] = {
+  { TT_NEGREP,   zAix_NullBypass0, (regex_t*)NULL },
+  { TT_EGREP,    zAix_NullSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Aix_Null
+ */
+static const char* apzAix_NullPatch[] = {
+    "format",
+    "#ifndef NULL\n\
+#ifdef __cplusplus\n\
+#ifdef __GNUG__\n\
+#define NULL __null\n\
+#else /* ! __GNUG__  */\n\
+#define NULL 0L\n\
+#endif /* __GNUG__  */\n\
+#else /* ! __cplusplus  */\n\
+#define NULL ((void *)0)\n\
+#endif /* __cplusplus  */\n\
+#endif /* !NULL  */",
+    (char*)NULL };
+
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  Description of Aix_Once_Init_1 fix
@@ -637,86 +1018,203 @@ static const char* apzAix_Once_Init_2Patch[] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Aix_Pthread fix
+ *  Description of Aix_Mutex_Initializer_1 fix
  */
-tSCC zAix_PthreadName[] =
-     "aix_pthread";
+tSCC zAix_Mutex_Initializer_1Name[] =
+     "aix_mutex_initializer_1";
 
 /*
  *  File name selection pattern
  */
-tSCC zAix_PthreadList[] =
+tSCC zAix_Mutex_Initializer_1List[] =
   "pthread.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzAix_PthreadMachs (const char**)NULL
+tSCC* apzAix_Mutex_Initializer_1Machs[] = {
+        "*-*-aix*",
+        (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zAix_PthreadSelect0[] =
-       "(#define [A-Za-z_0-9]+)(\\\\\n\
-[^A-Za-z_0-9 \t\n\
-(])";
+tSCC zAix_Mutex_Initializer_1Select0[] =
+       "#define[ \t]PTHREAD_MUTEX_INITIALIZER \\\\\n\
+\\{ \\\\\n";
 
-#define    AIX_PTHREAD_TEST_CT  1
-static tTestDesc aAix_PthreadTests[] = {
-  { TT_EGREP,    zAix_PthreadSelect0, (regex_t*)NULL }, };
+#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_Pthread
+ *  Fix Command Arguments for Aix_Mutex_Initializer_1
  */
-static const char* apzAix_PthreadPatch[] = {
+static const char* apzAix_Mutex_Initializer_1Patch[] = {
     "format",
-    "%1 %2",
+    "#define PTHREAD_MUTEX_INITIALIZER \\\n\
+{{ \\\n",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Aix_Stdint_1 fix
+ *  Description of Aix_Cond_Initializer_1 fix
  */
-tSCC zAix_Stdint_1Name[] =
-     "aix_stdint_1";
+tSCC zAix_Cond_Initializer_1Name[] =
+     "aix_cond_initializer_1";
 
 /*
  *  File name selection pattern
  */
-tSCC zAix_Stdint_1List[] =
-  "stdint-aix.h\0stdint.h\0";
+tSCC zAix_Cond_Initializer_1List[] =
+  "pthread.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzAix_Stdint_1Machs[] = {
+tSCC* apzAix_Cond_Initializer_1Machs[] = {
         "*-*-aix*",
         (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zAix_Stdint_1Select0[] =
-       "#define[ \t]UINT8_MAX[ \t]\\(255U\\)\n\
-#define[ \t]UINT16_MAX[ \t]\\(65535U\\)";
+tSCC zAix_Cond_Initializer_1Select0[] =
+       "#define[ \t]PTHREAD_COND_INITIALIZER \\\\\n\
+\\{ \\\\\n";
 
-#define    AIX_STDINT_1_TEST_CT  1
-static tTestDesc aAix_Stdint_1Tests[] = {
-  { TT_EGREP,    zAix_Stdint_1Select0, (regex_t*)NULL }, };
+#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_Stdint_1
+ *  Fix Command Arguments for Aix_Cond_Initializer_1
  */
-static const char* apzAix_Stdint_1Patch[] = {
+static const char* apzAix_Cond_Initializer_1Patch[] = {
     "format",
-    "#define UINT8_MAX\t(255)\n\
-#define UINT16_MAX\t(65535)",
+    "#define PTHREAD_COND_INITIALIZER \\\n\
+{{ \\\n",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Aix_Stdint_2 fix
+ *  Description of Aix_Rwlock_Initializer_1 fix
  */
-tSCC zAix_Stdint_2Name[] =
-     "aix_stdint_2";
+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[] =
+     "aix_pthread";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zAix_PthreadList[] =
+  "pthread.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzAix_PthreadMachs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zAix_PthreadSelect0[] =
+       "(#define [A-Za-z_0-9]+)(\\\\\n\
+[^A-Za-z_0-9 \t\n\
+(])";
+
+#define    AIX_PTHREAD_TEST_CT  1
+static tTestDesc aAix_PthreadTests[] = {
+  { TT_EGREP,    zAix_PthreadSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Aix_Pthread
+ */
+static const char* apzAix_PthreadPatch[] = {
+    "format",
+    "%1 %2",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Aix_Stdint_1 fix
+ */
+tSCC zAix_Stdint_1Name[] =
+     "aix_stdint_1";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zAix_Stdint_1List[] =
+  "stdint-aix.h\0stdint.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzAix_Stdint_1Machs[] = {
+        "*-*-aix*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zAix_Stdint_1Select0[] =
+       "#define[ \t]UINT8_MAX[ \t]\\(255U\\)\n\
+#define[ \t]UINT16_MAX[ \t]\\(65535U\\)";
+
+#define    AIX_STDINT_1_TEST_CT  1
+static tTestDesc aAix_Stdint_1Tests[] = {
+  { TT_EGREP,    zAix_Stdint_1Select0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Aix_Stdint_1
+ */
+static const char* apzAix_Stdint_1Patch[] = {
+    "format",
+    "#define UINT8_MAX\t(255)\n\
+#define UINT16_MAX\t(65535)",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Aix_Stdint_2 fix
+ */
+tSCC zAix_Stdint_2Name[] =
+     "aix_stdint_2";
 
 /*
  *  File name selection pattern
@@ -1550,7 +2048,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
@@ -1611,41 +2109,6 @@ static const char* apzBsd_Stdio_Attrs_ConflictPatch[] = {
 int vfscanf(FILE *, const char *, __builtin_va_list) __asm__ (_BSD_STRING(__USER_LABEL_PREFIX__) \"__svfscanf\");",
     (char*)NULL };
 
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  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
@@ -1761,6 +2224,44 @@ extern \"C\" {\n\
 #endif\n",
     (char*)NULL };
 
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  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
@@ -2306,6 +2807,108 @@ static const char* apzEcd_CursorPatch[] = {
     "ecd_cursor",
     (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*/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 };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  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*/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 Freebsd_Gcc3_Breakage fix
@@ -2570,7 +3173,7 @@ tSCC zGlibc_C99_Inline_4Name[] =
  *  File name selection pattern
  */
 tSCC zGlibc_C99_Inline_4List[] =
-  "sys/sysmacros.h\0*/sys/sysmacros.h\0wchar.h\0*/wchar.h\0";
+  "sys/sysmacros.h\0*/sys/sysmacros.h\0wchar.h\0*/wchar.h\0pthread.h\0*/pthread.h\0";
 /*
  *  Machine/OS name selection pattern
  */
@@ -2702,7 +3305,7 @@ tSCC zGlibc_StrncpyName[] =
  *  File name selection pattern
  */
 tSCC zGlibc_StrncpyList[] =
-  "bits/string2.h\0";
+  "bits/string2.h\0*/bits/string2.h\0";
 /*
  *  Machine/OS name selection pattern
  */
@@ -3216,54 +3819,132 @@ static const char* apzHpux11_AbsPatch[] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Hpux11_Fabsf fix
+ *  Description of Hpux11_Extern_Sendfile fix
  */
-tSCC zHpux11_FabsfName[] =
-     "hpux11_fabsf";
+tSCC zHpux11_Extern_SendfileName[] =
+     "hpux11_extern_sendfile";
 
 /*
  *  File name selection pattern
  */
-tSCC zHpux11_FabsfList[] =
-  "math.h\0";
+tSCC zHpux11_Extern_SendfileList[] =
+  "sys/socket.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzHpux11_FabsfMachs (const char**)NULL
+tSCC* apzHpux11_Extern_SendfileMachs[] = {
+        "*-hp-hpux11.[12]*",
+        (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zHpux11_FabsfSelect0[] =
-       "^[ \t]*#[ \t]*define[ \t]+fabsf\\(.*";
-
-/*
- *  content bypass pattern - skip fix if pattern found
- */
-tSCC zHpux11_FabsfBypass0[] =
-       "__cplusplus";
+tSCC zHpux11_Extern_SendfileSelect0[] =
+       "^[ \t]*extern sbsize_t sendfile.*\n\
+.*, int\\)\\);\n";
 
-#define    HPUX11_FABSF_TEST_CT  2
-static tTestDesc aHpux11_FabsfTests[] = {
-  { TT_NEGREP,   zHpux11_FabsfBypass0, (regex_t*)NULL },
-  { TT_EGREP,    zHpux11_FabsfSelect0, (regex_t*)NULL }, };
+#define    HPUX11_EXTERN_SENDFILE_TEST_CT  1
+static tTestDesc aHpux11_Extern_SendfileTests[] = {
+  { TT_EGREP,    zHpux11_Extern_SendfileSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Hpux11_Fabsf
+ *  Fix Command Arguments for Hpux11_Extern_Sendfile
  */
-static const char* apzHpux11_FabsfPatch[] = {
+static const char* apzHpux11_Extern_SendfilePatch[] = {
     "format",
-    "#ifndef __cplusplus\n\
-%0\n\
-#endif",
+    "#ifndef _APP32_64BIT_OFF_T\n\
+%0#endif\n",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Hpux11_Pthread_Const fix
+ *  Description of Hpux11_Extern_Sendpath fix
  */
-tSCC zHpux11_Pthread_ConstName[] =
-     "hpux11_pthread_const";
+tSCC zHpux11_Extern_SendpathName[] =
+     "hpux11_extern_sendpath";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zHpux11_Extern_SendpathList[] =
+  "sys/socket.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzHpux11_Extern_SendpathMachs[] = {
+        "*-hp-hpux11.[12]*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zHpux11_Extern_SendpathSelect0[] =
+       "^[ \t]*extern sbsize_t sendpath.*\n\
+.*, int\\)\\);\n";
+
+#define    HPUX11_EXTERN_SENDPATH_TEST_CT  1
+static tTestDesc aHpux11_Extern_SendpathTests[] = {
+  { TT_EGREP,    zHpux11_Extern_SendpathSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Hpux11_Extern_Sendpath
+ */
+static const char* apzHpux11_Extern_SendpathPatch[] = {
+    "format",
+    "#ifndef _APP32_64BIT_OFF_T\n\
+%0#endif\n",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Hpux11_Fabsf fix
+ */
+tSCC zHpux11_FabsfName[] =
+     "hpux11_fabsf";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zHpux11_FabsfList[] =
+  "math.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzHpux11_FabsfMachs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zHpux11_FabsfSelect0[] =
+       "^[ \t]*#[ \t]*define[ \t]+fabsf\\(.*";
+
+/*
+ *  content bypass pattern - skip fix if pattern found
+ */
+tSCC zHpux11_FabsfBypass0[] =
+       "__cplusplus";
+
+#define    HPUX11_FABSF_TEST_CT  2
+static tTestDesc aHpux11_FabsfTests[] = {
+  { TT_NEGREP,   zHpux11_FabsfBypass0, (regex_t*)NULL },
+  { TT_EGREP,    zHpux11_FabsfSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Hpux11_Fabsf
+ */
+static const char* apzHpux11_FabsfPatch[] = {
+    "format",
+    "#ifndef __cplusplus\n\
+%0\n\
+#endif",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Hpux11_Pthread_Const fix
+ */
+tSCC zHpux11_Pthread_ConstName[] =
+     "hpux11_pthread_const";
 
 /*
  *  File name selection pattern
@@ -3445,6 +4126,101 @@ static const char* apzHpux8_Bogus_InlinesPatch[] = { sed_cmd_z,
     "-e", "s@inline double sqr(double [a-z][a-z]*) {.*}@@",
     (char*)NULL };
 
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Hpux_C99_Intptr fix
+ */
+tSCC zHpux_C99_IntptrName[] =
+     "hpux_c99_intptr";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zHpux_C99_IntptrList[] =
+  "stdint-hpux11.h\0stdint.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzHpux_C99_IntptrMachs[] = {
+        "*-hp-hpux11.3*",
+        (const char*)NULL };
+#define HPUX_C99_INTPTR_TEST_CT  0
+#define aHpux_C99_IntptrTests   (tTestDesc*)NULL
+
+/*
+ *  Fix Command Arguments for Hpux_C99_Intptr
+ */
+static const char* apzHpux_C99_IntptrPatch[] = { sed_cmd_z,
+    "-e", "s@^[ \t]*#[ \t]*define[ \t]*PTRDIFF_MAX[ \t]*INT32_MAX[ \t]*$@#define PTRDIFF_MAX (2147483647l)@",
+    "-e", "s@^[ \t]*#[ \t]*define[ \t]*PTRDIFF_MIN[ \t]*INT32_MIN[ \t]*$@#define PTRDIFF_MIN (-PTRDIFF_MAX - 1)@",
+    "-e", "s@^[ \t]*#[ \t]*define[ \t]*INTPTR_MAX[ \t]*INT32_MAX[ \t]*$@#define INTPTR_MAX (2147483647l)@",
+    "-e", "s@^[ \t]*#[ \t]*define[ \t]*INTPTR_MIN[ \t]*INT32_MIN[ \t]*$@#define INTPTR_MIN (-INTPTR_MAX - 1)@",
+    "-e", "s@^[ \t]*#[ \t]*define[ \t]*UINTPTR_MAX[ \t]*UINT32_MAX[ \t]*$@#define UINTPTR_MAX (4294967295ul)@",
+    "-e", "s@^[ \t]*#[ \t]*define[ \t]*SIZE_MAX[ \t]*UINT32_MAX[ \t]*$@#define SIZE_MAX (4294967295ul)@",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Hpux_C99_Inttypes fix
+ */
+tSCC zHpux_C99_InttypesName[] =
+     "hpux_c99_inttypes";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zHpux_C99_InttypesList[] =
+  "inttypes.h\0stdint-hpux11.h\0stdint.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzHpux_C99_InttypesMachs[] = {
+        "*-hp-hpux11.[23]*",
+        (const char*)NULL };
+#define HPUX_C99_INTTYPES_TEST_CT  0
+#define aHpux_C99_InttypesTests   (tTestDesc*)NULL
+
+/*
+ *  Fix Command Arguments for Hpux_C99_Inttypes
+ */
+static const char* apzHpux_C99_InttypesPatch[] = { sed_cmd_z,
+    "-e", "s@^[ \t]*#[ \t]*define[ \t]*UINT8_C(__c)[ \t]*__CONCAT_U__(__c)[ \t]*$@#define UINT8_C(__c) (__c)@",
+    "-e", "s@^[ \t]*#[ \t]*define[ \t]*UINT16_C(__c)[ \t]*__CONCAT_U__(__c)[ \t]*$@#define UINT16_C(__c) (__c)@",
+    "-e", "s@^[ \t]*#[ \t]*define[ \t]*INT32_C(__c)[ \t]*__CONCAT__(__c,l)[ \t]*$@#define INT32_C(__c) (__c)@",
+    "-e", "s@^[ \t]*#[ \t]*define[ \t]*UINT32_C(__c)[ \t].*$@#define UINT32_C(__c) __CONCAT__(__c,u)@",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Hpux_C99_Inttypes2 fix
+ */
+tSCC zHpux_C99_Inttypes2Name[] =
+     "hpux_c99_inttypes2";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zHpux_C99_Inttypes2List[] =
+  "stdint-hpux11.h\0stdint.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzHpux_C99_Inttypes2Machs[] = {
+        "*-hp-hpux11.2*",
+        (const char*)NULL };
+#define HPUX_C99_INTTYPES2_TEST_CT  0
+#define aHpux_C99_Inttypes2Tests   (tTestDesc*)NULL
+
+/*
+ *  Fix Command Arguments for Hpux_C99_Inttypes2
+ */
+static const char* apzHpux_C99_Inttypes2Patch[] = { sed_cmd_z,
+    "-e", "s@^[ \t]*#[ \t]*define[ \t]*INT8_C(__c)[ \t]*((signed char)(__c))[ \t]*$@#define INT8_C(__c) (__c)@",
+    "-e", "s@^[ \t]*#[ \t]*define[ \t]*UINT8_C(__c)[ \t]*((unsigned char)(__c))[ \t]*$@#define UINT8_C(__c) (__c)@",
+    "-e", "s@^[ \t]*#[ \t]*define[ \t]*INT16_C(__c)[ \t]*((short)(__c))[ \t]*$@#define INT16_C(__c) (__c)@",
+    "-e", "s@^[ \t]*#[ \t]*define[ \t]*UINT16_C(__c)[ \t]*((unsigned short)(__c))[ \t]*$@#define UINT16_C(__c) (__c)@",
+    (char*)NULL };
+
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  Description of Hpux_Ctype_Macros fix
@@ -3480,6 +4256,50 @@ static const char* apzHpux_Ctype_MacrosPatch[] = {
     "%1(int)%3",
     (char*)NULL };
 
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Hpux_Extern_Errno fix
+ */
+tSCC zHpux_Extern_ErrnoName[] =
+     "hpux_extern_errno";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zHpux_Extern_ErrnoList[] =
+  "errno.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzHpux_Extern_ErrnoMachs[] = {
+        "*-hp-hpux10.*",
+        "*-hp-hpux11.[0-2]*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zHpux_Extern_ErrnoSelect0[] =
+       "^[ \t]*extern int errno;$";
+
+#define    HPUX_EXTERN_ERRNO_TEST_CT  1
+static tTestDesc aHpux_Extern_ErrnoTests[] = {
+  { TT_EGREP,    zHpux_Extern_ErrnoSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Hpux_Extern_Errno
+ */
+static const char* apzHpux_Extern_ErrnoPatch[] = {
+    "format",
+    "#ifdef __cplusplus\n\
+extern \"C\" {\n\
+#endif\n\
+%0\n\
+#ifdef __cplusplus\n\
+}\n\
+#endif",
+    (char*)NULL };
+
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  Description of Hpux_Htonl fix
@@ -3522,37 +4342,111 @@ static const char* apzHpux_HtonlPatch[] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Hpux_Long_Double fix
+ *  Description of Hpux_Imaginary_I fix
  */
-tSCC zHpux_Long_DoubleName[] =
-     "hpux_long_double";
+tSCC zHpux_Imaginary_IName[] =
+     "hpux_imaginary_i";
 
 /*
  *  File name selection pattern
  */
-tSCC zHpux_Long_DoubleList[] =
-  "stdlib.h\0";
+tSCC zHpux_Imaginary_IList[] =
+  "complex.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzHpux_Long_DoubleMachs[] = {
-        "*-*-hpux10*",
-        "*-*-hpux11.[012]*",
+tSCC* apzHpux_Imaginary_IMachs[] = {
+        "ia64-hp-hpux11.*",
         (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zHpux_Long_DoubleSelect0[] =
-       "extern[ \t]long_double[ \t]strtold";
+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 }, };
 
 /*
- *  content bypass pattern - skip fix if pattern found
+ *  Fix Command Arguments for Hpux_Imaginary_I
  */
-tSCC zHpux_Long_DoubleBypass0[] =
-       "long_double_t";
+static const char* apzHpux_Imaginary_IPatch[] = {
+    "format",
+    "#define _Complex_I (__extension__ 1.0iF)",
+    (char*)NULL };
 
-#define    HPUX_LONG_DOUBLE_TEST_CT  2
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Hpux_Inttype_Int8_T fix
+ */
+tSCC zHpux_Inttype_Int8_TName[] =
+     "hpux_inttype_int8_t";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zHpux_Inttype_Int8_TList[] =
+  "sys/_inttypes.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzHpux_Inttype_Int8_TMachs[] = {
+        "*-hp-hpux1[01].*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zHpux_Inttype_Int8_TSelect0[] =
+       "^[ \t]*typedef[ \t]*char[ \t]*int(_least){0,1}8_t.*";
+
+#define    HPUX_INTTYPE_INT8_T_TEST_CT  1
+static tTestDesc aHpux_Inttype_Int8_TTests[] = {
+  { TT_EGREP,    zHpux_Inttype_Int8_TSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Hpux_Inttype_Int8_T
+ */
+static const char* apzHpux_Inttype_Int8_TPatch[] = {
+    "format",
+    "typedef signed char int%18_t;",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Hpux_Long_Double fix
+ */
+tSCC zHpux_Long_DoubleName[] =
+     "hpux_long_double";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zHpux_Long_DoubleList[] =
+  "stdlib.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzHpux_Long_DoubleMachs[] = {
+        "*-*-hpux10*",
+        "*-*-hpux11.[012]*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zHpux_Long_DoubleSelect0[] =
+       "extern[ \t]long_double[ \t]strtold";
+
+/*
+ *  content bypass pattern - skip fix if pattern found
+ */
+tSCC zHpux_Long_DoubleBypass0[] =
+       "long_double_t";
+
+#define    HPUX_LONG_DOUBLE_TEST_CT  2
 static tTestDesc aHpux_Long_DoubleTests[] = {
   { TT_NEGREP,   zHpux_Long_DoubleBypass0, (regex_t*)NULL },
   { TT_EGREP,    zHpux_Long_DoubleSelect0, (regex_t*)NULL }, };
@@ -3604,37 +4498,42 @@ static const char* apzHpux_Long_Double_2Patch[] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Hpux_Systime fix
+ *  Description of Hpux_Pthread_Initializers fix
  */
-tSCC zHpux_SystimeName[] =
-     "hpux_systime";
+tSCC zHpux_Pthread_InitializersName[] =
+     "hpux_pthread_initializers";
 
 /*
  *  File name selection pattern
  */
-tSCC zHpux_SystimeList[] =
-  "sys/time.h\0";
+tSCC zHpux_Pthread_InitializersList[] =
+  "sys/pthread.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzHpux_SystimeMachs (const char**)NULL
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zHpux_SystimeSelect0[] =
-       "^extern struct sigevent;";
-
-#define    HPUX_SYSTIME_TEST_CT  1
-static tTestDesc aHpux_SystimeTests[] = {
-  { TT_EGREP,    zHpux_SystimeSelect0, (regex_t*)NULL }, };
+tSCC* apzHpux_Pthread_InitializersMachs[] = {
+        "*-hp-hpux11.[0-3]*",
+        (const char*)NULL };
+#define HPUX_PTHREAD_INITIALIZERS_TEST_CT  0
+#define aHpux_Pthread_InitializersTests   (tTestDesc*)NULL
 
 /*
- *  Fix Command Arguments for Hpux_Systime
+ *  Fix Command Arguments for Hpux_Pthread_Initializers
  */
-static const char* apzHpux_SystimePatch[] = {
-    "format",
-    "struct sigevent;",
+static const char* apzHpux_Pthread_InitializersPatch[] = { sed_cmd_z,
+    "-e", "s@^[ \t]*1, 1, 1, 1,[ \t]*\\\\@\t{ 1, 1, 1, 1 },\t\t\t\t\t\t\t\\\\@",
+    "-e", "s@^[ \t]*1,[ \t]*\\\\@\t{ 1, 0 }@",
+    "-e", "/^[ \t]*0$/d",
+    "-e", "s@__PTHREAD_MUTEX_VALID, 0@{ __PTHREAD_MUTEX_VALID, 0 }@",
+    "-e", "s@^[ \t]*0, 0, -1, 0,[ \t]*\\\\@\t{ 0, 0, -1, 0 },\t\t\t\t\t\t\\\\@",
+    "-e", "s@0, __LWP_MTX_VALID, 0, 1, 1, 1, 1,[ \t]*\\\\@{ 0, __LWP_MTX_VALID }, { 0, 1, 1, 1, 1 },\t\t\t\\\\@",
+    "-e", "s@^[ \t]*__LWP_MTX_VALID, 0, 1, 1, 1, 1,[ \t]*\\\\@\t{ 0, __LWP_MTX_VALID }, { 0, 1, 1, 1, 1 },\t\t\t\\\\@",
+    "-e", "s@^[ \t]*0, 0[ \t]*\\\\@\t{ 0, 0 }\t\t\t\t\t\t\t\\\\@",
+    "-e", "s@__PTHREAD_COND_VALID, 0@{ __PTHREAD_COND_VALID, 0 }@",
+    "-e", "s@__LWP_COND_VALID, 0,[ \t]*\\\\@{ __LWP_COND_VALID, 0 },\t\t\t\t\t\\\\@",
+    "-e", "s@__PTHREAD_RWLOCK_VALID, 0@{ __PTHREAD_RWLOCK_VALID, 0 }@",
+    "-e", "s@__LWP_RWLOCK_VALID, 0,[ \t]*\\\\@{ __LWP_RWLOCK_VALID, 0 },\t\t\t\t\t\\\\@",
+    "-e", "s@^[ \t]*0, 0, 0, 0, 0, 0, 0[ \t]*\\\\@\t{ 0, 0, 0, 0, 0 }, { 0, 0}\t\t\t\t\t\\\\@",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -3678,436 +4577,140 @@ static const char* apzHpux_Spu_InfoPatch[] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Hpux11_Extern_Sendfile fix
+ *  Description of Hpux_Stdint_Least_Fast fix
  */
-tSCC zHpux11_Extern_SendfileName[] =
-     "hpux11_extern_sendfile";
+tSCC zHpux_Stdint_Least_FastName[] =
+     "hpux_stdint_least_fast";
 
 /*
  *  File name selection pattern
  */
-tSCC zHpux11_Extern_SendfileList[] =
-  "sys/socket.h\0";
+tSCC zHpux_Stdint_Least_FastList[] =
+  "stdint-hpux11.h\0stdint.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzHpux11_Extern_SendfileMachs[] = {
-        "*-hp-hpux11.[12]*",
+tSCC* apzHpux_Stdint_Least_FastMachs[] = {
+        "*-hp-hpux11.2*",
         (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zHpux11_Extern_SendfileSelect0[] =
-       "^[ \t]*extern sbsize_t sendfile.*\n\
-.*, int\\)\\);\n";
+tSCC zHpux_Stdint_Least_FastSelect0[] =
+       "^[ \t]*#[ \t]*define[ \t]+UINT_(LEAST|FAST)64_MAX[ \t]+ULLONG_MAX";
 
-#define    HPUX11_EXTERN_SENDFILE_TEST_CT  1
-static tTestDesc aHpux11_Extern_SendfileTests[] = {
-  { TT_EGREP,    zHpux11_Extern_SendfileSelect0, (regex_t*)NULL }, };
+#define    HPUX_STDINT_LEAST_FAST_TEST_CT  1
+static tTestDesc aHpux_Stdint_Least_FastTests[] = {
+  { TT_EGREP,    zHpux_Stdint_Least_FastSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Hpux11_Extern_Sendfile
+ *  Fix Command Arguments for Hpux_Stdint_Least_Fast
  */
-static const char* apzHpux11_Extern_SendfilePatch[] = {
+static const char* apzHpux_Stdint_Least_FastPatch[] = {
     "format",
-    "#ifndef _APP32_64BIT_OFF_T\n\
-%0#endif\n",
+    "#  define\tUINT_%164_MAX\t__UINT64_MAX__",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Hpux11_Extern_Sendpath fix
+ *  Description of Hpux_Systime fix
  */
-tSCC zHpux11_Extern_SendpathName[] =
-     "hpux11_extern_sendpath";
+tSCC zHpux_SystimeName[] =
+     "hpux_systime";
 
 /*
  *  File name selection pattern
  */
-tSCC zHpux11_Extern_SendpathList[] =
-  "sys/socket.h\0";
+tSCC zHpux_SystimeList[] =
+  "sys/time.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzHpux11_Extern_SendpathMachs[] = {
-        "*-hp-hpux11.[12]*",
-        (const char*)NULL };
+#define apzHpux_SystimeMachs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zHpux11_Extern_SendpathSelect0[] =
-       "^[ \t]*extern sbsize_t sendpath.*\n\
-.*, int\\)\\);\n";
+tSCC zHpux_SystimeSelect0[] =
+       "^extern struct sigevent;";
 
-#define    HPUX11_EXTERN_SENDPATH_TEST_CT  1
-static tTestDesc aHpux11_Extern_SendpathTests[] = {
-  { TT_EGREP,    zHpux11_Extern_SendpathSelect0, (regex_t*)NULL }, };
+#define    HPUX_SYSTIME_TEST_CT  1
+static tTestDesc aHpux_SystimeTests[] = {
+  { TT_EGREP,    zHpux_SystimeSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Hpux11_Extern_Sendpath
+ *  Fix Command Arguments for Hpux_Systime
  */
-static const char* apzHpux11_Extern_SendpathPatch[] = {
+static const char* apzHpux_SystimePatch[] = {
     "format",
-    "#ifndef _APP32_64BIT_OFF_T\n\
-%0#endif\n",
+    "struct sigevent;",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Hpux_Extern_Errno fix
+ *  Description of Huge_Val_Hex fix
  */
-tSCC zHpux_Extern_ErrnoName[] =
-     "hpux_extern_errno";
+tSCC zHuge_Val_HexName[] =
+     "huge_val_hex";
 
 /*
  *  File name selection pattern
  */
-tSCC zHpux_Extern_ErrnoList[] =
-  "errno.h\0";
+tSCC zHuge_Val_HexList[] =
+  "bits/huge_val.h\0*/bits/huge_val.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzHpux_Extern_ErrnoMachs[] = {
-        "*-hp-hpux10.*",
-        "*-hp-hpux11.[0-2]*",
-        (const char*)NULL };
+#define apzHuge_Val_HexMachs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zHpux_Extern_ErrnoSelect0[] =
-       "^[ \t]*extern int errno;$";
+tSCC zHuge_Val_HexSelect0[] =
+       "^#[ \t]*define[ \t]*HUGE_VAL[ \t].*0x1\\.0p.*";
 
-#define    HPUX_EXTERN_ERRNO_TEST_CT  1
-static tTestDesc aHpux_Extern_ErrnoTests[] = {
-  { TT_EGREP,    zHpux_Extern_ErrnoSelect0, (regex_t*)NULL }, };
+/*
+ *  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 Hpux_Extern_Errno
+ *  Fix Command Arguments for Huge_Val_Hex
  */
-static const char* apzHpux_Extern_ErrnoPatch[] = {
+static const char* apzHuge_Val_HexPatch[] = {
     "format",
-    "#ifdef __cplusplus\n\
-extern \"C\" {\n\
-#endif\n\
-%0\n\
-#ifdef __cplusplus\n\
-}\n\
-#endif",
+    "#define HUGE_VAL (__builtin_huge_val())\n",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Hpux_Pthread_Initializers fix
+ *  Description of Huge_Valf_Hex fix
  */
-tSCC zHpux_Pthread_InitializersName[] =
-     "hpux_pthread_initializers";
+tSCC zHuge_Valf_HexName[] =
+     "huge_valf_hex";
 
 /*
  *  File name selection pattern
  */
-tSCC zHpux_Pthread_InitializersList[] =
-  "sys/pthread.h\0";
+tSCC zHuge_Valf_HexList[] =
+  "bits/huge_val.h\0*/bits/huge_val.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzHpux_Pthread_InitializersMachs[] = {
-        "*-hp-hpux11.[0-3]*",
-        (const char*)NULL };
-#define HPUX_PTHREAD_INITIALIZERS_TEST_CT  0
-#define aHpux_Pthread_InitializersTests   (tTestDesc*)NULL
+#define apzHuge_Valf_HexMachs (const char**)NULL
 
 /*
- *  Fix Command Arguments for Hpux_Pthread_Initializers
+ *  content selection pattern - do fix if pattern found
  */
-static const char* apzHpux_Pthread_InitializersPatch[] = { sed_cmd_z,
-    "-e", "s@^[ \t]*1, 1, 1, 1,[ \t]*\\\\@\t{ 1, 1, 1, 1 },\t\t\t\t\t\t\t\\\\@",
-    "-e", "s@^[ \t]*1,[ \t]*\\\\@\t{ 1, 0 }@",
-    "-e", "/^[ \t]*0$/d",
-    "-e", "s@__PTHREAD_MUTEX_VALID, 0@{ __PTHREAD_MUTEX_VALID, 0 }@",
-    "-e", "s@^[ \t]*0, 0, -1, 0,[ \t]*\\\\@\t{ 0, 0, -1, 0 },\t\t\t\t\t\t\\\\@",
-    "-e", "s@0, __LWP_MTX_VALID, 0, 1, 1, 1, 1,[ \t]*\\\\@{ 0, __LWP_MTX_VALID }, { 0, 1, 1, 1, 1 },\t\t\t\\\\@",
-    "-e", "s@^[ \t]*__LWP_MTX_VALID, 0, 1, 1, 1, 1,[ \t]*\\\\@\t{ 0, __LWP_MTX_VALID }, { 0, 1, 1, 1, 1 },\t\t\t\\\\@",
-    "-e", "s@^[ \t]*0, 0[ \t]*\\\\@\t{ 0, 0 }\t\t\t\t\t\t\t\\\\@",
-    "-e", "s@__PTHREAD_COND_VALID, 0@{ __PTHREAD_COND_VALID, 0 }@",
-    "-e", "s@__LWP_COND_VALID, 0,[ \t]*\\\\@{ __LWP_COND_VALID, 0 },\t\t\t\t\t\\\\@",
-    "-e", "s@__PTHREAD_RWLOCK_VALID, 0@{ __PTHREAD_RWLOCK_VALID, 0 }@",
-    "-e", "s@__LWP_RWLOCK_VALID, 0,[ \t]*\\\\@{ __LWP_RWLOCK_VALID, 0 },\t\t\t\t\t\\\\@",
-    "-e", "s@^[ \t]*0, 0, 0, 0, 0, 0, 0[ \t]*\\\\@\t{ 0, 0, 0, 0, 0 }, { 0, 0}\t\t\t\t\t\\\\@",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Hpux_C99_Intptr fix
- */
-tSCC zHpux_C99_IntptrName[] =
-     "hpux_c99_intptr";
-
-/*
- *  File name selection pattern
- */
-tSCC zHpux_C99_IntptrList[] =
-  "stdint-hpux11.h\0stdint.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-tSCC* apzHpux_C99_IntptrMachs[] = {
-        "*-hp-hpux11.3*",
-        (const char*)NULL };
-#define HPUX_C99_INTPTR_TEST_CT  0
-#define aHpux_C99_IntptrTests   (tTestDesc*)NULL
-
-/*
- *  Fix Command Arguments for Hpux_C99_Intptr
- */
-static const char* apzHpux_C99_IntptrPatch[] = { sed_cmd_z,
-    "-e", "s@^[ \t]*#[ \t]*define[ \t]*PTRDIFF_MAX[ \t]*INT32_MAX[ \t]*$@#define PTRDIFF_MAX (2147483647l)@",
-    "-e", "s@^[ \t]*#[ \t]*define[ \t]*PTRDIFF_MIN[ \t]*INT32_MIN[ \t]*$@#define PTRDIFF_MIN (-PTRDIFF_MAX - 1)@",
-    "-e", "s@^[ \t]*#[ \t]*define[ \t]*INTPTR_MAX[ \t]*INT32_MAX[ \t]*$@#define INTPTR_MAX (2147483647l)@",
-    "-e", "s@^[ \t]*#[ \t]*define[ \t]*INTPTR_MIN[ \t]*INT32_MIN[ \t]*$@#define INTPTR_MIN (-INTPTR_MAX - 1)@",
-    "-e", "s@^[ \t]*#[ \t]*define[ \t]*UINTPTR_MAX[ \t]*UINT32_MAX[ \t]*$@#define UINTPTR_MAX (4294967295ul)@",
-    "-e", "s@^[ \t]*#[ \t]*define[ \t]*SIZE_MAX[ \t]*UINT32_MAX[ \t]*$@#define SIZE_MAX (4294967295ul)@",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Hpux_C99_Inttypes fix
- */
-tSCC zHpux_C99_InttypesName[] =
-     "hpux_c99_inttypes";
-
-/*
- *  File name selection pattern
- */
-tSCC zHpux_C99_InttypesList[] =
-  "inttypes.h\0stdint-hpux11.h\0stdint.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-tSCC* apzHpux_C99_InttypesMachs[] = {
-        "*-hp-hpux11.[23]*",
-        (const char*)NULL };
-#define HPUX_C99_INTTYPES_TEST_CT  0
-#define aHpux_C99_InttypesTests   (tTestDesc*)NULL
-
-/*
- *  Fix Command Arguments for Hpux_C99_Inttypes
- */
-static const char* apzHpux_C99_InttypesPatch[] = { sed_cmd_z,
-    "-e", "s@^[ \t]*#[ \t]*define[ \t]*UINT8_C(__c)[ \t]*__CONCAT_U__(__c)[ \t]*$@#define UINT8_C(__c) (__c)@",
-    "-e", "s@^[ \t]*#[ \t]*define[ \t]*UINT16_C(__c)[ \t]*__CONCAT_U__(__c)[ \t]*$@#define UINT16_C(__c) (__c)@",
-    "-e", "s@^[ \t]*#[ \t]*define[ \t]*INT32_C(__c)[ \t]*__CONCAT__(__c,l)[ \t]*$@#define INT32_C(__c) (__c)@",
-    "-e", "s@^[ \t]*#[ \t]*define[ \t]*UINT32_C(__c)[ \t].*$@#define UINT32_C(__c) __CONCAT__(__c,u)@",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Hpux_C99_Inttypes2 fix
- */
-tSCC zHpux_C99_Inttypes2Name[] =
-     "hpux_c99_inttypes2";
-
-/*
- *  File name selection pattern
- */
-tSCC zHpux_C99_Inttypes2List[] =
-  "stdint-hpux11.h\0stdint.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-tSCC* apzHpux_C99_Inttypes2Machs[] = {
-        "*-hp-hpux11.2*",
-        (const char*)NULL };
-#define HPUX_C99_INTTYPES2_TEST_CT  0
-#define aHpux_C99_Inttypes2Tests   (tTestDesc*)NULL
-
-/*
- *  Fix Command Arguments for Hpux_C99_Inttypes2
- */
-static const char* apzHpux_C99_Inttypes2Patch[] = { sed_cmd_z,
-    "-e", "s@^[ \t]*#[ \t]*define[ \t]*INT8_C(__c)[ \t]*((signed char)(__c))[ \t]*$@#define INT8_C(__c) (__c)@",
-    "-e", "s@^[ \t]*#[ \t]*define[ \t]*UINT8_C(__c)[ \t]*((unsigned char)(__c))[ \t]*$@#define UINT8_C(__c) (__c)@",
-    "-e", "s@^[ \t]*#[ \t]*define[ \t]*INT16_C(__c)[ \t]*((short)(__c))[ \t]*$@#define INT16_C(__c) (__c)@",
-    "-e", "s@^[ \t]*#[ \t]*define[ \t]*UINT16_C(__c)[ \t]*((unsigned short)(__c))[ \t]*$@#define UINT16_C(__c) (__c)@",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Hpux_Stdint_Least_Fast fix
- */
-tSCC zHpux_Stdint_Least_FastName[] =
-     "hpux_stdint_least_fast";
-
-/*
- *  File name selection pattern
- */
-tSCC zHpux_Stdint_Least_FastList[] =
-  "stdint-hpux11.h\0stdint.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-tSCC* apzHpux_Stdint_Least_FastMachs[] = {
-        "*-hp-hpux11.2*",
-        (const char*)NULL };
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zHpux_Stdint_Least_FastSelect0[] =
-       "^[ \t]*#[ \t]*define[ \t]+UINT_(LEAST|FAST)64_MAX[ \t]+ULLONG_MAX";
-
-#define    HPUX_STDINT_LEAST_FAST_TEST_CT  1
-static tTestDesc aHpux_Stdint_Least_FastTests[] = {
-  { TT_EGREP,    zHpux_Stdint_Least_FastSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Hpux_Stdint_Least_Fast
- */
-static const char* apzHpux_Stdint_Least_FastPatch[] = {
-    "format",
-    "#  define\tUINT_%164_MAX\t__UINT64_MAX__",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Hpux_Inttype_Int8_T fix
- */
-tSCC zHpux_Inttype_Int8_TName[] =
-     "hpux_inttype_int8_t";
-
-/*
- *  File name selection pattern
- */
-tSCC zHpux_Inttype_Int8_TList[] =
-  "sys/_inttypes.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-tSCC* apzHpux_Inttype_Int8_TMachs[] = {
-        "*-hp-hpux1[01].*",
-        (const char*)NULL };
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zHpux_Inttype_Int8_TSelect0[] =
-       "^[ \t]*typedef[ \t]*char[ \t]*int(_least){0,1}8_t.*";
-
-#define    HPUX_INTTYPE_INT8_T_TEST_CT  1
-static tTestDesc aHpux_Inttype_Int8_TTests[] = {
-  { TT_EGREP,    zHpux_Inttype_Int8_TSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Hpux_Inttype_Int8_T
- */
-static const char* apzHpux_Inttype_Int8_TPatch[] = {
-    "format",
-    "typedef signed char int%18_t;",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  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.*";
+tSCC zHuge_Valf_HexSelect0[] =
+       "^#[ \t]*define[ \t]*HUGE_VALF[ \t].*0x1\\.0p.*";
 
 /*
  *  content bypass pattern - skip fix if pattern found
@@ -4139,7 +4742,7 @@ tSCC zHuge_Vall_HexName[] =
  *  File name selection pattern
  */
 tSCC zHuge_Vall_HexList[] =
-  "bits/huge_val.h\0";
+  "bits/huge_val.h\0*/bits/huge_val.h\0";
 /*
  *  Machine/OS name selection pattern
  */
@@ -4626,7 +5229,9 @@ tSCC zMath_ExceptionList[] =
 /*
  *  Machine/OS name selection pattern
  */
-#define apzMath_ExceptionMachs (const char**)NULL
+tSCC* apzMath_ExceptionMachs[] = {
+        "*-*-solaris2.1[0-9]*",
+        (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
@@ -5750,835 +6355,662 @@ static tTestDesc aSolaris_Cxx_LinkageTests[] = {
   { TT_EGREP,    zSolaris_Cxx_LinkageSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Solaris_Cxx_Linkage
- */
-static const char* apzSolaris_Cxx_LinkagePatch[] = {
-    "format",
-    "%1 && !__GNUG__\n\
-%2%3",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Solaris_Getc_Strict_Stdc fix
- */
-tSCC zSolaris_Getc_Strict_StdcName[] =
-     "solaris_getc_strict_stdc";
-
-/*
- *  File name selection pattern
- */
-tSCC zSolaris_Getc_Strict_StdcList[] =
-  "iso/stdio_iso.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-tSCC* apzSolaris_Getc_Strict_StdcMachs[] = {
-        "*-*-solaris2*",
-        (const char*)NULL };
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zSolaris_Getc_Strict_StdcSelect0[] =
-       "(.*&& )!defined\\(_STRICT_STDC\\)(.*)";
-
-#define    SOLARIS_GETC_STRICT_STDC_TEST_CT  1
-static tTestDesc aSolaris_Getc_Strict_StdcTests[] = {
-  { TT_EGREP,    zSolaris_Getc_Strict_StdcSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Solaris_Getc_Strict_Stdc
- */
-static const char* apzSolaris_Getc_Strict_StdcPatch[] = {
-    "format",
-    "%1(!defined(_STRICT_STDC) || (__cplusplus >= 199711L))%2",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Solaris_Longjmp_Noreturn fix
- */
-tSCC zSolaris_Longjmp_NoreturnName[] =
-     "solaris_longjmp_noreturn";
-
-/*
- *  File name selection pattern
- */
-tSCC zSolaris_Longjmp_NoreturnList[] =
-  "iso/setjmp_iso.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-tSCC* apzSolaris_Longjmp_NoreturnMachs[] = {
-        "*-*-solaris2*",
-        (const char*)NULL };
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zSolaris_Longjmp_NoreturnSelect0[] =
-       "(.*longjmp\\(jmp_buf.*[^)]+\\));";
-
-/*
- *  content bypass pattern - skip fix if pattern found
- */
-tSCC zSolaris_Longjmp_NoreturnBypass0[] =
-       "__NORETURN";
-
-#define    SOLARIS_LONGJMP_NORETURN_TEST_CT  2
-static tTestDesc aSolaris_Longjmp_NoreturnTests[] = {
-  { TT_NEGREP,   zSolaris_Longjmp_NoreturnBypass0, (regex_t*)NULL },
-  { TT_EGREP,    zSolaris_Longjmp_NoreturnSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Solaris_Longjmp_Noreturn
- */
-static const char* apzSolaris_Longjmp_NoreturnPatch[] = {
-    "format",
-    "%1 __attribute__ ((__noreturn__));",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Solaris_Math_1 fix
- */
-tSCC zSolaris_Math_1Name[] =
-     "solaris_math_1";
-
-/*
- *  File name selection pattern
- */
-tSCC zSolaris_Math_1List[] =
-  "iso/math_c99.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-#define apzSolaris_Math_1Machs (const char**)NULL
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zSolaris_Math_1Select0[] =
-       "@\\(#\\)math_c99.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
-
-/*
- *  content bypass pattern - skip fix if pattern found
- */
-tSCC zSolaris_Math_1Bypass0[] =
-       "__GNUC__";
-
-#define    SOLARIS_MATH_1_TEST_CT  2
-static tTestDesc aSolaris_Math_1Tests[] = {
-  { TT_NEGREP,   zSolaris_Math_1Bypass0, (regex_t*)NULL },
-  { TT_EGREP,    zSolaris_Math_1Select0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Solaris_Math_1
- */
-static const char* apzSolaris_Math_1Patch[] = {
-    "format",
-    "#define\tHUGE_VA%1\t(__builtin_huge_va%2())",
-    "^#define[ \t]+HUGE_VA([LF]+)[ \t]+__builtin_huge_va([lf]+)",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Solaris_Math_2 fix
- */
-tSCC zSolaris_Math_2Name[] =
-     "solaris_math_2";
-
-/*
- *  File name selection pattern
- */
-tSCC zSolaris_Math_2List[] =
-  "iso/math_c99.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-#define apzSolaris_Math_2Machs (const char**)NULL
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zSolaris_Math_2Select0[] =
-       "@\\(#\\)math_c99.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
-
-/*
- *  content bypass pattern - skip fix if pattern found
- */
-tSCC zSolaris_Math_2Bypass0[] =
-       "__GNUC__";
-
-#define    SOLARIS_MATH_2_TEST_CT  2
-static tTestDesc aSolaris_Math_2Tests[] = {
-  { TT_NEGREP,   zSolaris_Math_2Bypass0, (regex_t*)NULL },
-  { TT_EGREP,    zSolaris_Math_2Select0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Solaris_Math_2
+ *  Fix Command Arguments for Solaris_Cxx_Linkage
  */
-static const char* apzSolaris_Math_2Patch[] = {
+static const char* apzSolaris_Cxx_LinkagePatch[] = {
     "format",
-    "#define\tINFINITY\t(__builtin_inff())",
-    "^#define[ \t]+INFINITY[ \t]+__builtin_infinity",
+    "%1 && !__GNUG__\n\
+%2%3",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Solaris_Math_3 fix
+ *  Description of Solaris_Getc_Strict_Stdc fix
  */
-tSCC zSolaris_Math_3Name[] =
-     "solaris_math_3";
+tSCC zSolaris_Getc_Strict_StdcName[] =
+     "solaris_getc_strict_stdc";
 
 /*
  *  File name selection pattern
  */
-tSCC zSolaris_Math_3List[] =
-  "iso/math_c99.h\0";
+tSCC zSolaris_Getc_Strict_StdcList[] =
+  "iso/stdio_iso.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzSolaris_Math_3Machs (const char**)NULL
+tSCC* apzSolaris_Getc_Strict_StdcMachs[] = {
+        "*-*-solaris2*",
+        (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zSolaris_Math_3Select0[] =
-       "@\\(#\\)math_c99.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
-
-/*
- *  content bypass pattern - skip fix if pattern found
- */
-tSCC zSolaris_Math_3Bypass0[] =
-       "__GNUC__";
+tSCC zSolaris_Getc_Strict_StdcSelect0[] =
+       "(.*&& )!defined\\(_STRICT_STDC\\)(.*)";
 
-#define    SOLARIS_MATH_3_TEST_CT  2
-static tTestDesc aSolaris_Math_3Tests[] = {
-  { TT_NEGREP,   zSolaris_Math_3Bypass0, (regex_t*)NULL },
-  { TT_EGREP,    zSolaris_Math_3Select0, (regex_t*)NULL }, };
+#define    SOLARIS_GETC_STRICT_STDC_TEST_CT  1
+static tTestDesc aSolaris_Getc_Strict_StdcTests[] = {
+  { TT_EGREP,    zSolaris_Getc_Strict_StdcSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Solaris_Math_3
+ *  Fix Command Arguments for Solaris_Getc_Strict_Stdc
  */
-static const char* apzSolaris_Math_3Patch[] = {
+static const char* apzSolaris_Getc_Strict_StdcPatch[] = {
     "format",
-    "#define\tNAN\t\t(__builtin_nanf(\"\"))",
-    "^#define[ \t]+NAN[ \t]+__builtin_nan",
+    "%1(!defined(_STRICT_STDC) || (__cplusplus >= 199711L))%2",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Solaris_Math_4 fix
+ *  Description of Solaris_Int_Const fix
  */
-tSCC zSolaris_Math_4Name[] =
-     "solaris_math_4";
+tSCC zSolaris_Int_ConstName[] =
+     "solaris_int_const";
 
 /*
  *  File name selection pattern
  */
-tSCC zSolaris_Math_4List[] =
-  "iso/math_c99.h\0";
+tSCC zSolaris_Int_ConstList[] =
+  "sys/int_const.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzSolaris_Math_4Machs (const char**)NULL
+tSCC* apzSolaris_Int_ConstMachs[] = {
+        "*-*-solaris2*",
+        (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zSolaris_Math_4Select0[] =
-       "@\\(#\\)math_c99.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
-
-/*
- *  content bypass pattern - skip fix if pattern found
- */
-tSCC zSolaris_Math_4Bypass0[] =
-       "__GNUC__";
+tSCC zSolaris_Int_ConstSelect0[] =
+       "^#define[ \t]+UINT8_C\\(c\\)[ \t]+__CONCAT__.*\n\
+(/*.**/)\n\
+#define[ \t]+UINT16_C\\(c\\)[ \t]+__CONCAT__.*";
 
-#define    SOLARIS_MATH_4_TEST_CT  2
-static tTestDesc aSolaris_Math_4Tests[] = {
-  { TT_NEGREP,   zSolaris_Math_4Bypass0, (regex_t*)NULL },
-  { TT_EGREP,    zSolaris_Math_4Select0, (regex_t*)NULL }, };
+#define    SOLARIS_INT_CONST_TEST_CT  1
+static tTestDesc aSolaris_Int_ConstTests[] = {
+  { TT_EGREP,    zSolaris_Int_ConstSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Solaris_Math_4
+ *  Fix Command Arguments for Solaris_Int_Const
  */
-static const char* apzSolaris_Math_4Patch[] = {
+static const char* apzSolaris_Int_ConstPatch[] = {
     "format",
-    "#define\tfpclassify(x) \\\n\
-  __builtin_fpclassify(FP_NAN, FP_INFINITE, FP_NORMAL, FP_SUBNORMAL, FP_ZERO, (x))",
-    "^#define[ \t]+fpclassify\\(x\\)[ \t]+__builtin_fpclassify\\(x\\)",
+    "#define\tUINT8_C(c)\t(c)\n\
+%1\n\
+#define\tUINT16_C(c)\t(c)",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Solaris_Math_8 fix
+ *  Description of Solaris_Int_Limits_1 fix
  */
-tSCC zSolaris_Math_8Name[] =
-     "solaris_math_8";
+tSCC zSolaris_Int_Limits_1Name[] =
+     "solaris_int_limits_1";
 
 /*
  *  File name selection pattern
  */
-tSCC zSolaris_Math_8List[] =
-  "iso/math_c99.h\0";
+tSCC zSolaris_Int_Limits_1List[] =
+  "sys/int_limits.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzSolaris_Math_8Machs (const char**)NULL
+tSCC* apzSolaris_Int_Limits_1Machs[] = {
+        "*-*-solaris2*",
+        (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zSolaris_Math_8Select0[] =
-       "@\\(#\\)math_c99\\.h[ \t]+1\\.[0-9]+[ \t]+[0-9/]+ SMI";
-
-/*
- *  content bypass pattern - skip fix if pattern found
- */
-tSCC zSolaris_Math_8Bypass0[] =
-       "__GNUC__";
+tSCC zSolaris_Int_Limits_1Select0[] =
+       "^#define[ \t]+UINT8_MAX[ \t]+\\(255U\\)\n\
+#define[ \t]+UINT16_MAX[ \t]+\\(65535U\\)";
 
-#define    SOLARIS_MATH_8_TEST_CT  2
-static tTestDesc aSolaris_Math_8Tests[] = {
-  { TT_NEGREP,   zSolaris_Math_8Bypass0, (regex_t*)NULL },
-  { TT_EGREP,    zSolaris_Math_8Select0, (regex_t*)NULL }, };
+#define    SOLARIS_INT_LIMITS_1_TEST_CT  1
+static tTestDesc aSolaris_Int_Limits_1Tests[] = {
+  { TT_EGREP,    zSolaris_Int_Limits_1Select0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Solaris_Math_8
+ *  Fix Command Arguments for Solaris_Int_Limits_1
  */
-static const char* apzSolaris_Math_8Patch[] = {
+static const char* apzSolaris_Int_Limits_1Patch[] = {
     "format",
-    "#define\tsignbit(x)\t(sizeof(x) == sizeof(float) \\\n\
-\t\t\t   ? __builtin_signbitf(x) \\\n\
-\t\t\t   : sizeof(x) == sizeof(long double) \\\n\
-\t\t\t     ? __builtin_signbitl(x) \\\n\
-\t\t\t     : __builtin_signbit(x))",
-    "^#define[ \t]+signbit\\(x\\)[ \t]+__builtin_signbit\\(x\\)",
+    "#define\tUINT8_MAX\t(255)\n\
+#define\tUINT16_MAX\t(65535)",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Solaris_Math_9 fix
+ *  Description of Solaris_Int_Limits_2 fix
  */
-tSCC zSolaris_Math_9Name[] =
-     "solaris_math_9";
+tSCC zSolaris_Int_Limits_2Name[] =
+     "solaris_int_limits_2";
 
 /*
  *  File name selection pattern
  */
-tSCC zSolaris_Math_9List[] =
-  "iso/math_c99.h\0";
+tSCC zSolaris_Int_Limits_2List[] =
+  "sys/int_limits.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzSolaris_Math_9Machs (const char**)NULL
+tSCC* apzSolaris_Int_Limits_2Machs[] = {
+        "*-*-solaris2*",
+        (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zSolaris_Math_9Select0[] =
-       "@\\(#\\)math_c99.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
-
-/*
- *  content bypass pattern - skip fix if pattern found
- */
-tSCC zSolaris_Math_9Bypass0[] =
-       "__GNUC__";
+tSCC zSolaris_Int_Limits_2Select0[] =
+       "^#define[ \t]+(INT|UINT)_FAST16_(MAX|MIN)[ \t](INT|UINT)16.*";
 
-#define    SOLARIS_MATH_9_TEST_CT  2
-static tTestDesc aSolaris_Math_9Tests[] = {
-  { TT_NEGREP,   zSolaris_Math_9Bypass0, (regex_t*)NULL },
-  { TT_EGREP,    zSolaris_Math_9Select0, (regex_t*)NULL }, };
+#define    SOLARIS_INT_LIMITS_2_TEST_CT  1
+static tTestDesc aSolaris_Int_Limits_2Tests[] = {
+  { TT_EGREP,    zSolaris_Int_Limits_2Select0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Solaris_Math_9
+ *  Fix Command Arguments for Solaris_Int_Limits_2
  */
-static const char* apzSolaris_Math_9Patch[] = {
+static const char* apzSolaris_Int_Limits_2Patch[] = {
     "format",
-    "#define\t%1(x, y)%2__builtin_%1(x, y)",
-    "^#define[ \t]+([a-z]+)\\(x, y\\)([ \t]+)\\(\\(x\\) __builtin_[a-z]+\\(y\\)\\)",
+    "#define\t%1_FAST16_%2 %132_%2",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Solaris_Math_10 fix
+ *  Description of Solaris_Int_Limits_3 fix
  */
-tSCC zSolaris_Math_10Name[] =
-     "solaris_math_10";
+tSCC zSolaris_Int_Limits_3Name[] =
+     "solaris_int_limits_3";
 
 /*
  *  File name selection pattern
  */
-tSCC zSolaris_Math_10List[] =
-  "iso/math_c99.h\0";
+tSCC zSolaris_Int_Limits_3List[] =
+  "sys/int_limits.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzSolaris_Math_10Machs (const char**)NULL
+tSCC* apzSolaris_Int_Limits_3Machs[] = {
+        "*-*-solaris2*",
+        (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zSolaris_Math_10Select0[] =
-       "@\\(#\\)math_c99.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
+tSCC zSolaris_Int_Limits_3Select0[] =
+       "^#define[ \t]+SIZE_MAX[ \t]+4294967295UL";
 
-#define    SOLARIS_MATH_10_TEST_CT  1
-static tTestDesc aSolaris_Math_10Tests[] = {
-  { TT_EGREP,    zSolaris_Math_10Select0, (regex_t*)NULL }, };
+#define    SOLARIS_INT_LIMITS_3_TEST_CT  1
+static tTestDesc aSolaris_Int_Limits_3Tests[] = {
+  { TT_EGREP,    zSolaris_Int_Limits_3Select0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Solaris_Math_10
+ *  Fix Command Arguments for Solaris_Int_Limits_3
  */
-static const char* apzSolaris_Math_10Patch[] = {
+static const char* apzSolaris_Int_Limits_3Patch[] = {
     "format",
-    "#define\tisinf(x) __builtin_isinf(x)",
-    "^#define[ \t]+isinf\\(x\\)[ \t]+__extension__\\([ \t]*\\\\\n\
-[ \t]*\\{[ \t]*__typeof\\(x\\)[ \t]*__x_i[ \t]*=[ \t]*\\(x\\);[ \t]*\\\\\n\
-[ \t]*__x_i[ \t]*==[ \t]*\\(__typeof\\(__x_i\\)\\)[ \t]*INFINITY[ \t]*\\|\\|[ \t]*\\\\\n\
-[ \t]*__x_i[ \t]*==[ \t]*\\(__typeof\\(__x_i\\)\\)[ \t]*\\(-INFINITY\\);[ \t]*\\}\\)",
+    "#define\tSIZE_MAX\t4294967295U",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Solaris_Mutex_Init_2 fix
+ *  Description of Solaris_Math_1 fix
  */
-tSCC zSolaris_Mutex_Init_2Name[] =
-     "solaris_mutex_init_2";
+tSCC zSolaris_Math_1Name[] =
+     "solaris_math_1";
 
 /*
  *  File name selection pattern
  */
-tSCC zSolaris_Mutex_Init_2List[] =
-  "pthread.h\0";
+tSCC zSolaris_Math_1List[] =
+  "iso/math_c99.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzSolaris_Mutex_Init_2Machs[] = {
-        "*-*-solaris2.[0-9]",
-        "*-*-solaris2.[0-9][!0-9]*",
-        (const char*)NULL };
+#define apzSolaris_Math_1Machs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zSolaris_Mutex_Init_2Select0[] =
-       "@\\(#\\)pthread.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
+tSCC zSolaris_Math_1Select0[] =
+       "@\\(#\\)math_c99.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
+
+/*
+ *  content bypass pattern - skip fix if pattern found
+ */
+tSCC zSolaris_Math_1Bypass0[] =
+       "__GNUC__";
 
-#define    SOLARIS_MUTEX_INIT_2_TEST_CT  1
-static tTestDesc aSolaris_Mutex_Init_2Tests[] = {
-  { TT_EGREP,    zSolaris_Mutex_Init_2Select0, (regex_t*)NULL }, };
+#define    SOLARIS_MATH_1_TEST_CT  2
+static tTestDesc aSolaris_Math_1Tests[] = {
+  { TT_NEGREP,   zSolaris_Math_1Bypass0, (regex_t*)NULL },
+  { TT_EGREP,    zSolaris_Math_1Select0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Solaris_Mutex_Init_2
+ *  Fix Command Arguments for Solaris_Math_1
  */
-static const char* apzSolaris_Mutex_Init_2Patch[] = {
+static const char* apzSolaris_Math_1Patch[] = {
     "format",
-    "#if __STDC__ - 0 == 0 && !defined(_NO_LONGLONG)\n\
-%0\n\
-#else\n\
-%1, {0}}%4\n\
-#endif",
-    "(^#define[ \t]+PTHREAD_(MUTEX|COND)_INITIALIZER[ \t]+(|/*.**/[ \t]*\\\\\n\
-[ \t]*)\\{.*),[ \t]*0\\}(|[ \t].*)$",
+    "#define\tHUGE_VA%1\t(__builtin_huge_va%2())",
+    "^#define[ \t]+HUGE_VA([LF]+)[ \t]+__builtin_huge_va([lf]+)",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Solaris_Pow_Int_Overload fix
+ *  Description of Solaris_Math_10 fix
  */
-tSCC zSolaris_Pow_Int_OverloadName[] =
-     "solaris_pow_int_overload";
+tSCC zSolaris_Math_10Name[] =
+     "solaris_math_10";
 
 /*
  *  File name selection pattern
  */
-tSCC zSolaris_Pow_Int_OverloadList[] =
-  "iso/math_iso.h\0";
+tSCC zSolaris_Math_10List[] =
+  "iso/math_c99.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzSolaris_Pow_Int_OverloadMachs[] = {
-        "*-*-solaris2*",
-        (const char*)NULL };
+#define apzSolaris_Math_10Machs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zSolaris_Pow_Int_OverloadSelect0[] =
-       "^[ \t]*inline [a-z ]* pow\\([^()]*, int [^()]*\\) *\\{[^{}]*\n\
-[^{}]*\\}";
-
-#define    SOLARIS_POW_INT_OVERLOAD_TEST_CT  1
-static tTestDesc aSolaris_Pow_Int_OverloadTests[] = {
-  { TT_EGREP,    zSolaris_Pow_Int_OverloadSelect0, (regex_t*)NULL }, };
+tSCC zSolaris_Math_10Select0[] =
+       "@\\(#\\)math_c99.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
+
+#define    SOLARIS_MATH_10_TEST_CT  1
+static tTestDesc aSolaris_Math_10Tests[] = {
+  { TT_EGREP,    zSolaris_Math_10Select0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Solaris_Pow_Int_Overload
+ *  Fix Command Arguments for Solaris_Math_10
  */
-static const char* apzSolaris_Pow_Int_OverloadPatch[] = {
+static const char* apzSolaris_Math_10Patch[] = {
     "format",
-    "#ifndef __GXX_EXPERIMENTAL_CXX0X__\n\
-%0\n\
-#endif",
+    "#define\tisinf(x) __builtin_isinf(x)",
+    "^#define[ \t]+isinf\\(x\\)[ \t]+__extension__\\([ \t]*\\\\\n\
+[ \t]*\\{[ \t]*__typeof\\(x\\)[ \t]*__x_i[ \t]*=[ \t]*\\(x\\);[ \t]*\\\\\n\
+[ \t]*__x_i[ \t]*==[ \t]*\\(__typeof\\(__x_i\\)\\)[ \t]*INFINITY[ \t]*\\|\\|[ \t]*\\\\\n\
+[ \t]*__x_i[ \t]*==[ \t]*\\(__typeof\\(__x_i\\)\\)[ \t]*\\(-INFINITY\\);[ \t]*\\}\\)",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Solaris_Rwlock_Init_1 fix
+ *  Description of Solaris_Math_2 fix
  */
-tSCC zSolaris_Rwlock_Init_1Name[] =
-     "solaris_rwlock_init_1";
+tSCC zSolaris_Math_2Name[] =
+     "solaris_math_2";
 
 /*
  *  File name selection pattern
  */
-tSCC zSolaris_Rwlock_Init_1List[] =
-  "pthread.h\0";
+tSCC zSolaris_Math_2List[] =
+  "iso/math_c99.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzSolaris_Rwlock_Init_1Machs[] = {
-        "*-*-solaris*",
-        (const char*)NULL };
+#define apzSolaris_Math_2Machs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zSolaris_Rwlock_Init_1Select0[] =
-       "@\\(#\\)pthread.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
+tSCC zSolaris_Math_2Select0[] =
+       "@\\(#\\)math_c99.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
 
-#define    SOLARIS_RWLOCK_INIT_1_TEST_CT  1
-static tTestDesc aSolaris_Rwlock_Init_1Tests[] = {
-  { TT_EGREP,    zSolaris_Rwlock_Init_1Select0, (regex_t*)NULL }, };
+/*
+ *  content bypass pattern - skip fix if pattern found
+ */
+tSCC zSolaris_Math_2Bypass0[] =
+       "__GNUC__";
+
+#define    SOLARIS_MATH_2_TEST_CT  2
+static tTestDesc aSolaris_Math_2Tests[] = {
+  { TT_NEGREP,   zSolaris_Math_2Bypass0, (regex_t*)NULL },
+  { TT_EGREP,    zSolaris_Math_2Select0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Solaris_Rwlock_Init_1
+ *  Fix Command Arguments for Solaris_Math_2
  */
-static const char* apzSolaris_Rwlock_Init_1Patch[] = {
+static const char* apzSolaris_Math_2Patch[] = {
     "format",
-    "#if __STDC__ - 0 == 0 && !defined(_NO_LONGLONG)\n\
-%0\n\
-#else\n\
-%1{0, 0, 0, {{0}, {0}, {0}}, {{0}, {0}}, {{0}, {0}}}\n\
-#endif",
-    "(^#define[ \t]+PTHREAD_RWLOCK_INITIALIZER[ \t]+)\\{0, 0, 0, \\{0, 0, 0\\}, \\{0, 0\\}, \\{0, 0\\}\\}[ \t]*$",
+    "#define\tINFINITY\t(__builtin_inff())",
+    "^#define[ \t]+INFINITY[ \t]+__builtin_infinity",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Solaris_Once_Init_1 fix
+ *  Description of Solaris_Math_3 fix
  */
-tSCC zSolaris_Once_Init_1Name[] =
-     "solaris_once_init_1";
+tSCC zSolaris_Math_3Name[] =
+     "solaris_math_3";
 
 /*
  *  File name selection pattern
  */
-tSCC zSolaris_Once_Init_1List[] =
-  "pthread.h\0";
+tSCC zSolaris_Math_3List[] =
+  "iso/math_c99.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzSolaris_Once_Init_1Machs[] = {
-        "*-*-solaris*",
-        (const char*)NULL };
+#define apzSolaris_Math_3Machs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zSolaris_Once_Init_1Select0[] =
-       "@\\(#\\)pthread.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
+tSCC zSolaris_Math_3Select0[] =
+       "@\\(#\\)math_c99.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
 
-#define    SOLARIS_ONCE_INIT_1_TEST_CT  1
-static tTestDesc aSolaris_Once_Init_1Tests[] = {
-  { TT_EGREP,    zSolaris_Once_Init_1Select0, (regex_t*)NULL }, };
+/*
+ *  content bypass pattern - skip fix if pattern found
+ */
+tSCC zSolaris_Math_3Bypass0[] =
+       "__GNUC__";
+
+#define    SOLARIS_MATH_3_TEST_CT  2
+static tTestDesc aSolaris_Math_3Tests[] = {
+  { TT_NEGREP,   zSolaris_Math_3Bypass0, (regex_t*)NULL },
+  { TT_EGREP,    zSolaris_Math_3Select0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Solaris_Once_Init_1
+ *  Fix Command Arguments for Solaris_Math_3
  */
-static const char* apzSolaris_Once_Init_1Patch[] = {
+static const char* apzSolaris_Math_3Patch[] = {
     "format",
-    "%1{%2}%3",
-    "(^#define[ \t]+PTHREAD_ONCE_INIT[ \t]+\\{)([^}]+)(\\})[ \t]*$",
+    "#define\tNAN\t\t(__builtin_nanf(\"\"))",
+    "^#define[ \t]+NAN[ \t]+__builtin_nan",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Solaris_Once_Init_2 fix
+ *  Description of Solaris_Math_4 fix
  */
-tSCC zSolaris_Once_Init_2Name[] =
-     "solaris_once_init_2";
+tSCC zSolaris_Math_4Name[] =
+     "solaris_math_4";
 
 /*
  *  File name selection pattern
  */
-tSCC zSolaris_Once_Init_2List[] =
-  "pthread.h\0";
+tSCC zSolaris_Math_4List[] =
+  "iso/math_c99.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzSolaris_Once_Init_2Machs[] = {
-        "*-*-solaris2.[0-9]",
-        "*-*-solaris2.[0-9][!0-9]*",
-        (const char*)NULL };
+#define apzSolaris_Math_4Machs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zSolaris_Once_Init_2Select0[] =
-       "@\\(#\\)pthread.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
+tSCC zSolaris_Math_4Select0[] =
+       "@\\(#\\)math_c99.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
+
+/*
+ *  content bypass pattern - skip fix if pattern found
+ */
+tSCC zSolaris_Math_4Bypass0[] =
+       "__GNUC__";
 
-#define    SOLARIS_ONCE_INIT_2_TEST_CT  1
-static tTestDesc aSolaris_Once_Init_2Tests[] = {
-  { TT_EGREP,    zSolaris_Once_Init_2Select0, (regex_t*)NULL }, };
+#define    SOLARIS_MATH_4_TEST_CT  2
+static tTestDesc aSolaris_Math_4Tests[] = {
+  { TT_NEGREP,   zSolaris_Math_4Bypass0, (regex_t*)NULL },
+  { TT_EGREP,    zSolaris_Math_4Select0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Solaris_Once_Init_2
+ *  Fix Command Arguments for Solaris_Math_4
  */
-static const char* apzSolaris_Once_Init_2Patch[] = {
+static const char* apzSolaris_Math_4Patch[] = {
     "format",
-    "#if __STDC__ - 0 == 0 && !defined(_NO_LONGLONG)\n\
-%0\n\
-#else\n\
-%1{0}, {0}, {0}, {%3}%4\n\
-#endif",
-    "(^#define[ \t]+PTHREAD_ONCE_INIT[ \t]+\\{\\{)(0, 0, 0, )(PTHREAD_[A-Z_]+)(\\}\\})[ \t]*$",
+    "#define\tfpclassify(x) \\\n\
+  __builtin_fpclassify(FP_NAN, FP_INFINITE, FP_NORMAL, FP_SUBNORMAL, FP_ZERO, (x))",
+    "^#define[ \t]+fpclassify\\(x\\)[ \t]+__builtin_fpclassify\\(x\\)",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Solaris_Int_Const fix
+ *  Description of Solaris_Math_8 fix
  */
-tSCC zSolaris_Int_ConstName[] =
-     "solaris_int_const";
+tSCC zSolaris_Math_8Name[] =
+     "solaris_math_8";
 
 /*
  *  File name selection pattern
  */
-tSCC zSolaris_Int_ConstList[] =
-  "sys/int_const.h\0";
+tSCC zSolaris_Math_8List[] =
+  "iso/math_c99.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzSolaris_Int_ConstMachs[] = {
-        "*-*-solaris2*",
-        (const char*)NULL };
+#define apzSolaris_Math_8Machs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zSolaris_Int_ConstSelect0[] =
-       "^#define[ \t]+UINT8_C\\(c\\)[ \t]+__CONCAT__.*\n\
-(/*.**/)\n\
-#define[ \t]+UINT16_C\\(c\\)[ \t]+__CONCAT__.*";
+tSCC zSolaris_Math_8Select0[] =
+       "@\\(#\\)math_c99\\.h[ \t]+1\\.[0-9]+[ \t]+[0-9/]+ SMI";
 
-#define    SOLARIS_INT_CONST_TEST_CT  1
-static tTestDesc aSolaris_Int_ConstTests[] = {
-  { TT_EGREP,    zSolaris_Int_ConstSelect0, (regex_t*)NULL }, };
+/*
+ *  content bypass pattern - skip fix if pattern found
+ */
+tSCC zSolaris_Math_8Bypass0[] =
+       "__GNUC__";
+
+#define    SOLARIS_MATH_8_TEST_CT  2
+static tTestDesc aSolaris_Math_8Tests[] = {
+  { TT_NEGREP,   zSolaris_Math_8Bypass0, (regex_t*)NULL },
+  { TT_EGREP,    zSolaris_Math_8Select0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Solaris_Int_Const
+ *  Fix Command Arguments for Solaris_Math_8
  */
-static const char* apzSolaris_Int_ConstPatch[] = {
+static const char* apzSolaris_Math_8Patch[] = {
     "format",
-    "#define\tUINT8_C(c)\t(c)\n\
-%1\n\
-#define\tUINT16_C(c)\t(c)",
+    "#define\tsignbit(x)\t(sizeof(x) == sizeof(float) \\\n\
+\t\t\t   ? __builtin_signbitf(x) \\\n\
+\t\t\t   : sizeof(x) == sizeof(long double) \\\n\
+\t\t\t     ? __builtin_signbitl(x) \\\n\
+\t\t\t     : __builtin_signbit(x))",
+    "^#define[ \t]+signbit\\(x\\)[ \t]+__builtin_signbit\\(x\\)",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Solaris_Int_Limits_1 fix
+ *  Description of Solaris_Math_9 fix
  */
-tSCC zSolaris_Int_Limits_1Name[] =
-     "solaris_int_limits_1";
+tSCC zSolaris_Math_9Name[] =
+     "solaris_math_9";
 
 /*
  *  File name selection pattern
  */
-tSCC zSolaris_Int_Limits_1List[] =
-  "sys/int_limits.h\0";
+tSCC zSolaris_Math_9List[] =
+  "iso/math_c99.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzSolaris_Int_Limits_1Machs[] = {
-        "*-*-solaris2*",
-        (const char*)NULL };
+#define apzSolaris_Math_9Machs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zSolaris_Int_Limits_1Select0[] =
-       "^#define[ \t]+UINT8_MAX[ \t]+\\(255U\\)\n\
-#define[ \t]+UINT16_MAX[ \t]+\\(65535U\\)";
+tSCC zSolaris_Math_9Select0[] =
+       "@\\(#\\)math_c99.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
 
-#define    SOLARIS_INT_LIMITS_1_TEST_CT  1
-static tTestDesc aSolaris_Int_Limits_1Tests[] = {
-  { TT_EGREP,    zSolaris_Int_Limits_1Select0, (regex_t*)NULL }, };
+/*
+ *  content bypass pattern - skip fix if pattern found
+ */
+tSCC zSolaris_Math_9Bypass0[] =
+       "__GNUC__";
+
+#define    SOLARIS_MATH_9_TEST_CT  2
+static tTestDesc aSolaris_Math_9Tests[] = {
+  { TT_NEGREP,   zSolaris_Math_9Bypass0, (regex_t*)NULL },
+  { TT_EGREP,    zSolaris_Math_9Select0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Solaris_Int_Limits_1
+ *  Fix Command Arguments for Solaris_Math_9
  */
-static const char* apzSolaris_Int_Limits_1Patch[] = {
+static const char* apzSolaris_Math_9Patch[] = {
     "format",
-    "#define\tUINT8_MAX\t(255)\n\
-#define\tUINT16_MAX\t(65535)",
+    "#define\t%1(x, y)%2__builtin_%1(x, y)",
+    "^#define[ \t]+([a-z]+)\\(x, y\\)([ \t]+)\\(\\(x\\) __builtin_[a-z]+\\(y\\)\\)",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Solaris_Int_Limits_2 fix
+ *  Description of Solaris_Once_Init_1 fix
  */
-tSCC zSolaris_Int_Limits_2Name[] =
-     "solaris_int_limits_2";
+tSCC zSolaris_Once_Init_1Name[] =
+     "solaris_once_init_1";
 
 /*
  *  File name selection pattern
  */
-tSCC zSolaris_Int_Limits_2List[] =
-  "sys/int_limits.h\0";
+tSCC zSolaris_Once_Init_1List[] =
+  "pthread.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzSolaris_Int_Limits_2Machs[] = {
-        "*-*-solaris2*",
+tSCC* apzSolaris_Once_Init_1Machs[] = {
+        "*-*-solaris*",
         (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zSolaris_Int_Limits_2Select0[] =
-       "^#define[ \t]+(INT|UINT)_FAST16_(MAX|MIN)[ \t](INT|UINT)16.*";
+tSCC zSolaris_Once_Init_1Select0[] =
+       "@\\(#\\)pthread.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
 
-#define    SOLARIS_INT_LIMITS_2_TEST_CT  1
-static tTestDesc aSolaris_Int_Limits_2Tests[] = {
-  { TT_EGREP,    zSolaris_Int_Limits_2Select0, (regex_t*)NULL }, };
+#define    SOLARIS_ONCE_INIT_1_TEST_CT  1
+static tTestDesc aSolaris_Once_Init_1Tests[] = {
+  { TT_EGREP,    zSolaris_Once_Init_1Select0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Solaris_Int_Limits_2
+ *  Fix Command Arguments for Solaris_Once_Init_1
  */
-static const char* apzSolaris_Int_Limits_2Patch[] = {
+static const char* apzSolaris_Once_Init_1Patch[] = {
     "format",
-    "#define\t%1_FAST16_%2 %132_%2",
+    "%1{%2}%3",
+    "(^#define[ \t]+PTHREAD_ONCE_INIT[ \t]+\\{)([^}]+)(\\})[ \t]*$",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Solaris_Int_Limits_3 fix
+ *  Description of Solaris_Posix_Spawn_Restrict fix
  */
-tSCC zSolaris_Int_Limits_3Name[] =
-     "solaris_int_limits_3";
+tSCC zSolaris_Posix_Spawn_RestrictName[] =
+     "solaris_posix_spawn_restrict";
 
 /*
  *  File name selection pattern
  */
-tSCC zSolaris_Int_Limits_3List[] =
-  "sys/int_limits.h\0";
+tSCC zSolaris_Posix_Spawn_RestrictList[] =
+  "spawn.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzSolaris_Int_Limits_3Machs[] = {
+tSCC* apzSolaris_Posix_Spawn_RestrictMachs[] = {
         "*-*-solaris2*",
         (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zSolaris_Int_Limits_3Select0[] =
-       "^#define[ \t]+SIZE_MAX[ \t]+4294967295UL";
+tSCC zSolaris_Posix_Spawn_RestrictSelect0[] =
+       "(.*[ \t]+)([a-z]+)\\[_RESTRICT_KYWD\\](.*)";
 
-#define    SOLARIS_INT_LIMITS_3_TEST_CT  1
-static tTestDesc aSolaris_Int_Limits_3Tests[] = {
-  { TT_EGREP,    zSolaris_Int_Limits_3Select0, (regex_t*)NULL }, };
+#define    SOLARIS_POSIX_SPAWN_RESTRICT_TEST_CT  1
+static tTestDesc aSolaris_Posix_Spawn_RestrictTests[] = {
+  { TT_EGREP,    zSolaris_Posix_Spawn_RestrictSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Solaris_Int_Limits_3
+ *  Fix Command Arguments for Solaris_Posix_Spawn_Restrict
  */
-static const char* apzSolaris_Int_Limits_3Patch[] = {
+static const char* apzSolaris_Posix_Spawn_RestrictPatch[] = {
     "format",
-    "#define\tSIZE_MAX\t4294967295U",
+    "%1*_RESTRICT_KYWD %2%3",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Solaris_Int_Types fix
+ *  Description of Solaris_Pow_Int_Overload fix
  */
-tSCC zSolaris_Int_TypesName[] =
-     "solaris_int_types";
+tSCC zSolaris_Pow_Int_OverloadName[] =
+     "solaris_pow_int_overload";
 
 /*
  *  File name selection pattern
  */
-tSCC zSolaris_Int_TypesList[] =
-  "sys/int_types.h\0";
+tSCC zSolaris_Pow_Int_OverloadList[] =
+  "iso/math_iso.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzSolaris_Int_TypesMachs (const char**)NULL
+tSCC* apzSolaris_Pow_Int_OverloadMachs[] = {
+        "*-*-solaris2*",
+        (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zSolaris_Int_TypesSelect0[] =
-       "__STDC__ - 0 == 0";
-
-/*
- *  content bypass pattern - skip fix if pattern found
- */
-tSCC zSolaris_Int_TypesBypass0[] =
-       "_LONGLONG_TYPE";
+tSCC zSolaris_Pow_Int_OverloadSelect0[] =
+       "^[ \t]*inline [a-z ]* pow\\([^()]*, int [^()]*\\) *\\{[^{}]*\n\
+[^{}]*\\}";
 
-#define    SOLARIS_INT_TYPES_TEST_CT  2
-static tTestDesc aSolaris_Int_TypesTests[] = {
-  { TT_NEGREP,   zSolaris_Int_TypesBypass0, (regex_t*)NULL },
-  { TT_EGREP,    zSolaris_Int_TypesSelect0, (regex_t*)NULL }, };
+#define    SOLARIS_POW_INT_OVERLOAD_TEST_CT  1
+static tTestDesc aSolaris_Pow_Int_OverloadTests[] = {
+  { TT_EGREP,    zSolaris_Pow_Int_OverloadSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Solaris_Int_Types
+ *  Fix Command Arguments for Solaris_Pow_Int_Overload
  */
-static const char* apzSolaris_Int_TypesPatch[] = {
+static const char* apzSolaris_Pow_Int_OverloadPatch[] = {
     "format",
-    "(defined(_STDC_C99) || !defined(_STRICT_STDC) || defined(__GNUC__))",
+    "#if __cplusplus < 201103L\n\
+%0\n\
+#endif",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Solaris_Posix_Spawn_Restrict fix
+ *  Description of Solaris_Rwlock_Init_1 fix
  */
-tSCC zSolaris_Posix_Spawn_RestrictName[] =
-     "solaris_posix_spawn_restrict";
+tSCC zSolaris_Rwlock_Init_1Name[] =
+     "solaris_rwlock_init_1";
 
 /*
  *  File name selection pattern
  */
-tSCC zSolaris_Posix_Spawn_RestrictList[] =
-  "spawn.h\0";
+tSCC zSolaris_Rwlock_Init_1List[] =
+  "pthread.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzSolaris_Posix_Spawn_RestrictMachs[] = {
-        "*-*-solaris2*",
+tSCC* apzSolaris_Rwlock_Init_1Machs[] = {
+        "*-*-solaris*",
         (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zSolaris_Posix_Spawn_RestrictSelect0[] =
-       "(.*[ \t]+)([a-z]+)\\[_RESTRICT_KYWD\\](.*)";
+tSCC zSolaris_Rwlock_Init_1Select0[] =
+       "@\\(#\\)pthread.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
 
-#define    SOLARIS_POSIX_SPAWN_RESTRICT_TEST_CT  1
-static tTestDesc aSolaris_Posix_Spawn_RestrictTests[] = {
-  { TT_EGREP,    zSolaris_Posix_Spawn_RestrictSelect0, (regex_t*)NULL }, };
+#define    SOLARIS_RWLOCK_INIT_1_TEST_CT  1
+static tTestDesc aSolaris_Rwlock_Init_1Tests[] = {
+  { TT_EGREP,    zSolaris_Rwlock_Init_1Select0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Solaris_Posix_Spawn_Restrict
+ *  Fix Command Arguments for Solaris_Rwlock_Init_1
  */
-static const char* apzSolaris_Posix_Spawn_RestrictPatch[] = {
+static const char* apzSolaris_Rwlock_Init_1Patch[] = {
     "format",
-    "%1*_RESTRICT_KYWD %2%3",
+    "#if __STDC__ - 0 == 0 && !defined(_NO_LONGLONG)\n\
+%0\n\
+#else\n\
+%1{0, 0, 0, {{0}, {0}, {0}}, {{0}, {0}}, {{0}, {0}}}\n\
+#endif",
+    "(^#define[ \t]+PTHREAD_RWLOCK_INITIALIZER[ \t]+)\\{0, 0, 0, \\{0, 0, 0\\}, \\{0, 0\\}, \\{0, 0\\}\\}[ \t]*$",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -6671,51 +7103,6 @@ static const char* apzSolaris_Stdio_TagPatch[] = { sed_cmd_z,
     "-e", "s/defined(__cplusplus) && (__cplusplus < 54321L)/0/",
     (char*)NULL };
 
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Solaris_Sys_Va_List fix
- */
-tSCC zSolaris_Sys_Va_ListName[] =
-     "solaris_sys_va_list";
-
-/*
- *  File name selection pattern
- */
-tSCC zSolaris_Sys_Va_ListList[] =
-  "sys/va_list.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-tSCC* apzSolaris_Sys_Va_ListMachs[] = {
-        "*-*-solaris2.9",
-        (const char*)NULL };
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zSolaris_Sys_Va_ListSelect0[] =
-       "#if.*__STDC__.*\n\
-typedef void \\*__va_list;\n\
-#else\n\
-typedef char \\*__va_list;\n\
-#endif";
-
-#define    SOLARIS_SYS_VA_LIST_TEST_CT  1
-static tTestDesc aSolaris_Sys_Va_ListTests[] = {
-  { TT_EGREP,    zSolaris_Sys_Va_ListSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Solaris_Sys_Va_List
- */
-static const char* apzSolaris_Sys_Va_ListPatch[] = {
-    "format",
-    "#ifdef __GNUC__\n\
-typedef __builtin_va_list __va_list;\n\
-#else\n\
-%0\n\
-#endif",
-    (char*)NULL };
-
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  Description of Statsswtch fix
@@ -7368,6 +7755,41 @@ static const char* apzSunos_StrlenPatch[] = {
     "__SIZE_TYPE__ strlen();%1",
     (char*)NULL };
 
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Suse_Linux_Vt_Cxx fix
+ */
+tSCC zSuse_Linux_Vt_CxxName[] =
+     "suse_linux_vt_cxx";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zSuse_Linux_Vt_CxxList[] =
+  "linux/vt.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzSuse_Linux_Vt_CxxMachs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zSuse_Linux_Vt_CxxSelect0[] =
+       "^[ \t]*unsigned int new;";
+
+#define    SUSE_LINUX_VT_CXX_TEST_CT  1
+static tTestDesc aSuse_Linux_Vt_CxxTests[] = {
+  { TT_EGREP,    zSuse_Linux_Vt_CxxSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Suse_Linux_Vt_Cxx
+ */
+static const char* apzSuse_Linux_Vt_CxxPatch[] = {
+    "format",
+    "unsigned int newev;",
+    (char*)NULL };
+
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  Description of Svr4_Disable_Opt fix
@@ -7648,7 +8070,7 @@ tSCC zThread_KeywordName[] =
  *  File name selection pattern
  */
 tSCC zThread_KeywordList[] =
-  "pthread.h\0bits/sigthread.h\0";
+  "pthread.h\0bits/sigthread.h\0*/bits/sigthread.h\0";
 /*
  *  Machine/OS name selection pattern
  */
@@ -7816,191 +8238,156 @@ static const char* apzVa_I960_MacroPatch[] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  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
+ *  Description of Vms_Add_Missing_Braces fix
  */
-tSCC zVms_Use_Pragma_Extern_ModelName[] =
-     "vms_use_pragma_extern_model";
+tSCC zVms_Add_Missing_BracesName[] =
+     "vms_add_missing_braces";
 
 /*
  *  File name selection pattern
  */
-#define zVms_Use_Pragma_Extern_ModelList (char*)NULL
+tSCC zVms_Add_Missing_BracesList[] =
+  "rtldef/signal.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzVms_Use_Pragma_Extern_ModelMachs[] = {
+tSCC* apzVms_Add_Missing_BracesMachs[] = {
         "*-*-*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_Add_Missing_BracesSelect0[] =
+       "(_SIG_[A-Z]+_SET[ \t]+= \\{)(0x[0F]+, 0x[0F]+)";
 
-#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_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_Use_Pragma_Extern_Model
+ *  Fix Command Arguments for Vms_Add_Missing_Braces
  */
-static const char* apzVms_Use_Pragma_Extern_ModelPatch[] = {
+static const char* apzVms_Add_Missing_BracesPatch[] = {
     "format",
-    "#if defined(__DECC) || defined(__DECCXX) || defined(__GNUC__)\n\
-# pragma extern_model __save\n",
+    "%1 {%2} ",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Vms_Disable_Decc_String_Builtins fix
+ *  Description of Vms_Decc_Builtin fix
  */
-tSCC zVms_Disable_Decc_String_BuiltinsName[] =
-     "vms_disable_decc_string_builtins";
+tSCC zVms_Decc_BuiltinName[] =
+     "vms_decc_builtin";
 
 /*
  *  File name selection pattern
  */
-tSCC zVms_Disable_Decc_String_BuiltinsList[] =
-  "rtldef/string.h\0";
+tSCC zVms_Decc_BuiltinList[] =
+  "rtldef/string.h\0rtldef/time.h\0rtldef/strings.h\0rtldef/socket.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzVms_Disable_Decc_String_BuiltinsMachs[] = {
+tSCC* apzVms_Decc_BuiltinMachs[] = {
         "*-*-*vms*",
         (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zVms_Disable_Decc_String_BuiltinsSelect0[] =
-       "#if !defined\\(__VAX\\)\n";
+tSCC zVms_Decc_BuiltinSelect0[] =
+       "(__MEMSET|__MEMMOVE|__MEMCPY|__STRLEN|__STRCPY)";
 
-#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_DECC_BUILTIN_TEST_CT  1
+static tTestDesc aVms_Decc_BuiltinTests[] = {
+  { TT_EGREP,    zVms_Decc_BuiltinSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Vms_Disable_Decc_String_Builtins
+ *  Fix Command Arguments for Vms_Decc_Builtin
  */
-static const char* apzVms_Disable_Decc_String_BuiltinsPatch[] = {
-    "format",
-    "#if !defined(__VAX) && !defined(__GNUC__)\n",
+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_Use_Quoted_Include fix
+ *  Description of Vms_Define_Can_Use_Extern_Prefix fix
  */
-tSCC zVms_Use_Quoted_IncludeName[] =
-     "vms_use_quoted_include";
+tSCC zVms_Define_Can_Use_Extern_PrefixName[] =
+     "vms_define_can_use_extern_prefix";
 
 /*
  *  File name selection pattern
  */
-tSCC zVms_Use_Quoted_IncludeList[] =
-  "rtldef/wait.h\0starlet_c/pthread.h\0";
+tSCC zVms_Define_Can_Use_Extern_PrefixList[] =
+  "rtldef/decc$types.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzVms_Use_Quoted_IncludeMachs[] = {
+tSCC* apzVms_Define_Can_Use_Extern_PrefixMachs[] = {
         "*-*-*vms*",
         (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zVms_Use_Quoted_IncludeSelect0[] =
-       "(#[ \t]*include[ \t]+)<(resource|builtins)\\.h>";
+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_USE_QUOTED_INCLUDE_TEST_CT  1
-static tTestDesc aVms_Use_Quoted_IncludeTests[] = {
-  { TT_EGREP,    zVms_Use_Quoted_IncludeSelect0, (regex_t*)NULL }, };
+#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_Use_Quoted_Include
+ *  Fix Command Arguments for Vms_Define_Can_Use_Extern_Prefix
  */
-static const char* apzVms_Use_Quoted_IncludePatch[] = {
+static const char* apzVms_Define_Can_Use_Extern_PrefixPatch[] = {
     "format",
-    "%1<sys/%2.h>",
+    "%0#    elif defined (__GNUC__)\n\
+#\tdefine __CAN_USE_EXTERN_PREFIX 1\n",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Vms_Add_Missing_Braces fix
+ *  Description of Vms_Disable_Decc_String_Builtins fix
  */
-tSCC zVms_Add_Missing_BracesName[] =
-     "vms_add_missing_braces";
+tSCC zVms_Disable_Decc_String_BuiltinsName[] =
+     "vms_disable_decc_string_builtins";
 
 /*
  *  File name selection pattern
  */
-tSCC zVms_Add_Missing_BracesList[] =
-  "rtldef/signal.h\0";
+tSCC zVms_Disable_Decc_String_BuiltinsList[] =
+  "rtldef/string.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzVms_Add_Missing_BracesMachs[] = {
+tSCC* apzVms_Disable_Decc_String_BuiltinsMachs[] = {
         "*-*-*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]+)";
+tSCC zVms_Disable_Decc_String_BuiltinsSelect0[] =
+       "#if !defined\\(__VAX\\)\n";
 
-#define    VMS_ADD_MISSING_BRACES_TEST_CT  1
-static tTestDesc aVms_Add_Missing_BracesTests[] = {
-  { TT_EGREP,    zVms_Add_Missing_BracesSelect0, (regex_t*)NULL }, };
+#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_Add_Missing_Braces
+ *  Fix Command Arguments for Vms_Disable_Decc_String_Builtins
  */
-static const char* apzVms_Add_Missing_BracesPatch[] = {
+static const char* apzVms_Disable_Decc_String_BuiltinsPatch[] = {
     "format",
-    "%1 {%2} ",
+    "#if !defined(__VAX) && !defined(__GNUC__)\n",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -8044,42 +8431,40 @@ static const char* apzVms_Do_Not_Redeclare_HostaliasPatch[] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Vms_Decc_Builtin fix
+ *  Description of Vms_Forward_Declare_Struct fix
  */
-tSCC zVms_Decc_BuiltinName[] =
-     "vms_decc_builtin";
+tSCC zVms_Forward_Declare_StructName[] =
+     "vms_forward_declare_struct";
 
 /*
  *  File name selection pattern
  */
-tSCC zVms_Decc_BuiltinList[] =
-  "rtldef/string.h\0rtldef/time.h\0rtldef/strings.h\0rtldef/socket.h\0";
+tSCC zVms_Forward_Declare_StructList[] =
+  "rtldef/if.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzVms_Decc_BuiltinMachs[] = {
+tSCC* apzVms_Forward_Declare_StructMachs[] = {
         "*-*-*vms*",
         (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zVms_Decc_BuiltinSelect0[] =
-       "(__MEMSET|__MEMMOVE|__MEMCPY|__STRLEN|__STRCPY)";
+tSCC zVms_Forward_Declare_StructSelect0[] =
+       "(/\\* forward decls for C\\+\\+ \\*/\n\
+)#ifdef __cplusplus\n";
 
-#define    VMS_DECC_BUILTIN_TEST_CT  1
-static tTestDesc aVms_Decc_BuiltinTests[] = {
-  { TT_EGREP,    zVms_Decc_BuiltinSelect0, (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_Decc_Builtin
+ *  Fix Command Arguments for Vms_Forward_Declare_Struct
  */
-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@",
+static const char* apzVms_Forward_Declare_StructPatch[] = {
+    "format",
+    "%1#if defined (__cplusplus) || defined (__GNUC__)\n",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -8122,77 +8507,114 @@ static const char* apzVms_No_64bit_GetoptPatch[] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Vms_Forward_Declare_Struct fix
+ *  Description of Vms_Use_Fast_Setjmp fix
  */
-tSCC zVms_Forward_Declare_StructName[] =
-     "vms_forward_declare_struct";
+tSCC zVms_Use_Fast_SetjmpName[] =
+     "vms_use_fast_setjmp";
 
 /*
  *  File name selection pattern
  */
-tSCC zVms_Forward_Declare_StructList[] =
-  "rtldef/if.h\0";
+tSCC zVms_Use_Fast_SetjmpList[] =
+  "rtldef/setjmp.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzVms_Forward_Declare_StructMachs[] = {
+tSCC* apzVms_Use_Fast_SetjmpMachs[] = {
         "*-*-*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";
+tSCC zVms_Use_Fast_SetjmpSelect0[] =
+       "(#[ \t]*if[ \t]*defined\\(__FAST_SETJMP\\)[ \t]*\\|\\|)";
 
-#define    VMS_FORWARD_DECLARE_STRUCT_TEST_CT  1
-static tTestDesc aVms_Forward_Declare_StructTests[] = {
-  { TT_EGREP,    zVms_Forward_Declare_StructSelect0, (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_Forward_Declare_Struct
+ *  Fix Command Arguments for Vms_Use_Fast_Setjmp
  */
-static const char* apzVms_Forward_Declare_StructPatch[] = {
+static const char* apzVms_Use_Fast_SetjmpPatch[] = {
     "format",
-    "%1#if defined (__cplusplus) || defined (__GNUC__)\n",
+    "%0 defined (__GNUC__) ||",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Vms_Use_Fast_Setjmp fix
+ *  Description of Vms_Use_Pragma_Extern_Model fix
  */
-tSCC zVms_Use_Fast_SetjmpName[] =
-     "vms_use_fast_setjmp";
+tSCC zVms_Use_Pragma_Extern_ModelName[] =
+     "vms_use_pragma_extern_model";
 
 /*
  *  File name selection pattern
  */
-tSCC zVms_Use_Fast_SetjmpList[] =
-  "rtldef/setjmp.h\0";
+#define zVms_Use_Pragma_Extern_ModelList (char*)NULL
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzVms_Use_Fast_SetjmpMachs[] = {
+tSCC* apzVms_Use_Pragma_Extern_ModelMachs[] = {
         "*-*-*vms*",
         (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zVms_Use_Fast_SetjmpSelect0[] =
-       "(#[ \t]*if[ \t]*defined\\(__FAST_SETJMP\\)[ \t]*\\|\\|)";
+tSCC zVms_Use_Pragma_Extern_ModelSelect0[] =
+       "#if defined\\(__DECC\\) \\|\\| defined\\(__DECCXX\\)\n\
+# pragma extern_model __save\n";
 
-#define    VMS_USE_FAST_SETJMP_TEST_CT  1
-static tTestDesc aVms_Use_Fast_SetjmpTests[] = {
-  { TT_EGREP,    zVms_Use_Fast_SetjmpSelect0, (regex_t*)NULL }, };
+#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_Fast_Setjmp
+ *  Fix Command Arguments for Vms_Use_Pragma_Extern_Model
  */
-static const char* apzVms_Use_Fast_SetjmpPatch[] = {
+static const char* apzVms_Use_Pragma_Extern_ModelPatch[] = {
     "format",
-    "%0 defined (__GNUC__) ||",
+    "#if defined(__DECC) || defined(__DECCXX) || defined(__GNUC__)\n\
+# pragma extern_model __save\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 };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -8237,7 +8659,17 @@ static tTestDesc aVoid_NullTests[] = {
  */
 static const char* apzVoid_NullPatch[] = {
     "format",
-    "#define NULL 0",
+    "#ifndef NULL\n\
+#ifdef __cplusplus\n\
+#ifdef __GNUG__\n\
+#define NULL __null\n\
+#else /* ! __GNUG__  */\n\
+#define NULL 0L\n\
+#endif /* __GNUG__  */\n\
+#else /* ! __cplusplus  */\n\
+#define NULL ((void *)0)\n\
+#endif /* __cplusplus  */\n\
+#endif /* !NULL  */",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -8289,6 +8721,68 @@ static const char* apzVxworks_Gcc_ProblemPatch[] = { sed_cmd_z,
 #endif\n",
     (char*)NULL };
 
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  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
@@ -8372,6 +8866,42 @@ static const char* apzVxworks_Needs_VxworksPatch[] = { sed_cmd_z,
 #include <types/vxTypesOld.h>\n",
     (char*)NULL };
 
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  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
@@ -8422,6 +8952,36 @@ typedef void (*__gcc_VOIDFUNCPTR) ();\n\
 #define VOIDFUNCPTR __gcc_VOIDFUNCPTR",
     (char*)NULL };
 
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  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
@@ -8592,26 +9152,36 @@ static const char* apzX11_SprintfPatch[] = {
  *
  *  List of all fixes
  */
-#define REGEX_COUNT          254
-#define MACH_LIST_SIZE_LIMIT 181
-#define FIX_COUNT            211
+#define REGEX_COUNT          260
+#define MACH_LIST_SIZE_LIMIT 187
+#define FIX_COUNT            223
 
 /*
  *  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_ASSERT_FIXIDX,
     AIX_COMPLEX_FIXIDX,
+    AIX_MALLOC_FIXIDX,
     AIX_NET_IF_ARP_FIXIDX,
+    AIX_NULL_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,
@@ -8637,10 +9207,10 @@ 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,
+    DARWIN_9_LONG_DOUBLE_FUNCS_2_FIXIDX,
     DARWIN_EXTERNC_FIXIDX,
     DARWIN_GCC4_BREAKAGE_FIXIDX,
     DARWIN_PRIVATE_EXTERN_FIXIDX,
@@ -8654,6 +9224,8 @@ typedef enum {
     DEC_INTERN_ASM_FIXIDX,
     DJGPP_WCHAR_H_FIXIDX,
     ECD_CURSOR_FIXIDX,
+    FERAISEEXCEPT_NOSSE_DIVBYZERO_FIXIDX,
+    FERAISEEXCEPT_NOSSE_INVALID_FIXIDX,
     FREEBSD_GCC3_BREAKAGE_FIXIDX,
     FREEBSD_GCC4_BREAKAGE_FIXIDX,
     GLIBC_C99_INLINE_1_FIXIDX,
@@ -8675,28 +9247,28 @@ typedef enum {
     HPUX10_CTYPE_DECLARATIONS2_FIXIDX,
     HPUX10_STDIO_DECLARATIONS_FIXIDX,
     HPUX11_ABS_FIXIDX,
+    HPUX11_EXTERN_SENDFILE_FIXIDX,
+    HPUX11_EXTERN_SENDPATH_FIXIDX,
     HPUX11_FABSF_FIXIDX,
     HPUX11_PTHREAD_CONST_FIXIDX,
     HPUX11_SIZE_T_FIXIDX,
     HPUX11_SNPRINTF_FIXIDX,
     HPUX11_VSNPRINTF_FIXIDX,
     HPUX8_BOGUS_INLINES_FIXIDX,
+    HPUX_C99_INTPTR_FIXIDX,
+    HPUX_C99_INTTYPES_FIXIDX,
+    HPUX_C99_INTTYPES2_FIXIDX,
     HPUX_CTYPE_MACROS_FIXIDX,
+    HPUX_EXTERN_ERRNO_FIXIDX,
     HPUX_HTONL_FIXIDX,
+    HPUX_IMAGINARY_I_FIXIDX,
+    HPUX_INTTYPE_INT8_T_FIXIDX,
     HPUX_LONG_DOUBLE_FIXIDX,
     HPUX_LONG_DOUBLE_2_FIXIDX,
-    HPUX_SYSTIME_FIXIDX,
-    HPUX_SPU_INFO_FIXIDX,
-    HPUX11_EXTERN_SENDFILE_FIXIDX,
-    HPUX11_EXTERN_SENDPATH_FIXIDX,
-    HPUX_EXTERN_ERRNO_FIXIDX,
     HPUX_PTHREAD_INITIALIZERS_FIXIDX,
-    HPUX_C99_INTPTR_FIXIDX,
-    HPUX_C99_INTTYPES_FIXIDX,
-    HPUX_C99_INTTYPES2_FIXIDX,
+    HPUX_SPU_INFO_FIXIDX,
     HPUX_STDINT_LEAST_FAST_FIXIDX,
-    HPUX_INTTYPE_INT8_T_FIXIDX,
-    HPUX_IMAGINARY_I_FIXIDX,
+    HPUX_SYSTIME_FIXIDX,
     HUGE_VAL_HEX_FIXIDX,
     HUGE_VALF_HEX_FIXIDX,
     HUGE_VALL_HEX_FIXIDX,
@@ -8742,28 +9314,23 @@ typedef enum {
     SOLARIS_COMPLEX_CXX_FIXIDX,
     SOLARIS_CXX_LINKAGE_FIXIDX,
     SOLARIS_GETC_STRICT_STDC_FIXIDX,
-    SOLARIS_LONGJMP_NORETURN_FIXIDX,
+    SOLARIS_INT_CONST_FIXIDX,
+    SOLARIS_INT_LIMITS_1_FIXIDX,
+    SOLARIS_INT_LIMITS_2_FIXIDX,
+    SOLARIS_INT_LIMITS_3_FIXIDX,
     SOLARIS_MATH_1_FIXIDX,
+    SOLARIS_MATH_10_FIXIDX,
     SOLARIS_MATH_2_FIXIDX,
     SOLARIS_MATH_3_FIXIDX,
     SOLARIS_MATH_4_FIXIDX,
     SOLARIS_MATH_8_FIXIDX,
     SOLARIS_MATH_9_FIXIDX,
-    SOLARIS_MATH_10_FIXIDX,
-    SOLARIS_MUTEX_INIT_2_FIXIDX,
-    SOLARIS_POW_INT_OVERLOAD_FIXIDX,
-    SOLARIS_RWLOCK_INIT_1_FIXIDX,
     SOLARIS_ONCE_INIT_1_FIXIDX,
-    SOLARIS_ONCE_INIT_2_FIXIDX,
-    SOLARIS_INT_CONST_FIXIDX,
-    SOLARIS_INT_LIMITS_1_FIXIDX,
-    SOLARIS_INT_LIMITS_2_FIXIDX,
-    SOLARIS_INT_LIMITS_3_FIXIDX,
-    SOLARIS_INT_TYPES_FIXIDX,
     SOLARIS_POSIX_SPAWN_RESTRICT_FIXIDX,
+    SOLARIS_POW_INT_OVERLOAD_FIXIDX,
+    SOLARIS_RWLOCK_INIT_1_FIXIDX,
     SOLARIS_STD___FILBUF_FIXIDX,
     SOLARIS_STDIO_TAG_FIXIDX,
-    SOLARIS_SYS_VA_LIST_FIXIDX,
     STATSSWTCH_FIXIDX,
     STDIO_STDARG_H_FIXIDX,
     STDIO_VA_LIST_FIXIDX,
@@ -8780,6 +9347,7 @@ typedef enum {
     SUN_RUSERS_SEMI_FIXIDX,
     SUN_SIGNAL_FIXIDX,
     SUNOS_STRLEN_FIXIDX,
+    SUSE_LINUX_VT_CXX_FIXIDX,
     SVR4_DISABLE_OPT_FIXIDX,
     SVR4_GETCWD_FIXIDX,
     SVR4_PROFIL_FIXIDX,
@@ -8792,21 +9360,25 @@ typedef enum {
     ULTRIX_CONST_FIXIDX,
     ULTRIX_CONST2_FIXIDX,
     VA_I960_MACRO_FIXIDX,
+    VMS_ADD_MISSING_BRACES_FIXIDX,
+    VMS_DECC_BUILTIN_FIXIDX,
     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_NO_64BIT_GETOPT_FIXIDX,
     VMS_USE_FAST_SETJMP_FIXIDX,
+    VMS_USE_PRAGMA_EXTERN_MODEL_FIXIDX,
+    VMS_USE_QUOTED_INCLUDE_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,
@@ -8819,16 +9391,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,
@@ -8854,16 +9426,51 @@ 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_AssertName,    zAix_AssertList,
+     apzAix_AssertMachs,
+     AIX_ASSERT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aAix_AssertTests,   apzAix_AssertPatch, 0 },
+
   {  zAix_ComplexName,    zAix_ComplexList,
      apzAix_ComplexMachs,
      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_NullName,    zAix_NullList,
+     apzAix_NullMachs,
+     AIX_NULL_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aAix_NullTests,   apzAix_NullPatch, 0 },
+
   {  zAix_Once_Init_1Name,    zAix_Once_Init_1List,
      apzAix_Once_Init_1Machs,
      AIX_ONCE_INIT_1_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -8874,6 +9481,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,
@@ -8999,11 +9621,6 @@ 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,
@@ -9019,6 +9636,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,
@@ -9084,6 +9706,16 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      ECD_CURSOR_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aEcd_CursorTests,   apzEcd_CursorPatch, 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 },
+
+  {  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 },
+
   {  zFreebsd_Gcc3_BreakageName,    zFreebsd_Gcc3_BreakageList,
      apzFreebsd_Gcc3_BreakageMachs,
      FREEBSD_GCC3_BREAKAGE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -9189,6 +9821,16 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      HPUX11_ABS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aHpux11_AbsTests,   apzHpux11_AbsPatch, 0 },
 
+  {  zHpux11_Extern_SendfileName,    zHpux11_Extern_SendfileList,
+     apzHpux11_Extern_SendfileMachs,
+     HPUX11_EXTERN_SENDFILE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aHpux11_Extern_SendfileTests,   apzHpux11_Extern_SendfilePatch, 0 },
+
+  {  zHpux11_Extern_SendpathName,    zHpux11_Extern_SendpathList,
+     apzHpux11_Extern_SendpathMachs,
+     HPUX11_EXTERN_SENDPATH_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aHpux11_Extern_SendpathTests,   apzHpux11_Extern_SendpathPatch, 0 },
+
   {  zHpux11_FabsfName,    zHpux11_FabsfList,
      apzHpux11_FabsfMachs,
      HPUX11_FABSF_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -9219,16 +9861,46 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      HPUX8_BOGUS_INLINES_TEST_CT, FD_MACH_ONLY,
      aHpux8_Bogus_InlinesTests,   apzHpux8_Bogus_InlinesPatch, 0 },
 
+  {  zHpux_C99_IntptrName,    zHpux_C99_IntptrList,
+     apzHpux_C99_IntptrMachs,
+     HPUX_C99_INTPTR_TEST_CT, FD_MACH_ONLY,
+     aHpux_C99_IntptrTests,   apzHpux_C99_IntptrPatch, 0 },
+
+  {  zHpux_C99_InttypesName,    zHpux_C99_InttypesList,
+     apzHpux_C99_InttypesMachs,
+     HPUX_C99_INTTYPES_TEST_CT, FD_MACH_ONLY,
+     aHpux_C99_InttypesTests,   apzHpux_C99_InttypesPatch, 0 },
+
+  {  zHpux_C99_Inttypes2Name,    zHpux_C99_Inttypes2List,
+     apzHpux_C99_Inttypes2Machs,
+     HPUX_C99_INTTYPES2_TEST_CT, FD_MACH_ONLY,
+     aHpux_C99_Inttypes2Tests,   apzHpux_C99_Inttypes2Patch, 0 },
+
   {  zHpux_Ctype_MacrosName,    zHpux_Ctype_MacrosList,
      apzHpux_Ctype_MacrosMachs,
      HPUX_CTYPE_MACROS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aHpux_Ctype_MacrosTests,   apzHpux_Ctype_MacrosPatch, 0 },
 
+  {  zHpux_Extern_ErrnoName,    zHpux_Extern_ErrnoList,
+     apzHpux_Extern_ErrnoMachs,
+     HPUX_EXTERN_ERRNO_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aHpux_Extern_ErrnoTests,   apzHpux_Extern_ErrnoPatch, 0 },
+
   {  zHpux_HtonlName,    zHpux_HtonlList,
      apzHpux_HtonlMachs,
      HPUX_HTONL_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aHpux_HtonlTests,   apzHpux_HtonlPatch, 0 },
 
+  {  zHpux_Imaginary_IName,    zHpux_Imaginary_IList,
+     apzHpux_Imaginary_IMachs,
+     HPUX_IMAGINARY_I_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aHpux_Imaginary_ITests,   apzHpux_Imaginary_IPatch, 0 },
+
+  {  zHpux_Inttype_Int8_TName,    zHpux_Inttype_Int8_TList,
+     apzHpux_Inttype_Int8_TMachs,
+     HPUX_INTTYPE_INT8_T_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aHpux_Inttype_Int8_TTests,   apzHpux_Inttype_Int8_TPatch, 0 },
+
   {  zHpux_Long_DoubleName,    zHpux_Long_DoubleList,
      apzHpux_Long_DoubleMachs,
      HPUX_LONG_DOUBLE_TEST_CT, FD_MACH_ONLY,
@@ -9239,65 +9911,25 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      HPUX_LONG_DOUBLE_2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aHpux_Long_Double_2Tests,   apzHpux_Long_Double_2Patch, 0 },
 
-  {  zHpux_SystimeName,    zHpux_SystimeList,
-     apzHpux_SystimeMachs,
-     HPUX_SYSTIME_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aHpux_SystimeTests,   apzHpux_SystimePatch, 0 },
-
-  {  zHpux_Spu_InfoName,    zHpux_Spu_InfoList,
-     apzHpux_Spu_InfoMachs,
-     HPUX_SPU_INFO_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aHpux_Spu_InfoTests,   apzHpux_Spu_InfoPatch, 0 },
-
-  {  zHpux11_Extern_SendfileName,    zHpux11_Extern_SendfileList,
-     apzHpux11_Extern_SendfileMachs,
-     HPUX11_EXTERN_SENDFILE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aHpux11_Extern_SendfileTests,   apzHpux11_Extern_SendfilePatch, 0 },
-
-  {  zHpux11_Extern_SendpathName,    zHpux11_Extern_SendpathList,
-     apzHpux11_Extern_SendpathMachs,
-     HPUX11_EXTERN_SENDPATH_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aHpux11_Extern_SendpathTests,   apzHpux11_Extern_SendpathPatch, 0 },
-
-  {  zHpux_Extern_ErrnoName,    zHpux_Extern_ErrnoList,
-     apzHpux_Extern_ErrnoMachs,
-     HPUX_EXTERN_ERRNO_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aHpux_Extern_ErrnoTests,   apzHpux_Extern_ErrnoPatch, 0 },
-
   {  zHpux_Pthread_InitializersName,    zHpux_Pthread_InitializersList,
      apzHpux_Pthread_InitializersMachs,
      HPUX_PTHREAD_INITIALIZERS_TEST_CT, FD_MACH_ONLY,
      aHpux_Pthread_InitializersTests,   apzHpux_Pthread_InitializersPatch, 0 },
 
-  {  zHpux_C99_IntptrName,    zHpux_C99_IntptrList,
-     apzHpux_C99_IntptrMachs,
-     HPUX_C99_INTPTR_TEST_CT, FD_MACH_ONLY,
-     aHpux_C99_IntptrTests,   apzHpux_C99_IntptrPatch, 0 },
-
-  {  zHpux_C99_InttypesName,    zHpux_C99_InttypesList,
-     apzHpux_C99_InttypesMachs,
-     HPUX_C99_INTTYPES_TEST_CT, FD_MACH_ONLY,
-     aHpux_C99_InttypesTests,   apzHpux_C99_InttypesPatch, 0 },
-
-  {  zHpux_C99_Inttypes2Name,    zHpux_C99_Inttypes2List,
-     apzHpux_C99_Inttypes2Machs,
-     HPUX_C99_INTTYPES2_TEST_CT, FD_MACH_ONLY,
-     aHpux_C99_Inttypes2Tests,   apzHpux_C99_Inttypes2Patch, 0 },
+  {  zHpux_Spu_InfoName,    zHpux_Spu_InfoList,
+     apzHpux_Spu_InfoMachs,
+     HPUX_SPU_INFO_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aHpux_Spu_InfoTests,   apzHpux_Spu_InfoPatch, 0 },
 
   {  zHpux_Stdint_Least_FastName,    zHpux_Stdint_Least_FastList,
      apzHpux_Stdint_Least_FastMachs,
      HPUX_STDINT_LEAST_FAST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aHpux_Stdint_Least_FastTests,   apzHpux_Stdint_Least_FastPatch, 0 },
 
-  {  zHpux_Inttype_Int8_TName,    zHpux_Inttype_Int8_TList,
-     apzHpux_Inttype_Int8_TMachs,
-     HPUX_INTTYPE_INT8_T_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aHpux_Inttype_Int8_TTests,   apzHpux_Inttype_Int8_TPatch, 0 },
-
-  {  zHpux_Imaginary_IName,    zHpux_Imaginary_IList,
-     apzHpux_Imaginary_IMachs,
-     HPUX_IMAGINARY_I_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aHpux_Imaginary_ITests,   apzHpux_Imaginary_IPatch, 0 },
+  {  zHpux_SystimeName,    zHpux_SystimeList,
+     apzHpux_SystimeMachs,
+     HPUX_SYSTIME_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aHpux_SystimeTests,   apzHpux_SystimePatch, 0 },
 
   {  zHuge_Val_HexName,    zHuge_Val_HexList,
      apzHuge_Val_HexMachs,
@@ -9376,7 +10008,7 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
 
   {  zMath_ExceptionName,    zMath_ExceptionList,
      apzMath_ExceptionMachs,
-     MATH_EXCEPTION_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     MATH_EXCEPTION_TEST_CT, FD_MACH_IFNOT | FD_SUBROUTINE,
      aMath_ExceptionTests,   apzMath_ExceptionPatch, 0 },
 
   {  zMath_Huge_Val_From_Dbl_MaxName,    zMath_Huge_Val_From_Dbl_MaxList,
@@ -9524,16 +10156,36 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      SOLARIS_GETC_STRICT_STDC_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aSolaris_Getc_Strict_StdcTests,   apzSolaris_Getc_Strict_StdcPatch, 0 },
 
-  {  zSolaris_Longjmp_NoreturnName,    zSolaris_Longjmp_NoreturnList,
-     apzSolaris_Longjmp_NoreturnMachs,
-     SOLARIS_LONGJMP_NORETURN_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aSolaris_Longjmp_NoreturnTests,   apzSolaris_Longjmp_NoreturnPatch, 0 },
+  {  zSolaris_Int_ConstName,    zSolaris_Int_ConstList,
+     apzSolaris_Int_ConstMachs,
+     SOLARIS_INT_CONST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aSolaris_Int_ConstTests,   apzSolaris_Int_ConstPatch, 0 },
+
+  {  zSolaris_Int_Limits_1Name,    zSolaris_Int_Limits_1List,
+     apzSolaris_Int_Limits_1Machs,
+     SOLARIS_INT_LIMITS_1_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aSolaris_Int_Limits_1Tests,   apzSolaris_Int_Limits_1Patch, 0 },
+
+  {  zSolaris_Int_Limits_2Name,    zSolaris_Int_Limits_2List,
+     apzSolaris_Int_Limits_2Machs,
+     SOLARIS_INT_LIMITS_2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aSolaris_Int_Limits_2Tests,   apzSolaris_Int_Limits_2Patch, 0 },
+
+  {  zSolaris_Int_Limits_3Name,    zSolaris_Int_Limits_3List,
+     apzSolaris_Int_Limits_3Machs,
+     SOLARIS_INT_LIMITS_3_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aSolaris_Int_Limits_3Tests,   apzSolaris_Int_Limits_3Patch, 0 },
 
   {  zSolaris_Math_1Name,    zSolaris_Math_1List,
      apzSolaris_Math_1Machs,
      SOLARIS_MATH_1_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aSolaris_Math_1Tests,   apzSolaris_Math_1Patch, 0 },
 
+  {  zSolaris_Math_10Name,    zSolaris_Math_10List,
+     apzSolaris_Math_10Machs,
+     SOLARIS_MATH_10_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aSolaris_Math_10Tests,   apzSolaris_Math_10Patch, 0 },
+
   {  zSolaris_Math_2Name,    zSolaris_Math_2List,
      apzSolaris_Math_2Machs,
      SOLARIS_MATH_2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -9559,15 +10211,15 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      SOLARIS_MATH_9_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aSolaris_Math_9Tests,   apzSolaris_Math_9Patch, 0 },
 
-  {  zSolaris_Math_10Name,    zSolaris_Math_10List,
-     apzSolaris_Math_10Machs,
-     SOLARIS_MATH_10_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aSolaris_Math_10Tests,   apzSolaris_Math_10Patch, 0 },
+  {  zSolaris_Once_Init_1Name,    zSolaris_Once_Init_1List,
+     apzSolaris_Once_Init_1Machs,
+     SOLARIS_ONCE_INIT_1_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aSolaris_Once_Init_1Tests,   apzSolaris_Once_Init_1Patch, 0 },
 
-  {  zSolaris_Mutex_Init_2Name,    zSolaris_Mutex_Init_2List,
-     apzSolaris_Mutex_Init_2Machs,
-     SOLARIS_MUTEX_INIT_2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aSolaris_Mutex_Init_2Tests,   apzSolaris_Mutex_Init_2Patch, 0 },
+  {  zSolaris_Posix_Spawn_RestrictName,    zSolaris_Posix_Spawn_RestrictList,
+     apzSolaris_Posix_Spawn_RestrictMachs,
+     SOLARIS_POSIX_SPAWN_RESTRICT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aSolaris_Posix_Spawn_RestrictTests,   apzSolaris_Posix_Spawn_RestrictPatch, 0 },
 
   {  zSolaris_Pow_Int_OverloadName,    zSolaris_Pow_Int_OverloadList,
      apzSolaris_Pow_Int_OverloadMachs,
@@ -9579,46 +10231,6 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      SOLARIS_RWLOCK_INIT_1_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aSolaris_Rwlock_Init_1Tests,   apzSolaris_Rwlock_Init_1Patch, 0 },
 
-  {  zSolaris_Once_Init_1Name,    zSolaris_Once_Init_1List,
-     apzSolaris_Once_Init_1Machs,
-     SOLARIS_ONCE_INIT_1_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aSolaris_Once_Init_1Tests,   apzSolaris_Once_Init_1Patch, 0 },
-
-  {  zSolaris_Once_Init_2Name,    zSolaris_Once_Init_2List,
-     apzSolaris_Once_Init_2Machs,
-     SOLARIS_ONCE_INIT_2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aSolaris_Once_Init_2Tests,   apzSolaris_Once_Init_2Patch, 0 },
-
-  {  zSolaris_Int_ConstName,    zSolaris_Int_ConstList,
-     apzSolaris_Int_ConstMachs,
-     SOLARIS_INT_CONST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aSolaris_Int_ConstTests,   apzSolaris_Int_ConstPatch, 0 },
-
-  {  zSolaris_Int_Limits_1Name,    zSolaris_Int_Limits_1List,
-     apzSolaris_Int_Limits_1Machs,
-     SOLARIS_INT_LIMITS_1_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aSolaris_Int_Limits_1Tests,   apzSolaris_Int_Limits_1Patch, 0 },
-
-  {  zSolaris_Int_Limits_2Name,    zSolaris_Int_Limits_2List,
-     apzSolaris_Int_Limits_2Machs,
-     SOLARIS_INT_LIMITS_2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aSolaris_Int_Limits_2Tests,   apzSolaris_Int_Limits_2Patch, 0 },
-
-  {  zSolaris_Int_Limits_3Name,    zSolaris_Int_Limits_3List,
-     apzSolaris_Int_Limits_3Machs,
-     SOLARIS_INT_LIMITS_3_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aSolaris_Int_Limits_3Tests,   apzSolaris_Int_Limits_3Patch, 0 },
-
-  {  zSolaris_Int_TypesName,    zSolaris_Int_TypesList,
-     apzSolaris_Int_TypesMachs,
-     SOLARIS_INT_TYPES_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aSolaris_Int_TypesTests,   apzSolaris_Int_TypesPatch, 0 },
-
-  {  zSolaris_Posix_Spawn_RestrictName,    zSolaris_Posix_Spawn_RestrictList,
-     apzSolaris_Posix_Spawn_RestrictMachs,
-     SOLARIS_POSIX_SPAWN_RESTRICT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aSolaris_Posix_Spawn_RestrictTests,   apzSolaris_Posix_Spawn_RestrictPatch, 0 },
-
   {  zSolaris_Std___FilbufName,    zSolaris_Std___FilbufList,
      apzSolaris_Std___FilbufMachs,
      SOLARIS_STD___FILBUF_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -9629,11 +10241,6 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      SOLARIS_STDIO_TAG_TEST_CT, FD_MACH_ONLY,
      aSolaris_Stdio_TagTests,   apzSolaris_Stdio_TagPatch, 0 },
 
-  {  zSolaris_Sys_Va_ListName,    zSolaris_Sys_Va_ListList,
-     apzSolaris_Sys_Va_ListMachs,
-     SOLARIS_SYS_VA_LIST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aSolaris_Sys_Va_ListTests,   apzSolaris_Sys_Va_ListPatch, 0 },
-
   {  zStatsswtchName,    zStatsswtchList,
      apzStatsswtchMachs,
      STATSSWTCH_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -9714,6 +10321,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      SUNOS_STRLEN_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aSunos_StrlenTests,   apzSunos_StrlenPatch, 0 },
 
+  {  zSuse_Linux_Vt_CxxName,    zSuse_Linux_Vt_CxxList,
+     apzSuse_Linux_Vt_CxxMachs,
+     SUSE_LINUX_VT_CXX_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aSuse_Linux_Vt_CxxTests,   apzSuse_Linux_Vt_CxxPatch, 0 },
+
   {  zSvr4_Disable_OptName,    zSvr4_Disable_OptList,
      apzSvr4_Disable_OptMachs,
      SVR4_DISABLE_OPT_TEST_CT, FD_MACH_ONLY,
@@ -9774,56 +10386,56 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      VA_I960_MACRO_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aVa_I960_MacroTests,   apzVa_I960_MacroPatch, 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_Decc_BuiltinName,    zVms_Decc_BuiltinList,
+     apzVms_Decc_BuiltinMachs,
+     VMS_DECC_BUILTIN_TEST_CT, FD_MACH_ONLY,
+     aVms_Decc_BuiltinTests,   apzVms_Decc_BuiltinPatch, 0 },
+
   {  zVms_Define_Can_Use_Extern_PrefixName,    zVms_Define_Can_Use_Extern_PrefixList,
      apzVms_Define_Can_Use_Extern_PrefixMachs,
      VMS_DEFINE_CAN_USE_EXTERN_PREFIX_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aVms_Define_Can_Use_Extern_PrefixTests,   apzVms_Define_Can_Use_Extern_PrefixPatch, 0 },
 
-  {  zVms_Use_Pragma_Extern_ModelName,    zVms_Use_Pragma_Extern_ModelList,
-     apzVms_Use_Pragma_Extern_ModelMachs,
-     VMS_USE_PRAGMA_EXTERN_MODEL_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aVms_Use_Pragma_Extern_ModelTests,   apzVms_Use_Pragma_Extern_ModelPatch, 0 },
-
   {  zVms_Disable_Decc_String_BuiltinsName,    zVms_Disable_Decc_String_BuiltinsList,
      apzVms_Disable_Decc_String_BuiltinsMachs,
      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_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_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 },
 
+  {  zVms_Use_Pragma_Extern_ModelName,    zVms_Use_Pragma_Extern_ModelList,
+     apzVms_Use_Pragma_Extern_ModelMachs,
+     VMS_USE_PRAGMA_EXTERN_MODEL_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aVms_Use_Pragma_Extern_ModelTests,   apzVms_Use_Pragma_Extern_ModelPatch, 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 },
+
   {  zVoid_NullName,    zVoid_NullList,
      apzVoid_NullMachs,
      VOID_NULL_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -9834,6 +10446,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,
@@ -9844,11 +10466,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,