Update the generated file, too

From-SVN: r21615

1 files changed, 983 insertions, 432 deletions

diff --git a/contrib/fixinc/fixincl.x b/contrib/fixinc/fixincl.x
index f366df3..e7a4864 100644
--- a/contrib/fixinc/fixincl.x
+++ b/contrib/fixinc/fixincl.x
@@ -1,7 +1,7 @@
 /*
  * DO NOT EDIT THIS FILE   (fixincl.x)
  * 
- * It has been autogen-ed  Tuesday June 02, 1998 at 06:45:43 AM PDT
+ * It has been autogen-ed  Wednesday August  5, 1998 at 10:43:15 AM PDT
  * From the definitions    inclhack.def
  * and the template file   fixincl.tpl
  *
@@ -40,6 +40,10 @@ tSCC zAix_SyswaitName[] =
  */
 tSCC zAix_SyswaitList[] =
         "|" "sys/wait.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzAix_SyswaitMachs (const char**)NULL
 
 /*
  *  content selection pattern
@@ -70,6 +74,10 @@ tSCC zAix_VolatileName[] =
  */
 tSCC zAix_VolatileList[] =
         "|" "sys/signal.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzAix_VolatileMachs (const char**)NULL
 
 /*
  *  content selection pattern
@@ -100,6 +108,10 @@ tSCC zAlpha_GetoptName[] =
 tSCC zAlpha_GetoptList[] =
         "|" "stdio.h"
         "|" "stdlib.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzAlpha_GetoptMachs (const char**)NULL
 
 /*
  *  content selection pattern
@@ -129,6 +141,10 @@ tSCC zAlpha_ParensName[] =
  */
 tSCC zAlpha_ParensList[] =
         "|" "sym.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzAlpha_ParensMachs (const char**)NULL
 
 /*
  *  content selection pattern
@@ -158,6 +174,10 @@ tSCC zAlpha_SbrkName[] =
  */
 tSCC zAlpha_SbrkList[] =
         "|" "unistd.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzAlpha_SbrkMachs (const char**)NULL
 
 /*
  *  content selection pattern
@@ -187,6 +207,10 @@ tSCC zArm_Norcroft_HintName[] =
  */
 tSCC zArm_Norcroft_HintList[] =
         "|" "X11/Intrinsic.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzArm_Norcroft_HintMachs (const char**)NULL
 #define ARM_NORCROFT_HINT_TEST_CT  0
 #define aArm_Norcroft_HintTests   (tTestDesc*)NULL
 
@@ -208,6 +232,10 @@ tSCC zArm_WcharName[] =
  */
 tSCC zArm_WcharList[] =
         "|" "stdlib.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzArm_WcharMachs (const char**)NULL
 
 /*
  *  content selection pattern
@@ -238,6 +266,10 @@ tSCC zAux_AsmName[] =
  */
 tSCC zAux_AsmList[] =
         "|" "sys/param.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzAux_AsmMachs (const char**)NULL
 
 /*
  *  content selection pattern
@@ -267,6 +299,10 @@ tSCC zAvoid_BoolName[] =
  */
 tSCC zAvoid_BoolList[] =
         "|" "curses.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzAvoid_BoolMachs (const char**)NULL
 #define AVOID_BOOL_TEST_CT  0
 #define aAvoid_BoolTests   (tTestDesc*)NULL
 
@@ -295,6 +331,10 @@ tSCC zBad_Malloc_DeclName[] =
  */
 tSCC zBad_Malloc_DeclList[] =
         "|" "rpc/types.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzBad_Malloc_DeclMachs (const char**)NULL
 
 /*
  *  content bypass pattern
@@ -332,6 +372,10 @@ tSCC zBad_Struct_TermName[] =
  */
 tSCC zBad_Struct_TermList[] =
         "|" "curses.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzBad_Struct_TermMachs (const char**)NULL
 
 /*
  *  content selection pattern
@@ -361,6 +405,10 @@ tSCC zBadquoteName[] =
  */
 tSCC zBadquoteList[] =
         "|" "sundev/vuid_event.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzBadquoteMachs (const char**)NULL
 #define BADQUOTE_TEST_CT  0
 #define aBadquoteTests   (tTestDesc*)NULL
 
@@ -395,6 +443,10 @@ tSCC zBad_LvalList[] =
         "|" "stropts.h"
         "|" "time.h"
         "|" "unistd.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzBad_LvalMachs (const char**)NULL
 
 /*
  *  content selection pattern
@@ -424,6 +476,10 @@ tSCC zBroken_Assert_StdioName[] =
  */
 tSCC zBroken_Assert_StdioList[] =
         "|" "assert.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzBroken_Assert_StdioMachs (const char**)NULL
 
 /*
  *  content selection pattern
@@ -461,6 +517,10 @@ tSCC zBroken_Assert_StdlibName[] =
  */
 tSCC zBroken_Assert_StdlibList[] =
         "|" "assert.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzBroken_Assert_StdlibMachs (const char**)NULL
 
 /*
  *  content selection pattern
@@ -499,6 +559,10 @@ tSCC zBsd43_Io_MacrosName[] =
  *  File name selection pattern
  */
 #define zBsd43_Io_MacrosList (char*)NULL
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzBsd43_Io_MacrosMachs (const char**)NULL
 
 /*
  *  content selection pattern
@@ -529,6 +593,10 @@ tSCC zCxx_Cmnt_HpuxName[] =
  */
 tSCC zCxx_Cmnt_HpuxList[] =
         "|" "sys/pci.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzCxx_Cmnt_HpuxMachs (const char**)NULL
 
 /*
  *  content selection pattern
@@ -558,6 +626,10 @@ tSCC zCxx_Cmnt_IrixName[] =
  */
 tSCC zCxx_Cmnt_IrixList[] =
         "|" "fam.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzCxx_Cmnt_IrixMachs (const char**)NULL
 
 /*
  *  content selection pattern
@@ -588,6 +660,10 @@ tSCC zCxx_Cmnt_SunosName[] =
 tSCC zCxx_Cmnt_SunosList[] =
         "|" "sbusdev/audiovar.h"
         "|" "sys/audiovar.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzCxx_Cmnt_SunosMachs (const char**)NULL
 #define CXX_CMNT_SUNOS_TEST_CT  0
 #define aCxx_Cmnt_SunosTests   (tTestDesc*)NULL
 
@@ -609,6 +685,10 @@ tSCC zCxx_Cmnt_VxworksName[] =
  */
 tSCC zCxx_Cmnt_VxworksList[] =
         "|" "drv/netif/if_med.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzCxx_Cmnt_VxworksMachs (const char**)NULL
 
 /*
  *  content selection pattern
@@ -639,6 +719,10 @@ tSCC zEcd_CursorName[] =
 tSCC zEcd_CursorList[] =
         "|" "sunwindow/win_lock.h"
         "|" "sunwindow/win_cursor.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzEcd_CursorMachs (const char**)NULL
 #define ECD_CURSOR_TEST_CT  0
 #define aEcd_CursorTests   (tTestDesc*)NULL
 
@@ -659,6 +743,10 @@ tSCC zElse_LabelName[] =
  *  File name selection pattern
  */
 #define zElse_LabelList (char*)NULL
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzElse_LabelMachs (const char**)NULL
 
 /*
  *  content selection pattern
@@ -693,6 +781,10 @@ tSCC zEndif_LabelName[] =
  *  File name selection pattern
  */
 #define zEndif_LabelList (char*)NULL
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzEndif_LabelMachs (const char**)NULL
 
 /*
  *  content selection pattern
@@ -729,6 +821,10 @@ tSCC zHp_InlineName[] =
  */
 tSCC zHp_InlineList[] =
         "|" "sys/spinlock.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzHp_InlineMachs (const char**)NULL
 
 /*
  *  content selection pattern
@@ -759,6 +855,10 @@ tSCC zHp_SysfileName[] =
  */
 tSCC zHp_SysfileList[] =
         "|" "sys/file.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzHp_SysfileMachs (const char**)NULL
 
 /*
  *  content selection pattern
@@ -788,6 +888,10 @@ tSCC zHpux_Cxx_UnreadyName[] =
  */
 tSCC zHpux_Cxx_UnreadyList[] =
         "|" "sys/mman.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzHpux_Cxx_UnreadyMachs (const char**)NULL
 
 /*
  *  content bypass pattern
@@ -825,6 +929,10 @@ tSCC zHpux_MaxintName[] =
  */
 tSCC zHpux_MaxintList[] =
         "|" "sys/param.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzHpux_MaxintMachs (const char**)NULL
 #define HPUX_MAXINT_TEST_CT  0
 #define aHpux_MaxintTests   (tTestDesc*)NULL
 
@@ -849,6 +957,10 @@ tSCC zHpux_SystimeName[] =
  */
 tSCC zHpux_SystimeList[] =
         "|" "sys/time.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzHpux_SystimeMachs (const char**)NULL
 
 /*
  *  content selection pattern
@@ -883,6 +995,10 @@ tSCC zInteractv_Add1List[] =
         "|" "sys/limits.h"
         "|" "sys/fcntl.h"
         "|" "sys/dirent.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzInteractv_Add1Machs (const char**)NULL
 
 /*
  *  content test pattern.  A shell will deal with it later.
@@ -915,6 +1031,10 @@ tSCC zInteractv_Add2Name[] =
  */
 tSCC zInteractv_Add2List[] =
         "|" "math.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzInteractv_Add2Machs (const char**)NULL
 
 /*
  *  content test pattern.  A shell will deal with it later.
@@ -947,6 +1067,10 @@ tSCC zInteractv_Add3Name[] =
  */
 tSCC zInteractv_Add3List[] =
         "|" "sys/limits.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzInteractv_Add3Machs (const char**)NULL
 
 /*
  *  content test pattern.  A shell will deal with it later.
@@ -979,6 +1103,10 @@ tSCC zIo_Def_QuotesName[] =
  *  File name selection pattern
  */
 #define zIo_Def_QuotesList (char*)NULL
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzIo_Def_QuotesMachs (const char**)NULL
 
 /*
  *  content selection pattern
@@ -1009,6 +1137,10 @@ tSCC zIoctl_Fix_CtrlName[] =
  *  File name selection pattern
  */
 #define zIoctl_Fix_CtrlList (char*)NULL
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzIoctl_Fix_CtrlMachs (const char**)NULL
 
 /*
  *  content selection pattern
@@ -1042,6 +1174,10 @@ tSCC zIp_Missing_SemiName[] =
  */
 tSCC zIp_Missing_SemiList[] =
         "|" "netinet/ip.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzIp_Missing_SemiMachs (const char**)NULL
 #define IP_MISSING_SEMI_TEST_CT  0
 #define aIp_Missing_SemiTests   (tTestDesc*)NULL
 
@@ -1064,6 +1200,10 @@ tSCC zIrix_Bogus_Cxx_CmntName[] =
 tSCC zIrix_Bogus_Cxx_CmntList[] =
         "|" "elf_abi.h"
         "|" "elf.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzIrix_Bogus_Cxx_CmntMachs (const char**)NULL
 #define IRIX_BOGUS_CXX_CMNT_TEST_CT  0
 #define aIrix_Bogus_Cxx_CmntTests   (tTestDesc*)NULL
 
@@ -1085,6 +1225,10 @@ tSCC zIrix_Multiline_CmntName[] =
  */
 tSCC zIrix_Multiline_CmntList[] =
         "|" "sys/types.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzIrix_Multiline_CmntMachs (const char**)NULL
 #define IRIX_MULTILINE_CMNT_TEST_CT  0
 #define aIrix_Multiline_CmntTests   (tTestDesc*)NULL
 
@@ -1107,6 +1251,10 @@ tSCC zIrix_SockaddrName[] =
  */
 tSCC zIrix_SockaddrList[] =
         "|" "rpc/auth.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzIrix_SockaddrMachs (const char**)NULL
 
 /*
  *  content selection pattern
@@ -1137,6 +1285,10 @@ tSCC zIrix_Struct__FileName[] =
  */
 tSCC zIrix_Struct__FileList[] =
         "|" "rpc/xdr.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzIrix_Struct__FileMachs (const char**)NULL
 #define IRIX_STRUCT__FILE_TEST_CT  0
 #define aIrix_Struct__FileTests   (tTestDesc*)NULL
 
@@ -1159,6 +1311,10 @@ tSCC zIsc_FmodName[] =
  */
 tSCC zIsc_FmodList[] =
         "|" "math.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzIsc_FmodMachs (const char**)NULL
 
 /*
  *  content selection pattern
@@ -1189,6 +1345,10 @@ tSCC zMotorola_NestedName[] =
 tSCC zMotorola_NestedList[] =
         "|" "limits.h"
         "|" "sys/limits.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzMotorola_NestedMachs (const char**)NULL
 #define MOTOROLA_NESTED_TEST_CT  0
 #define aMotorola_NestedTests   (tTestDesc*)NULL
 
@@ -1211,6 +1371,10 @@ tSCC zIsc_Sys_LimitsName[] =
  */
 tSCC zIsc_Sys_LimitsList[] =
         "|" "sys/limits.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzIsc_Sys_LimitsMachs (const char**)NULL
 
 /*
  *  content selection pattern
@@ -1258,6 +1422,10 @@ tSCC zKandr_ConcatList[] =
         "|" "sys/tty.h"
         "|" "Xm.acorn/XmP.h"
         "|" "bsd43/bsd43_.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzKandr_ConcatMachs (const char**)NULL
 
 /*
  *  content selection pattern
@@ -1287,6 +1455,10 @@ tSCC zLimits_IfndefsName[] =
  */
 tSCC zLimits_IfndefsList[] =
         "|" "limits.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzLimits_IfndefsMachs (const char**)NULL
 
 /*
  *  content bypass pattern
@@ -1340,6 +1512,10 @@ tSCC zLynx_Void_IntName[] =
  */
 tSCC zLynx_Void_IntList[] =
         "|" "curses.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzLynx_Void_IntMachs (const char**)NULL
 
 /*
  *  content selection pattern
@@ -1369,6 +1545,10 @@ tSCC zLynxos_Fcntl_ProtoName[] =
  */
 tSCC zLynxos_Fcntl_ProtoList[] =
         "|" "fcntl.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzLynxos_Fcntl_ProtoMachs (const char**)NULL
 #define LYNXOS_FCNTL_PROTO_TEST_CT  0
 #define aLynxos_Fcntl_ProtoTests   (tTestDesc*)NULL
 
@@ -1390,6 +1570,12 @@ tSCC zM88k_Bad_Hypot_OptName[] =
  */
 tSCC zM88k_Bad_Hypot_OptList[] =
         "|" "math.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzM88k_Bad_Hypot_OptMachs[] = {
+        "m88k-motorola-sysv3*",
+        (const char*)NULL };
 #define M88K_BAD_HYPOT_OPT_TEST_CT  0
 #define aM88k_Bad_Hypot_OptTests   (tTestDesc*)NULL
 
@@ -1424,6 +1610,12 @@ tSCC zM88k_Bad_S_IfName[] =
  */
 tSCC zM88k_Bad_S_IfList[] =
         "|" "sys/stat.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzM88k_Bad_S_IfMachs[] = {
+        "m88k-*-sysv3*",
+        (const char*)NULL };
 
 /*
  *  content selection pattern
@@ -1454,6 +1646,12 @@ tSCC zM88k_Multi_InclName[] =
  */
 tSCC zM88k_Multi_InclList[] =
         "|" "time.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzM88k_Multi_InclMachs[] = {
+        "m88k-tektronix-sysv3*",
+        (const char*)NULL };
 
 /*
  *  content bypass pattern
@@ -1490,6 +1688,10 @@ tSCC zMachine_NameName[] =
  *  File name selection pattern
  */
 #define zMachine_NameList (char*)NULL
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzMachine_NameMachs (const char**)NULL
 
 /*
  *  content selection pattern
@@ -1553,6 +1755,10 @@ tSCC zMath_ExceptionName[] =
  */
 tSCC zMath_ExceptionList[] =
         "|" "math.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzMath_ExceptionMachs (const char**)NULL
 
 /*
  *  content selection pattern
@@ -1597,6 +1803,10 @@ tSCC zMath_Gcc_IfndefsName[] =
  */
 tSCC zMath_Gcc_IfndefsList[] =
         "|" "math.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzMath_Gcc_IfndefsMachs (const char**)NULL
 #define MATH_GCC_IFNDEFS_TEST_CT  0
 #define aMath_Gcc_IfndefsTests   (tTestDesc*)NULL
 
@@ -1637,6 +1847,12 @@ tSCC zMotorola_Stupid_OptName[] =
  */
 tSCC zMotorola_Stupid_OptList[] =
         "|" "math.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzMotorola_Stupid_OptMachs[] = {
+        "m88k-motorola-sysv3*",
+        (const char*)NULL };
 
 /*
  *  content selection pattern
@@ -1678,6 +1894,10 @@ tSCC zNested_CommentName[] =
  */
 tSCC zNested_CommentList[] =
         "|" "rpc/rpc.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzNested_CommentMachs (const char**)NULL
 #define NESTED_COMMENT_TEST_CT  0
 #define aNested_CommentTests   (tTestDesc*)NULL
 
@@ -1699,6 +1919,10 @@ tSCC zNews_Os_RecursionName[] =
  */
 tSCC zNews_Os_RecursionList[] =
         "|" "stdlib.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzNews_Os_RecursionMachs (const char**)NULL
 
 /*
  *  content selection pattern
@@ -1731,6 +1955,10 @@ tSCC zNext_Math_PrefixName[] =
  */
 tSCC zNext_Math_PrefixList[] =
         "|" "ansi/math.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzNext_Math_PrefixMachs (const char**)NULL
 
 /*
  *  content selection pattern
@@ -1764,6 +1992,10 @@ tSCC zNext_TemplateName[] =
  */
 tSCC zNext_TemplateList[] =
         "|" "bsd/libc.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzNext_TemplateMachs (const char**)NULL
 
 /*
  *  content selection pattern
@@ -1794,6 +2026,10 @@ tSCC zNext_VolitileName[] =
  */
 tSCC zNext_VolitileList[] =
         "|" "ansi/stdlib.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzNext_VolitileMachs (const char**)NULL
 
 /*
  *  content selection pattern
@@ -1824,6 +2060,10 @@ tSCC zNext_Wait_UnionName[] =
  */
 tSCC zNext_Wait_UnionList[] =
         "|" "sys/wait.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzNext_Wait_UnionMachs (const char**)NULL
 
 /*
  *  content selection pattern
@@ -1852,6 +2092,10 @@ tSCC zNo_Double_SlashName[] =
  *  File name selection pattern
  */
 #define zNo_Double_SlashList (char*)NULL
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzNo_Double_SlashMachs (const char**)NULL
 
 /*
  *  content selection pattern
@@ -1888,6 +2132,10 @@ tSCC zNodeent_SyntaxName[] =
  */
 tSCC zNodeent_SyntaxList[] =
         "|" "netdnet/dnetdb.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzNodeent_SyntaxMachs (const char**)NULL
 #define NODEENT_SYNTAX_TEST_CT  0
 #define aNodeent_SyntaxTests   (tTestDesc*)NULL
 
@@ -1910,6 +2158,10 @@ tSCC zOsf_Namespace_AName[] =
 tSCC zOsf_Namespace_AList[] =
         "|" "reg_types.h"
         "|" "sys/lc_core.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzOsf_Namespace_AMachs (const char**)NULL
 
 /*
  *  content test pattern.  A shell will deal with it later.
@@ -1941,6 +2193,10 @@ tSCC zOsf_Namespace_BName[] =
  */
 tSCC zOsf_Namespace_BList[] =
         "|" "regex.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzOsf_Namespace_BMachs (const char**)NULL
 
 /*
  *  content test pattern.  A shell will deal with it later.
@@ -1973,6 +2229,10 @@ tSCC zPthread_Page_SizeName[] =
  */
 tSCC zPthread_Page_SizeList[] =
         "|" "pthread.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzPthread_Page_SizeMachs (const char**)NULL
 
 /*
  *  content selection pattern
@@ -2002,6 +2262,10 @@ tSCC zRs6000_DoubleName[] =
  */
 tSCC zRs6000_DoubleList[] =
         "|" "math.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzRs6000_DoubleMachs (const char**)NULL
 
 /*
  *  content selection pattern
@@ -2034,6 +2298,10 @@ tSCC zRs6000_FchmodName[] =
  */
 tSCC zRs6000_FchmodList[] =
         "|" "sys/stat.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzRs6000_FchmodMachs (const char**)NULL
 
 /*
  *  content selection pattern
@@ -2064,6 +2332,10 @@ tSCC zRs6000_ParamName[] =
 tSCC zRs6000_ParamList[] =
         "|" "stdio.h"
         "|" "unistd.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzRs6000_ParamMachs (const char**)NULL
 #define RS6000_PARAM_TEST_CT  0
 #define aRs6000_ParamTests   (tTestDesc*)NULL
 
@@ -2085,6 +2357,10 @@ tSCC zSony_IncludeName[] =
  */
 tSCC zSony_IncludeList[] =
         "|" "machine/machparam.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzSony_IncludeMachs (const char**)NULL
 
 /*
  *  content selection pattern
@@ -2114,6 +2390,10 @@ tSCC zStatsswtchName[] =
  */
 tSCC zStatsswtchList[] =
         "|" "rpcsvc/rstat.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzStatsswtchMachs (const char**)NULL
 
 /*
  *  content selection pattern
@@ -2143,6 +2423,10 @@ tSCC zStdio_Va_ListName[] =
  */
 tSCC zStdio_Va_ListList[] =
         "|" "stdio.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzStdio_Va_ListMachs (const char**)NULL
 #define STDIO_VA_LIST_TEST_CT  0
 #define aStdio_Va_ListTests   (tTestDesc*)NULL
 
@@ -2182,6 +2466,10 @@ tSCC zSun_Bogus_IfdefName[] =
 tSCC zSun_Bogus_IfdefList[] =
         "|" "hsfs/hsfs_spec.h"
         "|" "hsfs/iso_spec.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzSun_Bogus_IfdefMachs (const char**)NULL
 
 /*
  *  content selection pattern
@@ -2211,6 +2499,10 @@ tSCC zSun_Bogus_Ifdef_Sun4cName[] =
  */
 tSCC zSun_Bogus_Ifdef_Sun4cList[] =
         "|" "hsfs/hsnode.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzSun_Bogus_Ifdef_Sun4cMachs (const char**)NULL
 
 /*
  *  content selection pattern
@@ -2240,6 +2532,10 @@ tSCC zSun_CatmacroName[] =
  */
 tSCC zSun_CatmacroList[] =
         "|" "pixrect/memvar.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzSun_CatmacroMachs (const char**)NULL
 
 /*
  *  content selection pattern
@@ -2274,6 +2570,10 @@ tSCC zSun_MallocName[] =
  */
 tSCC zSun_MallocList[] =
         "|" "malloc.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzSun_MallocMachs (const char**)NULL
 #define SUN_MALLOC_TEST_CT  0
 #define aSun_MallocTests   (tTestDesc*)NULL
 
@@ -2298,6 +2598,10 @@ tSCC zSun_MemcpyName[] =
  */
 tSCC zSun_MemcpyList[] =
         "|" "memory.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzSun_MemcpyMachs (const char**)NULL
 
 /*
  *  content selection pattern
@@ -2347,6 +2651,10 @@ tSCC zSun_Rusers_SemiName[] =
  */
 tSCC zSun_Rusers_SemiList[] =
         "|" "rpcsvc/rusers.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzSun_Rusers_SemiMachs (const char**)NULL
 
 /*
  *  content selection pattern
@@ -2377,6 +2685,10 @@ tSCC zSun_SignalName[] =
 tSCC zSun_SignalList[] =
         "|" "sys/signal.h"
         "|" "signal.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzSun_SignalMachs (const char**)NULL
 
 /*
  *  content selection pattern
@@ -2411,6 +2723,10 @@ tSCC zSun_Xdr_ProtoName[] =
  */
 tSCC zSun_Xdr_ProtoList[] =
         "|" "rpc/xdr.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzSun_Xdr_ProtoMachs (const char**)NULL
 #define SUN_XDR_PROTO_TEST_CT  0
 #define aSun_Xdr_ProtoTests   (tTestDesc*)NULL
 
@@ -2437,6 +2753,10 @@ tSCC zSunos_Large_MacroName[] =
  */
 tSCC zSunos_Large_MacroList[] =
         "|" "sundev/ipi_error.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzSunos_Large_MacroMachs (const char**)NULL
 #define SUNOS_LARGE_MACRO_TEST_CT  0
 #define aSunos_Large_MacroTests   (tTestDesc*)NULL
 
@@ -2460,6 +2780,10 @@ tSCC zSunos_Matherr_DeclName[] =
  */
 tSCC zSunos_Matherr_DeclList[] =
         "|" "math.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzSunos_Matherr_DeclMachs (const char**)NULL
 
 /*
  *  content test pattern.  A shell will deal with it later.
@@ -2490,6 +2814,10 @@ tSCC zSunos_StrlenName[] =
  */
 tSCC zSunos_StrlenList[] =
         "|" "strings.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzSunos_StrlenMachs (const char**)NULL
 #define SUNOS_STRLEN_TEST_CT  0
 #define aSunos_StrlenTests   (tTestDesc*)NULL
 
@@ -2516,6 +2844,10 @@ tSCC zSystypesList[] =
         "|" "stddef.h"
         "|" "memory.h"
         "|" "unistd.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzSystypesMachs (const char**)NULL
 
 /*
  *  content selection pattern
@@ -2569,6 +2901,10 @@ tSCC zSystypes_For_AixName[] =
  */
 tSCC zSystypes_For_AixList[] =
         "|" "sys/types.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzSystypes_For_AixMachs (const char**)NULL
 
 /*
  *  content selection pattern
@@ -2609,6 +2945,10 @@ tSCC zSysv68_StringName[] =
  */
 tSCC zSysv68_StringList[] =
         "|" "string.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzSysv68_StringMachs (const char**)NULL
 #define SYSV68_STRING_TEST_CT  0
 #define aSysv68_StringTests   (tTestDesc*)NULL
 
@@ -2640,6 +2980,13 @@ tSCC zSysz_Stdlib_For_SunName[] =
  */
 tSCC zSysz_Stdlib_For_SunList[] =
         "|" "stdlib.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzSysz_Stdlib_For_SunMachs[] = {
+        "*-sun-*",
+        "m88k-*-sysv3*",
+        (const char*)NULL };
 #define SYSZ_STDLIB_FOR_SUN_TEST_CT  0
 #define aSysz_Stdlib_For_SunTests   (tTestDesc*)NULL
 
@@ -2671,6 +3018,10 @@ tSCC zSysz_Stdtypes_For_SunName[] =
  */
 tSCC zSysz_Stdtypes_For_SunList[] =
         "|" "sys/stdtypes.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzSysz_Stdtypes_For_SunMachs (const char**)NULL
 #define SYSZ_STDTYPES_FOR_SUN_TEST_CT  0
 #define aSysz_Stdtypes_For_SunTests   (tTestDesc*)NULL
 
@@ -2706,6 +3057,10 @@ tSCC zTinfo_CplusplusName[] =
  */
 tSCC zTinfo_CplusplusList[] =
         "|" "tinfo.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzTinfo_CplusplusMachs (const char**)NULL
 #define TINFO_CPLUSPLUS_TEST_CT  0
 #define aTinfo_CplusplusTests   (tTestDesc*)NULL
 
@@ -2727,6 +3082,10 @@ tSCC zUltrix_Ansi_CompatName[] =
  */
 tSCC zUltrix_Ansi_CompatList[] =
         "|" "ansi_compat.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzUltrix_Ansi_CompatMachs (const char**)NULL
 
 /*
  *  content selection pattern
@@ -2758,6 +3117,10 @@ tSCC zUltrix_Atof_ParamName[] =
  */
 tSCC zUltrix_Atof_ParamList[] =
         "|" "math.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzUltrix_Atof_ParamMachs (const char**)NULL
 #define ULTRIX_ATOF_PARAM_TEST_CT  0
 #define aUltrix_Atof_ParamTests   (tTestDesc*)NULL
 
@@ -2783,6 +3146,10 @@ tSCC zUltrix_ConstName[] =
  */
 tSCC zUltrix_ConstList[] =
         "|" "stdio.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzUltrix_ConstMachs (const char**)NULL
 #define ULTRIX_CONST_TEST_CT  0
 #define aUltrix_ConstTests   (tTestDesc*)NULL
 
@@ -2812,6 +3179,10 @@ tSCC zUltrix_IfdefName[] =
  */
 tSCC zUltrix_IfdefList[] =
         "|" "sys/file.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzUltrix_IfdefMachs (const char**)NULL
 
 /*
  *  content selection pattern
@@ -2841,6 +3212,10 @@ tSCC zUltrix_Nested_CmntName[] =
  */
 tSCC zUltrix_Nested_CmntList[] =
         "|" "rpc/svc.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzUltrix_Nested_CmntMachs (const char**)NULL
 #define ULTRIX_NESTED_CMNT_TEST_CT  0
 #define aUltrix_Nested_CmntTests   (tTestDesc*)NULL
 
@@ -2862,6 +3237,10 @@ tSCC zUltrix_StaticName[] =
  */
 tSCC zUltrix_StaticList[] =
         "|" "machine/cpu.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzUltrix_StaticMachs (const char**)NULL
 
 /*
  *  content selection pattern
@@ -2892,6 +3271,10 @@ tSCC zUndefine_NullName[] =
  *  File name selection pattern
  */
 #define zUndefine_NullList (char*)NULL
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzUndefine_NullMachs (const char**)NULL
 
 /*
  *  content selection pattern
@@ -2929,6 +3312,10 @@ tSCC zVa_I960_MacroName[] =
  */
 tSCC zVa_I960_MacroList[] =
         "|" "arch/i960/archI960.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzVa_I960_MacroMachs (const char**)NULL
 
 /*
  *  content selection pattern
@@ -2971,6 +3358,10 @@ tSCC zVoid_NullList[] =
         "|" "sys/dir.h"
         "|" "sys/param.h"
         "|" "sys/types.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzVoid_NullMachs (const char**)NULL
 
 /*
  *  content selection pattern
@@ -3000,6 +3391,10 @@ tSCC zVxworks_Gcc_ProblemName[] =
  */
 tSCC zVxworks_Gcc_ProblemList[] =
         "|" "types/vxTypesBase.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzVxworks_Gcc_ProblemMachs (const char**)NULL
 
 /*
  *  content selection pattern
@@ -3044,6 +3439,10 @@ tSCC zVxworks_Needs_VxtypesName[] =
  */
 tSCC zVxworks_Needs_VxtypesList[] =
         "|" "time.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzVxworks_Needs_VxtypesMachs (const char**)NULL
 
 /*
  *  content selection pattern
@@ -3073,6 +3472,10 @@ tSCC zVxworks_Needs_VxworksName[] =
  */
 tSCC zVxworks_Needs_VxworksList[] =
         "|" "sys/stat.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzVxworks_Needs_VxworksMachs (const char**)NULL
 
 /*
  *  content selection pattern
@@ -3116,6 +3519,10 @@ tSCC zVxworks_TimeName[] =
  */
 tSCC zVxworks_TimeList[] =
         "|" "time.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzVxworks_TimeMachs (const char**)NULL
 
 /*
  *  content selection pattern
@@ -3161,6 +3568,10 @@ tSCC zX11_ClassName[] =
  */
 tSCC zX11_ClassList[] =
         "|" "X11/ShellP.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzX11_ClassMachs (const char**)NULL
 
 /*
  *  content bypass pattern
@@ -3195,6 +3606,10 @@ tSCC zX11_Class_UsageName[] =
  */
 tSCC zX11_Class_UsageList[] =
         "|" "Xm/BaseClassI.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzX11_Class_UsageMachs (const char**)NULL
 
 /*
  *  content bypass pattern
@@ -3224,6 +3639,10 @@ tSCC zX11_NewName[] =
  */
 tSCC zX11_NewList[] =
         "|" "Xm/Traversal.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzX11_NewMachs (const char**)NULL
 
 /*
  *  content bypass pattern
@@ -3259,6 +3678,10 @@ tSCC zX11_SprintfName[] =
  */
 tSCC zX11_SprintfList[] =
         "|" "X11*/Xmu.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzX11_SprintfMachs (const char**)NULL
 #define X11_SPRINTF_TEST_CT  0
 #define aX11_SprintfTests   (tTestDesc*)NULL
 
@@ -3282,6 +3705,10 @@ tSCC zZzz_Ki_IfaceName[] =
  */
 tSCC zZzz_Ki_IfaceList[] =
         "|" "sys/ki_iface.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzZzz_Ki_IfaceMachs (const char**)NULL
 
 /*
  *  content selection pattern
@@ -3313,6 +3740,10 @@ tSCC zZzz_KiName[] =
  */
 tSCC zZzz_KiList[] =
         "|" "sys/ki.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzZzz_KiMachs (const char**)NULL
 
 /*
  *  content selection pattern
@@ -3344,6 +3775,10 @@ tSCC zZzz_Ki_CallsName[] =
  */
 tSCC zZzz_Ki_CallsList[] =
         "|" "sys/ki_calls.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzZzz_Ki_CallsMachs (const char**)NULL
 
 /*
  *  content selection pattern
@@ -3375,6 +3810,10 @@ tSCC zZzz_Ki_DefsName[] =
  */
 tSCC zZzz_Ki_DefsList[] =
         "|" "sys/ki_defs.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzZzz_Ki_DefsMachs (const char**)NULL
 
 /*
  *  content selection pattern
@@ -3406,6 +3845,10 @@ tSCC zZzz_TimeName[] =
  */
 tSCC zZzz_TimeList[] =
         "|" "sys/time.h" "|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzZzz_TimeMachs (const char**)NULL
 
 /*
  *  content selection pattern
@@ -3433,435 +3876,543 @@ const char* apzZzz_TimePatch[] = { "sh", "-c",
 #define  REGEX_COUNT  76
 #define  FIX_COUNT    108
 tFixDesc fixDescList[ 108 ] = {
-  {  zAix_SyswaitName,    zAix_SyswaitList, (regex_t*)NULL,
-     AIX_SYSWAIT_TEST_CT, aAix_SyswaitTests,
-     apzAix_SyswaitPatch },
-
-  {  zAix_VolatileName,    zAix_VolatileList, (regex_t*)NULL,
-     AIX_VOLATILE_TEST_CT, aAix_VolatileTests,
-     apzAix_VolatilePatch },
-
-  {  zAlpha_GetoptName,    zAlpha_GetoptList, (regex_t*)NULL,
-     ALPHA_GETOPT_TEST_CT, aAlpha_GetoptTests,
-     apzAlpha_GetoptPatch },
-
-  {  zAlpha_ParensName,    zAlpha_ParensList, (regex_t*)NULL,
-     ALPHA_PARENS_TEST_CT, aAlpha_ParensTests,
-     apzAlpha_ParensPatch },
-
-  {  zAlpha_SbrkName,    zAlpha_SbrkList, (regex_t*)NULL,
-     ALPHA_SBRK_TEST_CT, aAlpha_SbrkTests,
-     apzAlpha_SbrkPatch },
-
-  {  zArm_Norcroft_HintName,    zArm_Norcroft_HintList, (regex_t*)NULL,
-     ARM_NORCROFT_HINT_TEST_CT, aArm_Norcroft_HintTests,
-     apzArm_Norcroft_HintPatch },
-
-  {  zArm_WcharName,    zArm_WcharList, (regex_t*)NULL,
-     ARM_WCHAR_TEST_CT, aArm_WcharTests,
-     apzArm_WcharPatch },
-
-  {  zAux_AsmName,    zAux_AsmList, (regex_t*)NULL,
-     AUX_ASM_TEST_CT, aAux_AsmTests,
-     apzAux_AsmPatch },
-
-  {  zAvoid_BoolName,    zAvoid_BoolList, (regex_t*)NULL,
-     AVOID_BOOL_TEST_CT, aAvoid_BoolTests,
-     apzAvoid_BoolPatch },
-
-  {  zBad_Malloc_DeclName,    zBad_Malloc_DeclList, (regex_t*)NULL,
-     BAD_MALLOC_DECL_TEST_CT, aBad_Malloc_DeclTests,
-     apzBad_Malloc_DeclPatch },
-
-  {  zBad_Struct_TermName,    zBad_Struct_TermList, (regex_t*)NULL,
-     BAD_STRUCT_TERM_TEST_CT, aBad_Struct_TermTests,
-     apzBad_Struct_TermPatch },
-
-  {  zBadquoteName,    zBadquoteList, (regex_t*)NULL,
-     BADQUOTE_TEST_CT, aBadquoteTests,
-     apzBadquotePatch },
-
-  {  zBad_LvalName,    zBad_LvalList, (regex_t*)NULL,
-     BAD_LVAL_TEST_CT, aBad_LvalTests,
-     apzBad_LvalPatch },
-
-  {  zBroken_Assert_StdioName,    zBroken_Assert_StdioList, (regex_t*)NULL,
-     BROKEN_ASSERT_STDIO_TEST_CT, aBroken_Assert_StdioTests,
-     apzBroken_Assert_StdioPatch },
-
-  {  zBroken_Assert_StdlibName,    zBroken_Assert_StdlibList, (regex_t*)NULL,
-     BROKEN_ASSERT_STDLIB_TEST_CT, aBroken_Assert_StdlibTests,
-     apzBroken_Assert_StdlibPatch },
-
-  {  zBsd43_Io_MacrosName,    zBsd43_Io_MacrosList, (regex_t*)NULL,
-     BSD43_IO_MACROS_TEST_CT, aBsd43_Io_MacrosTests,
-     apzBsd43_Io_MacrosPatch },
-
-  {  zCxx_Cmnt_HpuxName,    zCxx_Cmnt_HpuxList, (regex_t*)NULL,
-     CXX_CMNT_HPUX_TEST_CT, aCxx_Cmnt_HpuxTests,
-     apzCxx_Cmnt_HpuxPatch },
-
-  {  zCxx_Cmnt_IrixName,    zCxx_Cmnt_IrixList, (regex_t*)NULL,
-     CXX_CMNT_IRIX_TEST_CT, aCxx_Cmnt_IrixTests,
-     apzCxx_Cmnt_IrixPatch },
-
-  {  zCxx_Cmnt_SunosName,    zCxx_Cmnt_SunosList, (regex_t*)NULL,
-     CXX_CMNT_SUNOS_TEST_CT, aCxx_Cmnt_SunosTests,
-     apzCxx_Cmnt_SunosPatch },
-
-  {  zCxx_Cmnt_VxworksName,    zCxx_Cmnt_VxworksList, (regex_t*)NULL,
-     CXX_CMNT_VXWORKS_TEST_CT, aCxx_Cmnt_VxworksTests,
-     apzCxx_Cmnt_VxworksPatch },
-
-  {  zEcd_CursorName,    zEcd_CursorList, (regex_t*)NULL,
-     ECD_CURSOR_TEST_CT, aEcd_CursorTests,
-     apzEcd_CursorPatch },
-
-  {  zElse_LabelName,    zElse_LabelList, (regex_t*)NULL,
-     ELSE_LABEL_TEST_CT, aElse_LabelTests,
-     apzElse_LabelPatch },
-
-  {  zEndif_LabelName,    zEndif_LabelList, (regex_t*)NULL,
-     ENDIF_LABEL_TEST_CT, aEndif_LabelTests,
-     apzEndif_LabelPatch },
-
-  {  zHp_InlineName,    zHp_InlineList, (regex_t*)NULL,
-     HP_INLINE_TEST_CT, aHp_InlineTests,
-     apzHp_InlinePatch },
-
-  {  zHp_SysfileName,    zHp_SysfileList, (regex_t*)NULL,
-     HP_SYSFILE_TEST_CT, aHp_SysfileTests,
-     apzHp_SysfilePatch },
-
-  {  zHpux_Cxx_UnreadyName,    zHpux_Cxx_UnreadyList, (regex_t*)NULL,
-     HPUX_CXX_UNREADY_TEST_CT, aHpux_Cxx_UnreadyTests,
-     apzHpux_Cxx_UnreadyPatch },
-
-  {  zHpux_MaxintName,    zHpux_MaxintList, (regex_t*)NULL,
-     HPUX_MAXINT_TEST_CT, aHpux_MaxintTests,
-     apzHpux_MaxintPatch },
-
-  {  zHpux_SystimeName,    zHpux_SystimeList, (regex_t*)NULL,
-     HPUX_SYSTIME_TEST_CT, aHpux_SystimeTests,
-     apzHpux_SystimePatch },
-
-  {  zInteractv_Add1Name,    zInteractv_Add1List, (regex_t*)NULL,
-     INTERACTV_ADD1_TEST_CT, aInteractv_Add1Tests,
-     apzInteractv_Add1Patch },
-
-  {  zInteractv_Add2Name,    zInteractv_Add2List, (regex_t*)NULL,
-     INTERACTV_ADD2_TEST_CT, aInteractv_Add2Tests,
-     apzInteractv_Add2Patch },
-
-  {  zInteractv_Add3Name,    zInteractv_Add3List, (regex_t*)NULL,
-     INTERACTV_ADD3_TEST_CT, aInteractv_Add3Tests,
-     apzInteractv_Add3Patch },
-
-  {  zIo_Def_QuotesName,    zIo_Def_QuotesList, (regex_t*)NULL,
-     IO_DEF_QUOTES_TEST_CT, aIo_Def_QuotesTests,
-     apzIo_Def_QuotesPatch },
-
-  {  zIoctl_Fix_CtrlName,    zIoctl_Fix_CtrlList, (regex_t*)NULL,
-     IOCTL_FIX_CTRL_TEST_CT, aIoctl_Fix_CtrlTests,
-     apzIoctl_Fix_CtrlPatch },
-
-  {  zIp_Missing_SemiName,    zIp_Missing_SemiList, (regex_t*)NULL,
-     IP_MISSING_SEMI_TEST_CT, aIp_Missing_SemiTests,
-     apzIp_Missing_SemiPatch },
-
-  {  zIrix_Bogus_Cxx_CmntName,    zIrix_Bogus_Cxx_CmntList, (regex_t*)NULL,
-     IRIX_BOGUS_CXX_CMNT_TEST_CT, aIrix_Bogus_Cxx_CmntTests,
-     apzIrix_Bogus_Cxx_CmntPatch },
-
-  {  zIrix_Multiline_CmntName,    zIrix_Multiline_CmntList, (regex_t*)NULL,
-     IRIX_MULTILINE_CMNT_TEST_CT, aIrix_Multiline_CmntTests,
-     apzIrix_Multiline_CmntPatch },
-
-  {  zIrix_SockaddrName,    zIrix_SockaddrList, (regex_t*)NULL,
-     IRIX_SOCKADDR_TEST_CT, aIrix_SockaddrTests,
-     apzIrix_SockaddrPatch },
-
-  {  zIrix_Struct__FileName,    zIrix_Struct__FileList, (regex_t*)NULL,
-     IRIX_STRUCT__FILE_TEST_CT, aIrix_Struct__FileTests,
-     apzIrix_Struct__FilePatch },
-
-  {  zIsc_FmodName,    zIsc_FmodList, (regex_t*)NULL,
-     ISC_FMOD_TEST_CT, aIsc_FmodTests,
-     apzIsc_FmodPatch },
-
-  {  zMotorola_NestedName,    zMotorola_NestedList, (regex_t*)NULL,
-     MOTOROLA_NESTED_TEST_CT, aMotorola_NestedTests,
-     apzMotorola_NestedPatch },
-
-  {  zIsc_Sys_LimitsName,    zIsc_Sys_LimitsList, (regex_t*)NULL,
-     ISC_SYS_LIMITS_TEST_CT, aIsc_Sys_LimitsTests,
-     apzIsc_Sys_LimitsPatch },
-
-  {  zKandr_ConcatName,    zKandr_ConcatList, (regex_t*)NULL,
-     KANDR_CONCAT_TEST_CT, aKandr_ConcatTests,
-     apzKandr_ConcatPatch },
-
-  {  zLimits_IfndefsName,    zLimits_IfndefsList, (regex_t*)NULL,
-     LIMITS_IFNDEFS_TEST_CT, aLimits_IfndefsTests,
-     apzLimits_IfndefsPatch },
-
-  {  zLynx_Void_IntName,    zLynx_Void_IntList, (regex_t*)NULL,
-     LYNX_VOID_INT_TEST_CT, aLynx_Void_IntTests,
-     apzLynx_Void_IntPatch },
-
-  {  zLynxos_Fcntl_ProtoName,    zLynxos_Fcntl_ProtoList, (regex_t*)NULL,
-     LYNXOS_FCNTL_PROTO_TEST_CT, aLynxos_Fcntl_ProtoTests,
-     apzLynxos_Fcntl_ProtoPatch },
-
-  {  zM88k_Bad_Hypot_OptName,    zM88k_Bad_Hypot_OptList, (regex_t*)NULL,
-     M88K_BAD_HYPOT_OPT_TEST_CT, aM88k_Bad_Hypot_OptTests,
-     apzM88k_Bad_Hypot_OptPatch },
-
-  {  zM88k_Bad_S_IfName,    zM88k_Bad_S_IfList, (regex_t*)NULL,
-     M88K_BAD_S_IF_TEST_CT, aM88k_Bad_S_IfTests,
-     apzM88k_Bad_S_IfPatch },
-
-  {  zM88k_Multi_InclName,    zM88k_Multi_InclList, (regex_t*)NULL,
-     M88K_MULTI_INCL_TEST_CT, aM88k_Multi_InclTests,
-     apzM88k_Multi_InclPatch },
-
-  {  zMachine_NameName,    zMachine_NameList, (regex_t*)NULL,
-     MACHINE_NAME_TEST_CT, aMachine_NameTests,
-     apzMachine_NamePatch },
-
-  {  zMath_ExceptionName,    zMath_ExceptionList, (regex_t*)NULL,
-     MATH_EXCEPTION_TEST_CT, aMath_ExceptionTests,
-     apzMath_ExceptionPatch },
-
-  {  zMath_Gcc_IfndefsName,    zMath_Gcc_IfndefsList, (regex_t*)NULL,
-     MATH_GCC_IFNDEFS_TEST_CT, aMath_Gcc_IfndefsTests,
-     apzMath_Gcc_IfndefsPatch },
-
-  {  zMotorola_Stupid_OptName,    zMotorola_Stupid_OptList, (regex_t*)NULL,
-     MOTOROLA_STUPID_OPT_TEST_CT, aMotorola_Stupid_OptTests,
-     apzMotorola_Stupid_OptPatch },
-
-  {  zNested_CommentName,    zNested_CommentList, (regex_t*)NULL,
-     NESTED_COMMENT_TEST_CT, aNested_CommentTests,
-     apzNested_CommentPatch },
-
-  {  zNews_Os_RecursionName,    zNews_Os_RecursionList, (regex_t*)NULL,
-     NEWS_OS_RECURSION_TEST_CT, aNews_Os_RecursionTests,
-     apzNews_Os_RecursionPatch },
-
-  {  zNext_Math_PrefixName,    zNext_Math_PrefixList, (regex_t*)NULL,
-     NEXT_MATH_PREFIX_TEST_CT, aNext_Math_PrefixTests,
-     apzNext_Math_PrefixPatch },
-
-  {  zNext_TemplateName,    zNext_TemplateList, (regex_t*)NULL,
-     NEXT_TEMPLATE_TEST_CT, aNext_TemplateTests,
-     apzNext_TemplatePatch },
-
-  {  zNext_VolitileName,    zNext_VolitileList, (regex_t*)NULL,
-     NEXT_VOLITILE_TEST_CT, aNext_VolitileTests,
-     apzNext_VolitilePatch },
-
-  {  zNext_Wait_UnionName,    zNext_Wait_UnionList, (regex_t*)NULL,
-     NEXT_WAIT_UNION_TEST_CT, aNext_Wait_UnionTests,
-     apzNext_Wait_UnionPatch },
-
-  {  zNo_Double_SlashName,    zNo_Double_SlashList, (regex_t*)NULL,
-     NO_DOUBLE_SLASH_TEST_CT, aNo_Double_SlashTests,
-     apzNo_Double_SlashPatch },
-
-  {  zNodeent_SyntaxName,    zNodeent_SyntaxList, (regex_t*)NULL,
-     NODEENT_SYNTAX_TEST_CT, aNodeent_SyntaxTests,
-     apzNodeent_SyntaxPatch },
-
-  {  zOsf_Namespace_AName,    zOsf_Namespace_AList, (regex_t*)NULL,
-     OSF_NAMESPACE_A_TEST_CT, aOsf_Namespace_ATests,
-     apzOsf_Namespace_APatch },
-
-  {  zOsf_Namespace_BName,    zOsf_Namespace_BList, (regex_t*)NULL,
-     OSF_NAMESPACE_B_TEST_CT, aOsf_Namespace_BTests,
-     apzOsf_Namespace_BPatch },
-
-  {  zPthread_Page_SizeName,    zPthread_Page_SizeList, (regex_t*)NULL,
-     PTHREAD_PAGE_SIZE_TEST_CT, aPthread_Page_SizeTests,
-     apzPthread_Page_SizePatch },
-
-  {  zRs6000_DoubleName,    zRs6000_DoubleList, (regex_t*)NULL,
-     RS6000_DOUBLE_TEST_CT, aRs6000_DoubleTests,
-     apzRs6000_DoublePatch },
-
-  {  zRs6000_FchmodName,    zRs6000_FchmodList, (regex_t*)NULL,
-     RS6000_FCHMOD_TEST_CT, aRs6000_FchmodTests,
-     apzRs6000_FchmodPatch },
-
-  {  zRs6000_ParamName,    zRs6000_ParamList, (regex_t*)NULL,
-     RS6000_PARAM_TEST_CT, aRs6000_ParamTests,
-     apzRs6000_ParamPatch },
-
-  {  zSony_IncludeName,    zSony_IncludeList, (regex_t*)NULL,
-     SONY_INCLUDE_TEST_CT, aSony_IncludeTests,
-     apzSony_IncludePatch },
-
-  {  zStatsswtchName,    zStatsswtchList, (regex_t*)NULL,
-     STATSSWTCH_TEST_CT, aStatsswtchTests,
-     apzStatsswtchPatch },
-
-  {  zStdio_Va_ListName,    zStdio_Va_ListList, (regex_t*)NULL,
-     STDIO_VA_LIST_TEST_CT, aStdio_Va_ListTests,
-     apzStdio_Va_ListPatch },
-
-  {  zSun_Bogus_IfdefName,    zSun_Bogus_IfdefList, (regex_t*)NULL,
-     SUN_BOGUS_IFDEF_TEST_CT, aSun_Bogus_IfdefTests,
-     apzSun_Bogus_IfdefPatch },
-
-  {  zSun_Bogus_Ifdef_Sun4cName,    zSun_Bogus_Ifdef_Sun4cList, (regex_t*)NULL,
-     SUN_BOGUS_IFDEF_SUN4C_TEST_CT, aSun_Bogus_Ifdef_Sun4cTests,
-     apzSun_Bogus_Ifdef_Sun4cPatch },
-
-  {  zSun_CatmacroName,    zSun_CatmacroList, (regex_t*)NULL,
-     SUN_CATMACRO_TEST_CT, aSun_CatmacroTests,
-     apzSun_CatmacroPatch },
-
-  {  zSun_MallocName,    zSun_MallocList, (regex_t*)NULL,
-     SUN_MALLOC_TEST_CT, aSun_MallocTests,
-     apzSun_MallocPatch },
-
-  {  zSun_MemcpyName,    zSun_MemcpyList, (regex_t*)NULL,
-     SUN_MEMCPY_TEST_CT, aSun_MemcpyTests,
-     apzSun_MemcpyPatch },
-
-  {  zSun_Rusers_SemiName,    zSun_Rusers_SemiList, (regex_t*)NULL,
-     SUN_RUSERS_SEMI_TEST_CT, aSun_Rusers_SemiTests,
-     apzSun_Rusers_SemiPatch },
-
-  {  zSun_SignalName,    zSun_SignalList, (regex_t*)NULL,
-     SUN_SIGNAL_TEST_CT, aSun_SignalTests,
-     apzSun_SignalPatch },
-
-  {  zSun_Xdr_ProtoName,    zSun_Xdr_ProtoList, (regex_t*)NULL,
-     SUN_XDR_PROTO_TEST_CT, aSun_Xdr_ProtoTests,
-     apzSun_Xdr_ProtoPatch },
-
-  {  zSunos_Large_MacroName,    zSunos_Large_MacroList, (regex_t*)NULL,
-     SUNOS_LARGE_MACRO_TEST_CT, aSunos_Large_MacroTests,
-     apzSunos_Large_MacroPatch },
-
-  {  zSunos_Matherr_DeclName,    zSunos_Matherr_DeclList, (regex_t*)NULL,
-     SUNOS_MATHERR_DECL_TEST_CT, aSunos_Matherr_DeclTests,
-     apzSunos_Matherr_DeclPatch },
-
-  {  zSunos_StrlenName,    zSunos_StrlenList, (regex_t*)NULL,
-     SUNOS_STRLEN_TEST_CT, aSunos_StrlenTests,
-     apzSunos_StrlenPatch },
-
-  {  zSystypesName,    zSystypesList, (regex_t*)NULL,
-     SYSTYPES_TEST_CT, aSystypesTests,
-     apzSystypesPatch },
-
-  {  zSystypes_For_AixName,    zSystypes_For_AixList, (regex_t*)NULL,
-     SYSTYPES_FOR_AIX_TEST_CT, aSystypes_For_AixTests,
-     apzSystypes_For_AixPatch },
-
-  {  zSysv68_StringName,    zSysv68_StringList, (regex_t*)NULL,
-     SYSV68_STRING_TEST_CT, aSysv68_StringTests,
-     apzSysv68_StringPatch },
-
-  {  zSysz_Stdlib_For_SunName,    zSysz_Stdlib_For_SunList, (regex_t*)NULL,
-     SYSZ_STDLIB_FOR_SUN_TEST_CT, aSysz_Stdlib_For_SunTests,
-     apzSysz_Stdlib_For_SunPatch },
-
-  {  zSysz_Stdtypes_For_SunName,    zSysz_Stdtypes_For_SunList, (regex_t*)NULL,
-     SYSZ_STDTYPES_FOR_SUN_TEST_CT, aSysz_Stdtypes_For_SunTests,
-     apzSysz_Stdtypes_For_SunPatch },
-
-  {  zTinfo_CplusplusName,    zTinfo_CplusplusList, (regex_t*)NULL,
-     TINFO_CPLUSPLUS_TEST_CT, aTinfo_CplusplusTests,
-     apzTinfo_CplusplusPatch },
-
-  {  zUltrix_Ansi_CompatName,    zUltrix_Ansi_CompatList, (regex_t*)NULL,
-     ULTRIX_ANSI_COMPAT_TEST_CT, aUltrix_Ansi_CompatTests,
-     apzUltrix_Ansi_CompatPatch },
-
-  {  zUltrix_Atof_ParamName,    zUltrix_Atof_ParamList, (regex_t*)NULL,
-     ULTRIX_ATOF_PARAM_TEST_CT, aUltrix_Atof_ParamTests,
-     apzUltrix_Atof_ParamPatch },
-
-  {  zUltrix_ConstName,    zUltrix_ConstList, (regex_t*)NULL,
-     ULTRIX_CONST_TEST_CT, aUltrix_ConstTests,
-     apzUltrix_ConstPatch },
-
-  {  zUltrix_IfdefName,    zUltrix_IfdefList, (regex_t*)NULL,
-     ULTRIX_IFDEF_TEST_CT, aUltrix_IfdefTests,
-     apzUltrix_IfdefPatch },
-
-  {  zUltrix_Nested_CmntName,    zUltrix_Nested_CmntList, (regex_t*)NULL,
-     ULTRIX_NESTED_CMNT_TEST_CT, aUltrix_Nested_CmntTests,
-     apzUltrix_Nested_CmntPatch },
-
-  {  zUltrix_StaticName,    zUltrix_StaticList, (regex_t*)NULL,
-     ULTRIX_STATIC_TEST_CT, aUltrix_StaticTests,
-     apzUltrix_StaticPatch },
-
-  {  zUndefine_NullName,    zUndefine_NullList, (regex_t*)NULL,
-     UNDEFINE_NULL_TEST_CT, aUndefine_NullTests,
-     apzUndefine_NullPatch },
-
-  {  zVa_I960_MacroName,    zVa_I960_MacroList, (regex_t*)NULL,
-     VA_I960_MACRO_TEST_CT, aVa_I960_MacroTests,
-     apzVa_I960_MacroPatch },
-
-  {  zVoid_NullName,    zVoid_NullList, (regex_t*)NULL,
-     VOID_NULL_TEST_CT, aVoid_NullTests,
-     apzVoid_NullPatch },
-
-  {  zVxworks_Gcc_ProblemName,    zVxworks_Gcc_ProblemList, (regex_t*)NULL,
-     VXWORKS_GCC_PROBLEM_TEST_CT, aVxworks_Gcc_ProblemTests,
-     apzVxworks_Gcc_ProblemPatch },
-
-  {  zVxworks_Needs_VxtypesName,    zVxworks_Needs_VxtypesList, (regex_t*)NULL,
-     VXWORKS_NEEDS_VXTYPES_TEST_CT, aVxworks_Needs_VxtypesTests,
-     apzVxworks_Needs_VxtypesPatch },
-
-  {  zVxworks_Needs_VxworksName,    zVxworks_Needs_VxworksList, (regex_t*)NULL,
-     VXWORKS_NEEDS_VXWORKS_TEST_CT, aVxworks_Needs_VxworksTests,
-     apzVxworks_Needs_VxworksPatch },
-
-  {  zVxworks_TimeName,    zVxworks_TimeList, (regex_t*)NULL,
-     VXWORKS_TIME_TEST_CT, aVxworks_TimeTests,
-     apzVxworks_TimePatch },
-
-  {  zX11_ClassName,    zX11_ClassList, (regex_t*)NULL,
-     X11_CLASS_TEST_CT, aX11_ClassTests,
-     apzX11_ClassPatch },
-
-  {  zX11_Class_UsageName,    zX11_Class_UsageList, (regex_t*)NULL,
-     X11_CLASS_USAGE_TEST_CT, aX11_Class_UsageTests,
-     apzX11_Class_UsagePatch },
-
-  {  zX11_NewName,    zX11_NewList, (regex_t*)NULL,
-     X11_NEW_TEST_CT, aX11_NewTests,
-     apzX11_NewPatch },
-
-  {  zX11_SprintfName,    zX11_SprintfList, (regex_t*)NULL,
-     X11_SPRINTF_TEST_CT, aX11_SprintfTests,
-     apzX11_SprintfPatch },
-
-  {  zZzz_Ki_IfaceName,    zZzz_Ki_IfaceList, (regex_t*)NULL,
-     ZZZ_KI_IFACE_TEST_CT, aZzz_Ki_IfaceTests,
-     apzZzz_Ki_IfacePatch },
-
-  {  zZzz_KiName,    zZzz_KiList, (regex_t*)NULL,
-     ZZZ_KI_TEST_CT, aZzz_KiTests,
-     apzZzz_KiPatch },
-
-  {  zZzz_Ki_CallsName,    zZzz_Ki_CallsList, (regex_t*)NULL,
-     ZZZ_KI_CALLS_TEST_CT, aZzz_Ki_CallsTests,
-     apzZzz_Ki_CallsPatch },
-
-  {  zZzz_Ki_DefsName,    zZzz_Ki_DefsList, (regex_t*)NULL,
-     ZZZ_KI_DEFS_TEST_CT, aZzz_Ki_DefsTests,
-     apzZzz_Ki_DefsPatch },
-
-  {  zZzz_TimeName,    zZzz_TimeList, (regex_t*)NULL,
-     ZZZ_TIME_TEST_CT, aZzz_TimeTests,
-     apzZzz_TimePatch }
+  {  zAix_SyswaitName,    zAix_SyswaitList,
+     apzAix_SyswaitMachs, (regex_t*)NULL,
+     AIX_SYSWAIT_TEST_CT, FD_MACH_ONLY,
+     aAix_SyswaitTests,   apzAix_SyswaitPatch },
+
+  {  zAix_VolatileName,    zAix_VolatileList,
+     apzAix_VolatileMachs, (regex_t*)NULL,
+     AIX_VOLATILE_TEST_CT, FD_MACH_ONLY,
+     aAix_VolatileTests,   apzAix_VolatilePatch },
+
+  {  zAlpha_GetoptName,    zAlpha_GetoptList,
+     apzAlpha_GetoptMachs, (regex_t*)NULL,
+     ALPHA_GETOPT_TEST_CT, FD_MACH_ONLY,
+     aAlpha_GetoptTests,   apzAlpha_GetoptPatch },
+
+  {  zAlpha_ParensName,    zAlpha_ParensList,
+     apzAlpha_ParensMachs, (regex_t*)NULL,
+     ALPHA_PARENS_TEST_CT, FD_MACH_ONLY,
+     aAlpha_ParensTests,   apzAlpha_ParensPatch },
+
+  {  zAlpha_SbrkName,    zAlpha_SbrkList,
+     apzAlpha_SbrkMachs, (regex_t*)NULL,
+     ALPHA_SBRK_TEST_CT, FD_MACH_ONLY,
+     aAlpha_SbrkTests,   apzAlpha_SbrkPatch },
+
+  {  zArm_Norcroft_HintName,    zArm_Norcroft_HintList,
+     apzArm_Norcroft_HintMachs, (regex_t*)NULL,
+     ARM_NORCROFT_HINT_TEST_CT, FD_MACH_ONLY,
+     aArm_Norcroft_HintTests,   apzArm_Norcroft_HintPatch },
+
+  {  zArm_WcharName,    zArm_WcharList,
+     apzArm_WcharMachs, (regex_t*)NULL,
+     ARM_WCHAR_TEST_CT, FD_MACH_ONLY,
+     aArm_WcharTests,   apzArm_WcharPatch },
+
+  {  zAux_AsmName,    zAux_AsmList,
+     apzAux_AsmMachs, (regex_t*)NULL,
+     AUX_ASM_TEST_CT, FD_MACH_ONLY,
+     aAux_AsmTests,   apzAux_AsmPatch },
+
+  {  zAvoid_BoolName,    zAvoid_BoolList,
+     apzAvoid_BoolMachs, (regex_t*)NULL,
+     AVOID_BOOL_TEST_CT, FD_MACH_ONLY,
+     aAvoid_BoolTests,   apzAvoid_BoolPatch },
+
+  {  zBad_Malloc_DeclName,    zBad_Malloc_DeclList,
+     apzBad_Malloc_DeclMachs, (regex_t*)NULL,
+     BAD_MALLOC_DECL_TEST_CT, FD_MACH_ONLY,
+     aBad_Malloc_DeclTests,   apzBad_Malloc_DeclPatch },
+
+  {  zBad_Struct_TermName,    zBad_Struct_TermList,
+     apzBad_Struct_TermMachs, (regex_t*)NULL,
+     BAD_STRUCT_TERM_TEST_CT, FD_MACH_ONLY,
+     aBad_Struct_TermTests,   apzBad_Struct_TermPatch },
+
+  {  zBadquoteName,    zBadquoteList,
+     apzBadquoteMachs, (regex_t*)NULL,
+     BADQUOTE_TEST_CT, FD_MACH_ONLY,
+     aBadquoteTests,   apzBadquotePatch },
+
+  {  zBad_LvalName,    zBad_LvalList,
+     apzBad_LvalMachs, (regex_t*)NULL,
+     BAD_LVAL_TEST_CT, FD_MACH_ONLY,
+     aBad_LvalTests,   apzBad_LvalPatch },
+
+  {  zBroken_Assert_StdioName,    zBroken_Assert_StdioList,
+     apzBroken_Assert_StdioMachs, (regex_t*)NULL,
+     BROKEN_ASSERT_STDIO_TEST_CT, FD_MACH_ONLY,
+     aBroken_Assert_StdioTests,   apzBroken_Assert_StdioPatch },
+
+  {  zBroken_Assert_StdlibName,    zBroken_Assert_StdlibList,
+     apzBroken_Assert_StdlibMachs, (regex_t*)NULL,
+     BROKEN_ASSERT_STDLIB_TEST_CT, FD_MACH_ONLY,
+     aBroken_Assert_StdlibTests,   apzBroken_Assert_StdlibPatch },
+
+  {  zBsd43_Io_MacrosName,    zBsd43_Io_MacrosList,
+     apzBsd43_Io_MacrosMachs, (regex_t*)NULL,
+     BSD43_IO_MACROS_TEST_CT, FD_MACH_ONLY,
+     aBsd43_Io_MacrosTests,   apzBsd43_Io_MacrosPatch },
+
+  {  zCxx_Cmnt_HpuxName,    zCxx_Cmnt_HpuxList,
+     apzCxx_Cmnt_HpuxMachs, (regex_t*)NULL,
+     CXX_CMNT_HPUX_TEST_CT, FD_MACH_ONLY,
+     aCxx_Cmnt_HpuxTests,   apzCxx_Cmnt_HpuxPatch },
+
+  {  zCxx_Cmnt_IrixName,    zCxx_Cmnt_IrixList,
+     apzCxx_Cmnt_IrixMachs, (regex_t*)NULL,
+     CXX_CMNT_IRIX_TEST_CT, FD_MACH_ONLY,
+     aCxx_Cmnt_IrixTests,   apzCxx_Cmnt_IrixPatch },
+
+  {  zCxx_Cmnt_SunosName,    zCxx_Cmnt_SunosList,
+     apzCxx_Cmnt_SunosMachs, (regex_t*)NULL,
+     CXX_CMNT_SUNOS_TEST_CT, FD_MACH_ONLY,
+     aCxx_Cmnt_SunosTests,   apzCxx_Cmnt_SunosPatch },
+
+  {  zCxx_Cmnt_VxworksName,    zCxx_Cmnt_VxworksList,
+     apzCxx_Cmnt_VxworksMachs, (regex_t*)NULL,
+     CXX_CMNT_VXWORKS_TEST_CT, FD_MACH_ONLY,
+     aCxx_Cmnt_VxworksTests,   apzCxx_Cmnt_VxworksPatch },
+
+  {  zEcd_CursorName,    zEcd_CursorList,
+     apzEcd_CursorMachs, (regex_t*)NULL,
+     ECD_CURSOR_TEST_CT, FD_MACH_ONLY,
+     aEcd_CursorTests,   apzEcd_CursorPatch },
+
+  {  zElse_LabelName,    zElse_LabelList,
+     apzElse_LabelMachs, (regex_t*)NULL,
+     ELSE_LABEL_TEST_CT, FD_MACH_ONLY,
+     aElse_LabelTests,   apzElse_LabelPatch },
+
+  {  zEndif_LabelName,    zEndif_LabelList,
+     apzEndif_LabelMachs, (regex_t*)NULL,
+     ENDIF_LABEL_TEST_CT, FD_MACH_ONLY,
+     aEndif_LabelTests,   apzEndif_LabelPatch },
+
+  {  zHp_InlineName,    zHp_InlineList,
+     apzHp_InlineMachs, (regex_t*)NULL,
+     HP_INLINE_TEST_CT, FD_MACH_ONLY,
+     aHp_InlineTests,   apzHp_InlinePatch },
+
+  {  zHp_SysfileName,    zHp_SysfileList,
+     apzHp_SysfileMachs, (regex_t*)NULL,
+     HP_SYSFILE_TEST_CT, FD_MACH_ONLY,
+     aHp_SysfileTests,   apzHp_SysfilePatch },
+
+  {  zHpux_Cxx_UnreadyName,    zHpux_Cxx_UnreadyList,
+     apzHpux_Cxx_UnreadyMachs, (regex_t*)NULL,
+     HPUX_CXX_UNREADY_TEST_CT, FD_MACH_ONLY,
+     aHpux_Cxx_UnreadyTests,   apzHpux_Cxx_UnreadyPatch },
+
+  {  zHpux_MaxintName,    zHpux_MaxintList,
+     apzHpux_MaxintMachs, (regex_t*)NULL,
+     HPUX_MAXINT_TEST_CT, FD_MACH_ONLY,
+     aHpux_MaxintTests,   apzHpux_MaxintPatch },
+
+  {  zHpux_SystimeName,    zHpux_SystimeList,
+     apzHpux_SystimeMachs, (regex_t*)NULL,
+     HPUX_SYSTIME_TEST_CT, FD_MACH_ONLY,
+     aHpux_SystimeTests,   apzHpux_SystimePatch },
+
+  {  zInteractv_Add1Name,    zInteractv_Add1List,
+     apzInteractv_Add1Machs, (regex_t*)NULL,
+     INTERACTV_ADD1_TEST_CT, FD_MACH_ONLY,
+     aInteractv_Add1Tests,   apzInteractv_Add1Patch },
+
+  {  zInteractv_Add2Name,    zInteractv_Add2List,
+     apzInteractv_Add2Machs, (regex_t*)NULL,
+     INTERACTV_ADD2_TEST_CT, FD_MACH_ONLY,
+     aInteractv_Add2Tests,   apzInteractv_Add2Patch },
+
+  {  zInteractv_Add3Name,    zInteractv_Add3List,
+     apzInteractv_Add3Machs, (regex_t*)NULL,
+     INTERACTV_ADD3_TEST_CT, FD_MACH_ONLY,
+     aInteractv_Add3Tests,   apzInteractv_Add3Patch },
+
+  {  zIo_Def_QuotesName,    zIo_Def_QuotesList,
+     apzIo_Def_QuotesMachs, (regex_t*)NULL,
+     IO_DEF_QUOTES_TEST_CT, FD_MACH_ONLY,
+     aIo_Def_QuotesTests,   apzIo_Def_QuotesPatch },
+
+  {  zIoctl_Fix_CtrlName,    zIoctl_Fix_CtrlList,
+     apzIoctl_Fix_CtrlMachs, (regex_t*)NULL,
+     IOCTL_FIX_CTRL_TEST_CT, FD_MACH_ONLY,
+     aIoctl_Fix_CtrlTests,   apzIoctl_Fix_CtrlPatch },
+
+  {  zIp_Missing_SemiName,    zIp_Missing_SemiList,
+     apzIp_Missing_SemiMachs, (regex_t*)NULL,
+     IP_MISSING_SEMI_TEST_CT, FD_MACH_ONLY,
+     aIp_Missing_SemiTests,   apzIp_Missing_SemiPatch },
+
+  {  zIrix_Bogus_Cxx_CmntName,    zIrix_Bogus_Cxx_CmntList,
+     apzIrix_Bogus_Cxx_CmntMachs, (regex_t*)NULL,
+     IRIX_BOGUS_CXX_CMNT_TEST_CT, FD_MACH_ONLY,
+     aIrix_Bogus_Cxx_CmntTests,   apzIrix_Bogus_Cxx_CmntPatch },
+
+  {  zIrix_Multiline_CmntName,    zIrix_Multiline_CmntList,
+     apzIrix_Multiline_CmntMachs, (regex_t*)NULL,
+     IRIX_MULTILINE_CMNT_TEST_CT, FD_MACH_ONLY,
+     aIrix_Multiline_CmntTests,   apzIrix_Multiline_CmntPatch },
+
+  {  zIrix_SockaddrName,    zIrix_SockaddrList,
+     apzIrix_SockaddrMachs, (regex_t*)NULL,
+     IRIX_SOCKADDR_TEST_CT, FD_MACH_ONLY,
+     aIrix_SockaddrTests,   apzIrix_SockaddrPatch },
+
+  {  zIrix_Struct__FileName,    zIrix_Struct__FileList,
+     apzIrix_Struct__FileMachs, (regex_t*)NULL,
+     IRIX_STRUCT__FILE_TEST_CT, FD_MACH_ONLY,
+     aIrix_Struct__FileTests,   apzIrix_Struct__FilePatch },
+
+  {  zIsc_FmodName,    zIsc_FmodList,
+     apzIsc_FmodMachs, (regex_t*)NULL,
+     ISC_FMOD_TEST_CT, FD_MACH_ONLY,
+     aIsc_FmodTests,   apzIsc_FmodPatch },
+
+  {  zMotorola_NestedName,    zMotorola_NestedList,
+     apzMotorola_NestedMachs, (regex_t*)NULL,
+     MOTOROLA_NESTED_TEST_CT, FD_MACH_ONLY,
+     aMotorola_NestedTests,   apzMotorola_NestedPatch },
+
+  {  zIsc_Sys_LimitsName,    zIsc_Sys_LimitsList,
+     apzIsc_Sys_LimitsMachs, (regex_t*)NULL,
+     ISC_SYS_LIMITS_TEST_CT, FD_MACH_ONLY,
+     aIsc_Sys_LimitsTests,   apzIsc_Sys_LimitsPatch },
+
+  {  zKandr_ConcatName,    zKandr_ConcatList,
+     apzKandr_ConcatMachs, (regex_t*)NULL,
+     KANDR_CONCAT_TEST_CT, FD_MACH_ONLY,
+     aKandr_ConcatTests,   apzKandr_ConcatPatch },
+
+  {  zLimits_IfndefsName,    zLimits_IfndefsList,
+     apzLimits_IfndefsMachs, (regex_t*)NULL,
+     LIMITS_IFNDEFS_TEST_CT, FD_MACH_ONLY,
+     aLimits_IfndefsTests,   apzLimits_IfndefsPatch },
+
+  {  zLynx_Void_IntName,    zLynx_Void_IntList,
+     apzLynx_Void_IntMachs, (regex_t*)NULL,
+     LYNX_VOID_INT_TEST_CT, FD_MACH_ONLY,
+     aLynx_Void_IntTests,   apzLynx_Void_IntPatch },
+
+  {  zLynxos_Fcntl_ProtoName,    zLynxos_Fcntl_ProtoList,
+     apzLynxos_Fcntl_ProtoMachs, (regex_t*)NULL,
+     LYNXOS_FCNTL_PROTO_TEST_CT, FD_MACH_ONLY,
+     aLynxos_Fcntl_ProtoTests,   apzLynxos_Fcntl_ProtoPatch },
+
+  {  zM88k_Bad_Hypot_OptName,    zM88k_Bad_Hypot_OptList,
+     apzM88k_Bad_Hypot_OptMachs, (regex_t*)NULL,
+     M88K_BAD_HYPOT_OPT_TEST_CT, FD_MACH_ONLY,
+     aM88k_Bad_Hypot_OptTests,   apzM88k_Bad_Hypot_OptPatch },
+
+  {  zM88k_Bad_S_IfName,    zM88k_Bad_S_IfList,
+     apzM88k_Bad_S_IfMachs, (regex_t*)NULL,
+     M88K_BAD_S_IF_TEST_CT, FD_MACH_ONLY,
+     aM88k_Bad_S_IfTests,   apzM88k_Bad_S_IfPatch },
+
+  {  zM88k_Multi_InclName,    zM88k_Multi_InclList,
+     apzM88k_Multi_InclMachs, (regex_t*)NULL,
+     M88K_MULTI_INCL_TEST_CT, FD_MACH_ONLY,
+     aM88k_Multi_InclTests,   apzM88k_Multi_InclPatch },
+
+  {  zMachine_NameName,    zMachine_NameList,
+     apzMachine_NameMachs, (regex_t*)NULL,
+     MACHINE_NAME_TEST_CT, FD_MACH_ONLY,
+     aMachine_NameTests,   apzMachine_NamePatch },
+
+  {  zMath_ExceptionName,    zMath_ExceptionList,
+     apzMath_ExceptionMachs, (regex_t*)NULL,
+     MATH_EXCEPTION_TEST_CT, FD_MACH_ONLY,
+     aMath_ExceptionTests,   apzMath_ExceptionPatch },
+
+  {  zMath_Gcc_IfndefsName,    zMath_Gcc_IfndefsList,
+     apzMath_Gcc_IfndefsMachs, (regex_t*)NULL,
+     MATH_GCC_IFNDEFS_TEST_CT, FD_MACH_ONLY,
+     aMath_Gcc_IfndefsTests,   apzMath_Gcc_IfndefsPatch },
+
+  {  zMotorola_Stupid_OptName,    zMotorola_Stupid_OptList,
+     apzMotorola_Stupid_OptMachs, (regex_t*)NULL,
+     MOTOROLA_STUPID_OPT_TEST_CT, FD_MACH_ONLY,
+     aMotorola_Stupid_OptTests,   apzMotorola_Stupid_OptPatch },
+
+  {  zNested_CommentName,    zNested_CommentList,
+     apzNested_CommentMachs, (regex_t*)NULL,
+     NESTED_COMMENT_TEST_CT, FD_MACH_ONLY,
+     aNested_CommentTests,   apzNested_CommentPatch },
+
+  {  zNews_Os_RecursionName,    zNews_Os_RecursionList,
+     apzNews_Os_RecursionMachs, (regex_t*)NULL,
+     NEWS_OS_RECURSION_TEST_CT, FD_MACH_ONLY,
+     aNews_Os_RecursionTests,   apzNews_Os_RecursionPatch },
+
+  {  zNext_Math_PrefixName,    zNext_Math_PrefixList,
+     apzNext_Math_PrefixMachs, (regex_t*)NULL,
+     NEXT_MATH_PREFIX_TEST_CT, FD_MACH_ONLY,
+     aNext_Math_PrefixTests,   apzNext_Math_PrefixPatch },
+
+  {  zNext_TemplateName,    zNext_TemplateList,
+     apzNext_TemplateMachs, (regex_t*)NULL,
+     NEXT_TEMPLATE_TEST_CT, FD_MACH_ONLY,
+     aNext_TemplateTests,   apzNext_TemplatePatch },
+
+  {  zNext_VolitileName,    zNext_VolitileList,
+     apzNext_VolitileMachs, (regex_t*)NULL,
+     NEXT_VOLITILE_TEST_CT, FD_MACH_ONLY,
+     aNext_VolitileTests,   apzNext_VolitilePatch },
+
+  {  zNext_Wait_UnionName,    zNext_Wait_UnionList,
+     apzNext_Wait_UnionMachs, (regex_t*)NULL,
+     NEXT_WAIT_UNION_TEST_CT, FD_MACH_ONLY,
+     aNext_Wait_UnionTests,   apzNext_Wait_UnionPatch },
+
+  {  zNo_Double_SlashName,    zNo_Double_SlashList,
+     apzNo_Double_SlashMachs, (regex_t*)NULL,
+     NO_DOUBLE_SLASH_TEST_CT, FD_MACH_ONLY,
+     aNo_Double_SlashTests,   apzNo_Double_SlashPatch },
+
+  {  zNodeent_SyntaxName,    zNodeent_SyntaxList,
+     apzNodeent_SyntaxMachs, (regex_t*)NULL,
+     NODEENT_SYNTAX_TEST_CT, FD_MACH_ONLY,
+     aNodeent_SyntaxTests,   apzNodeent_SyntaxPatch },
+
+  {  zOsf_Namespace_AName,    zOsf_Namespace_AList,
+     apzOsf_Namespace_AMachs, (regex_t*)NULL,
+     OSF_NAMESPACE_A_TEST_CT, FD_MACH_ONLY,
+     aOsf_Namespace_ATests,   apzOsf_Namespace_APatch },
+
+  {  zOsf_Namespace_BName,    zOsf_Namespace_BList,
+     apzOsf_Namespace_BMachs, (regex_t*)NULL,
+     OSF_NAMESPACE_B_TEST_CT, FD_MACH_ONLY,
+     aOsf_Namespace_BTests,   apzOsf_Namespace_BPatch },
+
+  {  zPthread_Page_SizeName,    zPthread_Page_SizeList,
+     apzPthread_Page_SizeMachs, (regex_t*)NULL,
+     PTHREAD_PAGE_SIZE_TEST_CT, FD_MACH_ONLY,
+     aPthread_Page_SizeTests,   apzPthread_Page_SizePatch },
+
+  {  zRs6000_DoubleName,    zRs6000_DoubleList,
+     apzRs6000_DoubleMachs, (regex_t*)NULL,
+     RS6000_DOUBLE_TEST_CT, FD_MACH_ONLY,
+     aRs6000_DoubleTests,   apzRs6000_DoublePatch },
+
+  {  zRs6000_FchmodName,    zRs6000_FchmodList,
+     apzRs6000_FchmodMachs, (regex_t*)NULL,
+     RS6000_FCHMOD_TEST_CT, FD_MACH_ONLY,
+     aRs6000_FchmodTests,   apzRs6000_FchmodPatch },
+
+  {  zRs6000_ParamName,    zRs6000_ParamList,
+     apzRs6000_ParamMachs, (regex_t*)NULL,
+     RS6000_PARAM_TEST_CT, FD_MACH_ONLY,
+     aRs6000_ParamTests,   apzRs6000_ParamPatch },
+
+  {  zSony_IncludeName,    zSony_IncludeList,
+     apzSony_IncludeMachs, (regex_t*)NULL,
+     SONY_INCLUDE_TEST_CT, FD_MACH_ONLY,
+     aSony_IncludeTests,   apzSony_IncludePatch },
+
+  {  zStatsswtchName,    zStatsswtchList,
+     apzStatsswtchMachs, (regex_t*)NULL,
+     STATSSWTCH_TEST_CT, FD_MACH_ONLY,
+     aStatsswtchTests,   apzStatsswtchPatch },
+
+  {  zStdio_Va_ListName,    zStdio_Va_ListList,
+     apzStdio_Va_ListMachs, (regex_t*)NULL,
+     STDIO_VA_LIST_TEST_CT, FD_MACH_ONLY,
+     aStdio_Va_ListTests,   apzStdio_Va_ListPatch },
+
+  {  zSun_Bogus_IfdefName,    zSun_Bogus_IfdefList,
+     apzSun_Bogus_IfdefMachs, (regex_t*)NULL,
+     SUN_BOGUS_IFDEF_TEST_CT, FD_MACH_ONLY,
+     aSun_Bogus_IfdefTests,   apzSun_Bogus_IfdefPatch },
+
+  {  zSun_Bogus_Ifdef_Sun4cName,    zSun_Bogus_Ifdef_Sun4cList,
+     apzSun_Bogus_Ifdef_Sun4cMachs, (regex_t*)NULL,
+     SUN_BOGUS_IFDEF_SUN4C_TEST_CT, FD_MACH_ONLY,
+     aSun_Bogus_Ifdef_Sun4cTests,   apzSun_Bogus_Ifdef_Sun4cPatch },
+
+  {  zSun_CatmacroName,    zSun_CatmacroList,
+     apzSun_CatmacroMachs, (regex_t*)NULL,
+     SUN_CATMACRO_TEST_CT, FD_MACH_ONLY,
+     aSun_CatmacroTests,   apzSun_CatmacroPatch },
+
+  {  zSun_MallocName,    zSun_MallocList,
+     apzSun_MallocMachs, (regex_t*)NULL,
+     SUN_MALLOC_TEST_CT, FD_MACH_ONLY,
+     aSun_MallocTests,   apzSun_MallocPatch },
+
+  {  zSun_MemcpyName,    zSun_MemcpyList,
+     apzSun_MemcpyMachs, (regex_t*)NULL,
+     SUN_MEMCPY_TEST_CT, FD_MACH_ONLY,
+     aSun_MemcpyTests,   apzSun_MemcpyPatch },
+
+  {  zSun_Rusers_SemiName,    zSun_Rusers_SemiList,
+     apzSun_Rusers_SemiMachs, (regex_t*)NULL,
+     SUN_RUSERS_SEMI_TEST_CT, FD_MACH_ONLY,
+     aSun_Rusers_SemiTests,   apzSun_Rusers_SemiPatch },
+
+  {  zSun_SignalName,    zSun_SignalList,
+     apzSun_SignalMachs, (regex_t*)NULL,
+     SUN_SIGNAL_TEST_CT, FD_MACH_ONLY,
+     aSun_SignalTests,   apzSun_SignalPatch },
+
+  {  zSun_Xdr_ProtoName,    zSun_Xdr_ProtoList,
+     apzSun_Xdr_ProtoMachs, (regex_t*)NULL,
+     SUN_XDR_PROTO_TEST_CT, FD_MACH_ONLY,
+     aSun_Xdr_ProtoTests,   apzSun_Xdr_ProtoPatch },
+
+  {  zSunos_Large_MacroName,    zSunos_Large_MacroList,
+     apzSunos_Large_MacroMachs, (regex_t*)NULL,
+     SUNOS_LARGE_MACRO_TEST_CT, FD_MACH_ONLY,
+     aSunos_Large_MacroTests,   apzSunos_Large_MacroPatch },
+
+  {  zSunos_Matherr_DeclName,    zSunos_Matherr_DeclList,
+     apzSunos_Matherr_DeclMachs, (regex_t*)NULL,
+     SUNOS_MATHERR_DECL_TEST_CT, FD_MACH_ONLY,
+     aSunos_Matherr_DeclTests,   apzSunos_Matherr_DeclPatch },
+
+  {  zSunos_StrlenName,    zSunos_StrlenList,
+     apzSunos_StrlenMachs, (regex_t*)NULL,
+     SUNOS_STRLEN_TEST_CT, FD_MACH_ONLY,
+     aSunos_StrlenTests,   apzSunos_StrlenPatch },
+
+  {  zSystypesName,    zSystypesList,
+     apzSystypesMachs, (regex_t*)NULL,
+     SYSTYPES_TEST_CT, FD_MACH_ONLY,
+     aSystypesTests,   apzSystypesPatch },
+
+  {  zSystypes_For_AixName,    zSystypes_For_AixList,
+     apzSystypes_For_AixMachs, (regex_t*)NULL,
+     SYSTYPES_FOR_AIX_TEST_CT, FD_MACH_ONLY,
+     aSystypes_For_AixTests,   apzSystypes_For_AixPatch },
+
+  {  zSysv68_StringName,    zSysv68_StringList,
+     apzSysv68_StringMachs, (regex_t*)NULL,
+     SYSV68_STRING_TEST_CT, FD_MACH_ONLY,
+     aSysv68_StringTests,   apzSysv68_StringPatch },
+
+  {  zSysz_Stdlib_For_SunName,    zSysz_Stdlib_For_SunList,
+     apzSysz_Stdlib_For_SunMachs, (regex_t*)NULL,
+     SYSZ_STDLIB_FOR_SUN_TEST_CT, FD_MACH_ONLY,
+     aSysz_Stdlib_For_SunTests,   apzSysz_Stdlib_For_SunPatch },
+
+  {  zSysz_Stdtypes_For_SunName,    zSysz_Stdtypes_For_SunList,
+     apzSysz_Stdtypes_For_SunMachs, (regex_t*)NULL,
+     SYSZ_STDTYPES_FOR_SUN_TEST_CT, FD_MACH_ONLY,
+     aSysz_Stdtypes_For_SunTests,   apzSysz_Stdtypes_For_SunPatch },
+
+  {  zTinfo_CplusplusName,    zTinfo_CplusplusList,
+     apzTinfo_CplusplusMachs, (regex_t*)NULL,
+     TINFO_CPLUSPLUS_TEST_CT, FD_MACH_ONLY,
+     aTinfo_CplusplusTests,   apzTinfo_CplusplusPatch },
+
+  {  zUltrix_Ansi_CompatName,    zUltrix_Ansi_CompatList,
+     apzUltrix_Ansi_CompatMachs, (regex_t*)NULL,
+     ULTRIX_ANSI_COMPAT_TEST_CT, FD_MACH_ONLY,
+     aUltrix_Ansi_CompatTests,   apzUltrix_Ansi_CompatPatch },
+
+  {  zUltrix_Atof_ParamName,    zUltrix_Atof_ParamList,
+     apzUltrix_Atof_ParamMachs, (regex_t*)NULL,
+     ULTRIX_ATOF_PARAM_TEST_CT, FD_MACH_ONLY,
+     aUltrix_Atof_ParamTests,   apzUltrix_Atof_ParamPatch },
+
+  {  zUltrix_ConstName,    zUltrix_ConstList,
+     apzUltrix_ConstMachs, (regex_t*)NULL,
+     ULTRIX_CONST_TEST_CT, FD_MACH_ONLY,
+     aUltrix_ConstTests,   apzUltrix_ConstPatch },
+
+  {  zUltrix_IfdefName,    zUltrix_IfdefList,
+     apzUltrix_IfdefMachs, (regex_t*)NULL,
+     ULTRIX_IFDEF_TEST_CT, FD_MACH_ONLY,
+     aUltrix_IfdefTests,   apzUltrix_IfdefPatch },
+
+  {  zUltrix_Nested_CmntName,    zUltrix_Nested_CmntList,
+     apzUltrix_Nested_CmntMachs, (regex_t*)NULL,
+     ULTRIX_NESTED_CMNT_TEST_CT, FD_MACH_ONLY,
+     aUltrix_Nested_CmntTests,   apzUltrix_Nested_CmntPatch },
+
+  {  zUltrix_StaticName,    zUltrix_StaticList,
+     apzUltrix_StaticMachs, (regex_t*)NULL,
+     ULTRIX_STATIC_TEST_CT, FD_MACH_ONLY,
+     aUltrix_StaticTests,   apzUltrix_StaticPatch },
+
+  {  zUndefine_NullName,    zUndefine_NullList,
+     apzUndefine_NullMachs, (regex_t*)NULL,
+     UNDEFINE_NULL_TEST_CT, FD_MACH_ONLY,
+     aUndefine_NullTests,   apzUndefine_NullPatch },
+
+  {  zVa_I960_MacroName,    zVa_I960_MacroList,
+     apzVa_I960_MacroMachs, (regex_t*)NULL,
+     VA_I960_MACRO_TEST_CT, FD_MACH_ONLY,
+     aVa_I960_MacroTests,   apzVa_I960_MacroPatch },
+
+  {  zVoid_NullName,    zVoid_NullList,
+     apzVoid_NullMachs, (regex_t*)NULL,
+     VOID_NULL_TEST_CT, FD_MACH_ONLY,
+     aVoid_NullTests,   apzVoid_NullPatch },
+
+  {  zVxworks_Gcc_ProblemName,    zVxworks_Gcc_ProblemList,
+     apzVxworks_Gcc_ProblemMachs, (regex_t*)NULL,
+     VXWORKS_GCC_PROBLEM_TEST_CT, FD_MACH_ONLY,
+     aVxworks_Gcc_ProblemTests,   apzVxworks_Gcc_ProblemPatch },
+
+  {  zVxworks_Needs_VxtypesName,    zVxworks_Needs_VxtypesList,
+     apzVxworks_Needs_VxtypesMachs, (regex_t*)NULL,
+     VXWORKS_NEEDS_VXTYPES_TEST_CT, FD_MACH_ONLY,
+     aVxworks_Needs_VxtypesTests,   apzVxworks_Needs_VxtypesPatch },
+
+  {  zVxworks_Needs_VxworksName,    zVxworks_Needs_VxworksList,
+     apzVxworks_Needs_VxworksMachs, (regex_t*)NULL,
+     VXWORKS_NEEDS_VXWORKS_TEST_CT, FD_MACH_ONLY,
+     aVxworks_Needs_VxworksTests,   apzVxworks_Needs_VxworksPatch },
+
+  {  zVxworks_TimeName,    zVxworks_TimeList,
+     apzVxworks_TimeMachs, (regex_t*)NULL,
+     VXWORKS_TIME_TEST_CT, FD_MACH_ONLY,
+     aVxworks_TimeTests,   apzVxworks_TimePatch },
+
+  {  zX11_ClassName,    zX11_ClassList,
+     apzX11_ClassMachs, (regex_t*)NULL,
+     X11_CLASS_TEST_CT, FD_MACH_ONLY,
+     aX11_ClassTests,   apzX11_ClassPatch },
+
+  {  zX11_Class_UsageName,    zX11_Class_UsageList,
+     apzX11_Class_UsageMachs, (regex_t*)NULL,
+     X11_CLASS_USAGE_TEST_CT, FD_MACH_ONLY,
+     aX11_Class_UsageTests,   apzX11_Class_UsagePatch },
+
+  {  zX11_NewName,    zX11_NewList,
+     apzX11_NewMachs, (regex_t*)NULL,
+     X11_NEW_TEST_CT, FD_MACH_ONLY,
+     aX11_NewTests,   apzX11_NewPatch },
+
+  {  zX11_SprintfName,    zX11_SprintfList,
+     apzX11_SprintfMachs, (regex_t*)NULL,
+     X11_SPRINTF_TEST_CT, FD_MACH_ONLY,
+     aX11_SprintfTests,   apzX11_SprintfPatch },
+
+  {  zZzz_Ki_IfaceName,    zZzz_Ki_IfaceList,
+     apzZzz_Ki_IfaceMachs, (regex_t*)NULL,
+     ZZZ_KI_IFACE_TEST_CT, FD_MACH_ONLY,
+     aZzz_Ki_IfaceTests,   apzZzz_Ki_IfacePatch },
+
+  {  zZzz_KiName,    zZzz_KiList,
+     apzZzz_KiMachs, (regex_t*)NULL,
+     ZZZ_KI_TEST_CT, FD_MACH_ONLY,
+     aZzz_KiTests,   apzZzz_KiPatch },
+
+  {  zZzz_Ki_CallsName,    zZzz_Ki_CallsList,
+     apzZzz_Ki_CallsMachs, (regex_t*)NULL,
+     ZZZ_KI_CALLS_TEST_CT, FD_MACH_ONLY,
+     aZzz_Ki_CallsTests,   apzZzz_Ki_CallsPatch },
+
+  {  zZzz_Ki_DefsName,    zZzz_Ki_DefsList,
+     apzZzz_Ki_DefsMachs, (regex_t*)NULL,
+     ZZZ_KI_DEFS_TEST_CT, FD_MACH_ONLY,
+     aZzz_Ki_DefsTests,   apzZzz_Ki_DefsPatch },
+
+  {  zZzz_TimeName,    zZzz_TimeList,
+     apzZzz_TimeMachs, (regex_t*)NULL,
+     ZZZ_TIME_TEST_CT, FD_MACH_ONLY,
+     aZzz_TimeTests,   apzZzz_TimePatch }
 };