* MAINTAINERS (mt port): Remove.

	(sco5, unixware, sco udk): Remove.
	(Kean Johnston): Add to Write After Approval.

fixincludes:
	* inclhack.def (AAB_svr4_replace_byteorder,
	AAB_ultrix_ansi_compat, AAB_ultrix_limits, AAB_ultrix_memory,
	libc1_G_va_list, libc1_ifdefd_memx, nested_motorola,
	ptx_sys_mc_param_h, sco_regset, sco_static_func, sco_utime,
	solaris_mutex_init_1, solaris_socket, solaris_unistd,
	solaris_widec, svr4_krnl, ultrix_atexit_param, ultrix_atof_param,
	ultrix_const3, ultrix_fix_fixproto, ultrix_ifdef, ultrix_locale,
	ultrix_math_ifdef, ultrix_nested_ioctl, ultrix_nested_svc,
	ultrix_stat, ultrix_static, ultrix_stdlib, ultrix_strings,
	ultrix_strings2, ultrix_sys_time, ultrix_unistd,
	unicosmk_restrict, uw7_byteorder_fix, windiss_math1,
	windiss_math2, windiss_valist): Remove.
	* fixincl.x: Regenerate.
	* mkfixinc.sh: (arm-semi-aof, hppa1.1-*-osf*, hppa1.1-*-bsd*,
	i370-*-openedition, i?86-*-moss*, i?86-*-uwin*,
	powerpc-*-eabiaix*): Remove.
	* tests/base/math.h: Update.
	* tests/base/pthread.h: Update.
	* tests/base/stdio.h: Update.
	* tests/base/stdlib.h: Update.
	* tests/base/string.h: Update.
	* tests/base/strings.h: Update.
	* tests/base/sys/file.h: Update.
	* tests/base/sys/limits.h: Update.
	* tests/base/sys/socket.h: Update.
	* tests/base/sys/stat.h: Update.
	* tests/base/sys/time.h: Update.
	* tests/base/testing.h: Update.
	* tests/base/unistd.h: Update.
	* tests/base/_G_config.h: Remove.
	* tests/base/arpa: Remove directory.
	* tests/base/fs: Remove directory.
	* tests/base/locale.h: Remove.
	* tests/base/machine: Remove directory.
	* tests/base/rpc/svc.h: Remove.
	* tests/base/sys/ioctl.h: Remove.
	* tests/base/sys/regset.h: Remove.
	* tests/base/sys/times.h: Remove.
	* tests/base/sys/utsname.h: Remove.
	* tests/base/widec.h: Remove.

gcc:
	* config.gcc (Obsolete configurations): Remove list of
	configurations.
	(Unsupported targets list): Add *-*-linux*aout*, *-*-linux*libc1*,
	*-*-solaris2.[0-6], *-*-solaris2.[0-6].*, *-*-sysv*.  Remove other
	targets matched by those patterns.
	(strongarm*-*-*, ep9312*-*-*, xscale-*-*, parisc*-*-*,
	m680[012]0-*-*, *-*-linux*libc1*, *-*-linux*aout*,
	alpha*-*-unicosmk*, strongarm*-*-freebsd*, ep9312-*-elf,
	arm*-*-kaos*, cris-*-aout, parisc*64*-*-linux*, parisc*-*-linux*,
	hppa1.1-*-pro*, hppa1.1-*-osf*, hppa1.1-*-bsd*,
	i[34567]86-sequent-ptx4*, i[34567]86-sequent-sysv4*,
	i[34567]86-*-beoself*, i[34567]86-*-beos*, i[34567]86-*-sco3.2v5*,
	i[34567]86-*-sysv5*, i[34567]86-*-sysv4*, i[34567]86-*-uwin*,
	i[34567]86-*-kaos*, m68020-*-elf*, m68010-*-netbsdelf*,
	mips-wrs-windiss, mt-*-elf, powerpc-*-beos*, powerpc-*-chorusos*,
	powerpc-wrs-windiss*, powerpcle-*-sysv*, powerpc-*-kaos*,
	powerpcle-*-kaos*, sh*-*-kaos*, sparc-*-sysv4*, strongarm-*-elf*,
	strongarm-*-pe, strongarm-*-kaos*, vax-*-bsd*, vax-*-sysv*,
	vax-*-ultrix*, xscale-*-elf, xscale-*-coff,
	i[34567]86-*-linux*aout*, i[34567]86-*-linux*libc1): Remove.
	Make code for Solaris 7 and greater unconditional for Solaris.
	(ep9312-*-*, parisc1*, m680[012]0-*-*, parisc*-*-*, mt-*-*):
	Remove --with-* handling.
	* config/rs6000/sysv4.h (-mwindiss): Remove from all specs.
	(LIB_WINDISS_SPEC, CPP_OS_WINDISS_SPEC, STARTFILE_WINDISS_SPEC,
	ENDFILE_WINDISS_SPEC, LINK_START_WINDISS_SPEC,
	LINK_OS_WINDISS_SPEC): Remove.
	* config/rs6000/sysv4.opt (mwindiss): Remove.
	* configure.ac (strongarm*-*-*, xscale*-*-*): Remove.
	* configure: Regenerate.
	* doc/cpp.texi: Don't mention BeOS.
	* doc/extend.texi (interrupt): Don't mention MS1.
	* doc/install.texi: (i386-@var{any}-sysv, m68k-bull-sysv,
	m68k-hp-hpux, m68000-hp-hpux, m68000-att-sysv,
	alphaev5-cray-unicosmk*, xscale-*-*, i?86-*-linux*aout,
	i?86-*-sco3.2v5*, i?86-*-udk, m68k-hp-hpux, powerpc-*-sysv4,
	powerpc-*-sysv4, powerpcle-*-sysv4, *-*-sysv*, vax-dec-ultrix):
	Remove.
	* doc/invoke.texi (MT Options): Remove.
	(-mwindiss): Remove.
	(CRIS Options): Remove cris-axis-aout references.
	(HPPA Options): Don't mention hppa1.1-*-pro.
	* doc/md.texi: (MorphoTech family): Remove.
	* libgcc2.c: Don't handle UWIN.
	* config/alpha/t-unicosmk: Remove.
	* config/alpha/unicosmk.h: Remove.
	* config/arm/kaos-arm.h: Remove.
	* config/arm/kaos-strongarm.h: Remove.
	* config/arm/strongarm-coff.h: Remove.
	* config/arm/strongarm-elf.h: Remove.
	* config/arm/strongarm-pe.h: Remove.
	* config/arm/t-strongarm-pe: Remove.
	* config/arm/t-xscale-coff: Remove.
	* config/arm/t-xscale-elf: Remove.
	* config/arm/xscale-coff.h: Remove.
	* config/arm/xscale-elf.h: Remove.
	* config/chorus.h: Remove.
	* config/cris/aout.h: Remove.
	* config/cris/aout.opt: Remove.
	* config/cris/t-aout: Remove.
	* config/i386/beos-elf.h: Remove.
	* config/i386/kaos-i386.h: Remove.
	* config/i386/ptx4-i.h: Remove.
	* config/i386/sco5.h: Remove.
	* config/i386/sco5.opt: Remove.
	* config/i386/sysv4-cpp.h: Remove.
	* config/i386/sysv5.h: Remove.
	* config/i386/t-beos: Remove.
	* config/i386/t-sco5: Remove.
	* config/i386/t-uwin: Remove.
	* config/i386/uwin.asm: Remove.
	* config/i386/uwin.h: Remove.
	* config/kaos.h: Remove.
	* config/mips/windiss.h: Remove.
	* config/mt: Remove directory.
	* config/pa/pa-osf.h: Remove.
	* config/pa/pa-pro-end.h: Remove.
	* config/pa/t-pro: Remove.
	* config/ptx4.h: Remove.
	* config/rs6000/beos.h: Remove.
	* config/rs6000/kaos-ppc.h: Remove.
	* config/rs6000/t-beos: Remove.
	* config/rs6000/windiss.h: Remove.
	* config/sh/kaos-sh.h: Remove.
	* config/sol2-6.h: Remove.
	* config/sparc/sol26-sld.h: Remove.
	* config/sparc/sysv4-only.h: Remove.
	* config/vax/bsd.h: Remove.
	* config/vax/t-memfuncs: Remove.
	* config/vax/ultrix.h: Remove.
	* config/vax/vaxv.h: Remove.
	* config/windiss.h: Remove.

gcc/testsuite:
	* g++.dg/abi/arm_cxa_vec1.C: Don't handle xscale*-*-*.
	* g++.dg/eh/spbp.C: Don't handle *-*-solaris2.[56]*.
	* g++.dg/warn/miss-format-1.C: Don't handle Solaris before Solaris
	7.
	* gcc.c-torture/compile/981006-1.c: Don't handle xscale*-*-*,
	strongarm*-*-* and cris-*-aout*.
	* gcc.c-torture/execute/941014-1.x: Don't handle xscale*-*-* and
	strongarm*-*-*.
	* gcc.dg/20030909-1.c: Don't handle xscale*-*-* and
	strongarm*-*-*.
	* gcc.dg/20031108-1.c: Don't handle xscale*-*-* and
	strongarm*-*-*.
	* gcc.dg/20040813-1.c: Don't handle *-*-sysv5*.
	* gcc.dg/arm-asm.c: Don't handle strongarm*-*-* and xscale*-*-*.
	* gcc.dg/arm-scd42-1.c: Use target arm*-*-*.
	* gcc.dg/arm-scd42-3.c: Use target arm*-*-*.
	* gcc.dg/cpp/assert4.c: Don't handle BeOS.
	* gcc.dg/debug/pr35154.c: Don't handle *-*-sysv5*.
	* gcc.dg/intmax_t-1.c: Don't handle *-*-solaris2.5.1 and
	xscale*-*-elf*.
	* gcc.dg/pragma-align.c: Don't handle i?86-*-sco3.2v5*.
	* gcc.dg/pthread-init-2.c: Don't handle *-*-solaris2.5.1.
	* gcc.misc-tests/arm-isr.exp: Use target arm*-*-*.
	* gcc.target/powerpc/ppc-sdata-1.c: Don't handle powerpc-*-sysv*.
	* gcc.target/powerpc/ppc-sdata-2.c: Don't handle powerpc-*-sysv*.
	* gcc.target/powerpc/ppc-stackalign-1.c: Don't handle
	powerpc-*-sysv*.
	* gfortran.dg/debug/pr35154-stabs.f: Don't handle *-*-sysv5*.
	* lib/target-supports.exp: Don't handle strongarm*-*-elf,
	xscale*-*-elf and *-*-windiss.
	* obj-c++.dg/dwarf-2.mm: Don't handle *-*-solaris2.[56]*.
	* objc.dg/dwarf-1.m: Don't handle *-*-solaris2.[56]*.
	* objc.dg/dwarf-2.m: Don't handle *-*-solaris2.[56]*.
	* gcc.dg/mt-loopi1.c: Remove.

gnattools:
	* configure.ac (xscale*-wrs-vx*, xscale*-wrs-coff): Remove.
	* configure: Regenerate.

libcpp:
	* configure.ac (parisc*64*-*-*): Remove.
	* configure: Regenerate.

libffi:
	* configure.ac (parisc*-*-linux*, powerpc-*-sysv*,
	powerpc-*-beos*): Remove.
	* configure: Regenerate.

libgcc:
	* config.host (strongarm*-*-*, ep9312*-*-*, xscale-*-*,
	parisc*-*-*, m680[012]0-*-*, *-*-linux*libc1*, *-*-linux*aout*,
	alpha*-*-unicosmk*, strongarm*-*-freebsd*, ep9312-*-elf,
	arm*-*-kaos*, cris-*-aout, parisc*64*-*-linux*, parisc*-*-linux*,
	hppa1.1-*-pro*, hppa1.1-*-osf*, hppa1.1-*-bsd*,
	i[34567]86-sequent-ptx4*, i[34567]86-sequent-sysv4*,
	i[34567]86-*-beoself*, i[34567]86-*-beos*, i[34567]86-*-sco3.2v5*,
	i[34567]86-*-sysv5*, i[34567]86-*-sysv4*, i[34567]86-*-uwin*,
	i[34567]86-*-kaos*, m68020-*-elf*, m68010-*-netbsdelf*,
	mips-wrs-windiss, mt-*-elf, powerpc-*-beos*, powerpc-*-chorusos*,
	powerpc-wrs-windiss*, powerpcle-*-sysv*, powerpc-*-kaos*,
	powerpcle-*-kaos*, sh*-*-kaos*, sparc-*-sysv4*, strongarm-*-elf*,
	strongarm-*-pe, strongarm-*-kaos*, vax-*-bsd*, vax-*-sysv*,
	vax-*-ultrix*, xscale-*-elf, xscale-*-coff): Remove.

libjava:
	* configure.host (strongarm*-elf, xscale*-elf): Remove.

libstdc++-v3:
	* configure.host (xscale, ep9312, m680[246]0, solaris2.5,
	solaris2.5.[0-9], solaris2.6, windiss*): Remove.
	* crossconfig.m4 (*-solaris2.5, *-solaris2.6, *-windiss*): Remove.
	* configure: Regenerate.
	* config/os/solaris/solaris2.5: Remove directory.
	* config/os/solaris/solaris2.6: Remove directory.
	* config/os/windiss: Remove directory.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@136534 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 21 insertions, 1692 deletions

diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x
index f9786e047b6..cbf6d07aa1b 100644
--- a/fixincludes/fixincl.x
+++ b/fixincludes/fixincl.x
@@ -2,11 +2,11 @@
  * 
  * DO NOT EDIT THIS FILE   (fixincl.x)
  * 
- * It has been AutoGen-ed  Friday May 23, 2008 at 06:50:18 PM CEST
+ * It has been AutoGen-ed  Thursday May 29, 2008 at 11:31:36 PM UTC
  * From the definitions    inclhack.def
  * and the template file   fixincl
  */
-/* DO NOT SVN-MERGE THIS FILE, EITHER Fri May 23 18:50:18 CEST 2008
+/* DO NOT SVN-MERGE THIS FILE, EITHER Thu May 29 23:31:36 UTC 2008
  *
  * You must regenerate it.  Use the ./genfixes script.
  *
@@ -15,30 +15,25 @@
  * 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 213 fixup descriptions.
+ * This file contains 177 fixup descriptions.
  *
  * See README for more information.
  *
  *  inclhack copyright (c) 1998, 1999, 2000, 2001
  *  The Free Software Foundation, Inc.
  *
-  *  inclhack is free software.
+  *  inclhack is free software: you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License as published by the
+ *  Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
  *  
- *  You may redistribute it and/or modify it under the terms of the
- *  GNU General Public License, as published by the Free Software
- *  Foundation; either version 2 of the License, or (at your option)
- *  any later version.
- *  
- *  inclhack is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  inclhack is distributed in the hope that it will be useful, but
+ *  WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *  See the GNU General Public License for more details.
  *  
- *  You should have received a copy of the GNU General Public License
- *  along with inclhack.  If not, write to:
- *  	The Free Software Foundation, Inc.,
- *  	51 Franklin Street, Fifth Floor
- *  	Boston, MA  02110-1301, USA.
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -503,251 +498,16 @@ fix = {\n\
 };\n\
 #endif\n\n\n\
 /*\n\
- *  Completely replace <sys/byteorder.h> with a file that implements gcc's\n\
- *  optimized byteswapping.  (The original probably implemented some\n\
- *  incompatible optimized byteswapping.)\n\
+ *  The Ultrix 4.3 file string.h is a symbolic link to strings.h.\n\
+ *  Replace string.h link with a file that includes strings.h to prevent\n\
+ *  problems from multiple inclusion.\n\
  */\n\
 fix = {\n\
-    hackname = AAB_svr4_replace_byteorder;\n\
-    mach     = \"*-*-sysv4*\";\n\
-    mach     = \"i[34567]86-*-sysv5*\";\n\
-    mach     = \"i[34567]86-*-sco3.2v5*\";\n\
-    mach     = \"i[34567]86-*-udk*\";\n\
-    mach     = \"i[34567]86-*-solaris2.[0-4]\";\n\
-    mach     = \"powerpcle-*-solaris2.[0-4]\";\n\
-    mach     = \"sparc-*-solaris2.[0-4]\";\n\
-    mach     = \"i[34567]86-sequent-ptx*\";\n\
-    files    = sys/byteorder.h;\n\
+    hackname = AAB_ultrix_string;\n\
+    files    = string.h;\n\
+    mach     = \"*-*-ultrix4.3\";\n\
     replace  = <<-  _EndOfHeader_\n\
-#ifndef _SYS_BYTEORDER_H\n\
-#define _SYS_BYTEORDER_H\n\n\
-/* Functions to convert `short' and `long' quantities from host byte order\n\
-   to (internet) network byte order (i.e. big-endian).\n\n\
-   Written by Ron Guilmette (rfg@ncd.com).\n\n\
-   This isn't actually used by GCC.  It is installed by fixinc.svr4.\n\n\
-   For big-endian machines these functions are essentially no-ops.\n\n\
-   For little-endian machines, we define the functions using specialized\n\
-   asm sequences in cases where doing so yields better code (e.g. i386).  */\n\n\
-#if !defined (__GNUC__) && !defined (__GNUG__)\n\
-  #error You lose!  This file is only useful with GNU compilers.\n\
-#endif\n\n\
-#ifndef __BYTE_ORDER__\n\
-  /* Byte order defines.  These are as defined on UnixWare 1.1, but with\n\
-     double underscores added at the front and back.  */\n\
-  #define __LITTLE_ENDIAN__   1234\n\
-  #define __BIG_ENDIAN__      4321\n\
-  #define __PDP_ENDIAN__      3412\n\
-#endif\n\n\
-#ifdef __STDC__\n\
-  static __inline__ unsigned long htonl (unsigned long);\n\
-  static __inline__ unsigned short htons (unsigned int);\n\
-  static __inline__ unsigned long ntohl (unsigned long);\n\
-  static __inline__ unsigned short ntohs (unsigned int);\n\
-#endif /* defined (__STDC__) */\n\n\
-#if defined (__i386__)\n\n\
-  #ifndef __BYTE_ORDER__\n\
-    #define __BYTE_ORDER__ __LITTLE_ENDIAN__\n\
-  #endif\n\n\
-  /* Convert a host long to a network long.  */\n\n\
-  /* We must use a new-style function definition, so that this will also\n\
-     be valid for C++.  */\n\
-  static __inline__ unsigned long\n\
-  htonl (unsigned long __arg)\n\
-  {\n\
-    register unsigned long __result;\n\n\
-    __asm__ (\"xchg%B0 %b0,%h0\n\
-  ror%L0 $16,%0\n\
-  xchg%B0 %b0,%h0\" : \"=q\" (__result) : \"0\" (__arg));\n\
-    return __result;\n\
-  }\n\n\
-  /* Convert a host short to a network short.  */\n\n\
-  static __inline__ unsigned short\n\
-  htons (unsigned int __arg)\n\
-  {\n\
-    register unsigned short __result;\n\n\
-    __asm__ (\"xchg%B0 %b0,%h0\" : \"=q\" (__result) : \"0\" (__arg));\n\
-    return __result;\n\
-  }\n\n\
-#elif (defined (__ns32k__) || defined (__vax__) || defined (__arm__))\n\n\
-  #ifndef __BYTE_ORDER__\n\
-    #define __BYTE_ORDER__ __LITTLE_ENDIAN__\n\
-  #endif\n\n\
-  /* For other little-endian machines, using C code is just as efficient as\n\
-     using assembly code.  */\n\n\
-  /* Convert a host long to a network long.  */\n\n\
-  static __inline__ unsigned long\n\
-  htonl (unsigned long __arg)\n\
-  {\n\
-    register unsigned long __result;\n\n\
-    __result = (__arg >> 24) & 0x000000ff;\n\
-    __result |= (__arg >> 8) & 0x0000ff00;\n\
-    __result |= (__arg << 8) & 0x00ff0000;\n\
-    __result |= (__arg << 24) & 0xff000000;\n\
-    return __result;\n\
-  }\n\n\
-  /* Convert a host short to a network short.  */\n\n\
-  static __inline__ unsigned short\n\
-  htons (unsigned int __arg)\n\
-  {\n\
-    register unsigned short __result;\n\n\
-    __result = (__arg << 8) & 0xff00;\n\
-    __result |= (__arg >> 8) & 0x00ff;\n\
-    return __result;\n\
-  }\n\n\
-#else /* must be a big-endian machine */\n\n\
-  #ifndef __BYTE_ORDER__\n\
-    #define __BYTE_ORDER__ __BIG_ENDIAN__\n\
-  #endif\n\n\
-  /* Convert a host long to a network long.  */\n\n\
-  static __inline__ unsigned long\n\
-  htonl (unsigned long __arg)\n\
-  {\n\
-    return __arg;\n\
-  }\n\n\
-  /* Convert a host short to a network short.  */\n\n\
-  static __inline__ unsigned short\n\
-  htons (unsigned int __arg)\n\
-  {\n\
-    return __arg;\n\
-  }\n\n\
-#endif /* big-endian */\n\n\
-/* Convert a network long to a host long.  */\n\n\
-static __inline__ unsigned long\n\
-ntohl (unsigned long __arg)\n\
-{\n\
-  return htonl (__arg);\n\
-}\n\n\
-/* Convert a network short to a host short.  */\n\n\
-static __inline__ unsigned short\n\
-ntohs (unsigned int __arg)\n\
-{\n\
-  return htons (__arg);\n\
-}\n\
-#endif",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Aab_Ultrix_Ansi_Compat fix
- */
-tSCC zAab_Ultrix_Ansi_CompatName[] =
-     "AAB_ultrix_ansi_compat";
-
-/*
- *  File name selection pattern
- */
-tSCC zAab_Ultrix_Ansi_CompatList[] =
-  "ansi_compat.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-#define apzAab_Ultrix_Ansi_CompatMachs (const char**)NULL
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zAab_Ultrix_Ansi_CompatSelect0[] =
-       "ULTRIX";
-
-#define    AAB_ULTRIX_ANSI_COMPAT_TEST_CT  1
-static tTestDesc aAab_Ultrix_Ansi_CompatTests[] = {
-  { TT_EGREP,    zAab_Ultrix_Ansi_CompatSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Aab_Ultrix_Ansi_Compat
- */
-static const char* apzAab_Ultrix_Ansi_CompatPatch[] = {
-"/* This file intentionally left blank.  */\n",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Aab_Ultrix_Limits fix
- */
-tSCC zAab_Ultrix_LimitsName[] =
-     "AAB_ultrix_limits";
-
-/*
- *  File name selection pattern
- */
-tSCC zAab_Ultrix_LimitsList[] =
-  "limits.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-tSCC* apzAab_Ultrix_LimitsMachs[] = {
-        "*-*-ultrix4.3",
-        (const char*)NULL };
-#define AAB_ULTRIX_LIMITS_TEST_CT  0
-#define aAab_Ultrix_LimitsTests   (tTestDesc*)NULL
-
-/*
- *  Fix Command Arguments for Aab_Ultrix_Limits
- */
-static const char* apzAab_Ultrix_LimitsPatch[] = {
-"#ifndef _LIMITS_INCLUDED\n\
-  #define _LIMITS_INCLUDED\n\
-  #include <sys/limits.h>\n\
-#endif /* _LIMITS_INCLUDED */",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Aab_Ultrix_Memory fix
- */
-tSCC zAab_Ultrix_MemoryName[] =
-     "AAB_ultrix_memory";
-
-/*
- *  File name selection pattern
- */
-tSCC zAab_Ultrix_MemoryList[] =
-  "memory.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-tSCC* apzAab_Ultrix_MemoryMachs[] = {
-        "*-*-ultrix4.3",
-        (const char*)NULL };
-#define AAB_ULTRIX_MEMORY_TEST_CT  0
-#define aAab_Ultrix_MemoryTests   (tTestDesc*)NULL
-
-/*
- *  Fix Command Arguments for Aab_Ultrix_Memory
- */
-static const char* apzAab_Ultrix_MemoryPatch[] = {
-"#ifndef _MEMORY_INCLUDED\n\
-  #define _MEMORY_INCLUDED\n\
-  #include <strings.h>\n\
-#endif /* _MEMORY_INCLUDED */",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Aab_Ultrix_String fix
- */
-tSCC zAab_Ultrix_StringName[] =
-     "AAB_ultrix_string";
-
-/*
- *  File name selection pattern
- */
-tSCC zAab_Ultrix_StringList[] =
-  "string.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-tSCC* apzAab_Ultrix_StringMachs[] = {
-        "*-*-ultrix4.3",
-        (const char*)NULL };
-#define AAB_ULTRIX_STRING_TEST_CT  0
-#define aAab_Ultrix_StringTests   (tTestDesc*)NULL
-
-/*
- *  Fix Command Arguments for Aab_Ultrix_String
- */
-static const char* apzAab_Ultrix_StringPatch[] = {
-"#ifndef _STRING_INCLUDED\n\
+#ifndef _STRING_INCLUDED\n\
   #define _STRING_INCLUDED\n\
   #include <strings.h>\n\
 #endif /* _STRING_INCLUDED */",
@@ -4314,91 +4074,6 @@ static const char* apzKandr_ConcatPatch[] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Libc1_G_Va_List fix
- */
-tSCC zLibc1_G_Va_ListName[] =
-     "libc1_G_va_list";
-
-/*
- *  File name selection pattern
- */
-tSCC zLibc1_G_Va_ListList[] =
-  "_G_config.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-tSCC* apzLibc1_G_Va_ListMachs[] = {
-        "*-*-linux*libc1",
-        (const char*)NULL };
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zLibc1_G_Va_ListSelect0[] =
-       "typedef void \\* _G_va_list;";
-
-#define    LIBC1_G_VA_LIST_TEST_CT  1
-static tTestDesc aLibc1_G_Va_ListTests[] = {
-  { TT_EGREP,    zLibc1_G_Va_ListSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Libc1_G_Va_List
- */
-static const char* apzLibc1_G_Va_ListPatch[] = {
-    "format",
-    "typedef __builtin_va_list _G_va_list;",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Libc1_Ifdefd_Memx fix
- */
-tSCC zLibc1_Ifdefd_MemxName[] =
-     "libc1_ifdefd_memx";
-
-/*
- *  File name selection pattern
- */
-tSCC zLibc1_Ifdefd_MemxList[] =
-  "testing.h\0string.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-#define apzLibc1_Ifdefd_MemxMachs (const char**)NULL
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zLibc1_Ifdefd_MemxSelect0[] =
-       "' is a built-in function for gcc 2\\.x\\. \\*/";
-
-/*
- *  content bypass pattern - skip fix if pattern found
- */
-tSCC zLibc1_Ifdefd_MemxBypass0[] =
-       "__cplusplus";
-
-#define    LIBC1_IFDEFD_MEMX_TEST_CT  2
-static tTestDesc aLibc1_Ifdefd_MemxTests[] = {
-  { TT_NEGREP,   zLibc1_Ifdefd_MemxBypass0, (regex_t*)NULL },
-  { TT_EGREP,    zLibc1_Ifdefd_MemxSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Libc1_Ifdefd_Memx
- */
-static const char* apzLibc1_Ifdefd_MemxPatch[] = {
-    "format",
-    "%1",
-    "/\\* `mem...' is a built-in function for gcc 2\\.x\\. \\*/\n\
-#if defined\\(__STDC__\\) && __GNUC__ < 2\n\
-(/\\* .* \\*/\n\
-extern [a-z_]+ mem.*(\n\
-[^#].*)*;)\n\
-#endif",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
  *  Description of Linux_Ia64_Ucontext fix
  */
 tSCC zLinux_Ia64_UcontextName[] =
@@ -4718,43 +4393,6 @@ static const char* apzNested_Auth_DesPatch[] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Nested_Motorola fix
- */
-tSCC zNested_MotorolaName[] =
-     "nested_motorola";
-
-/*
- *  File name selection pattern
- */
-tSCC zNested_MotorolaList[] =
-  "sys/limits.h\0limits.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-tSCC* apzNested_MotorolaMachs[] = {
-        "m68k-motorola-sysv*",
-        (const char*)NULL };
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zNested_MotorolaSelect0[] =
-       "max # bytes atomic in write|error value returned by Math lib";
-
-#define    NESTED_MOTOROLA_TEST_CT  1
-static tTestDesc aNested_MotorolaTests[] = {
-  { TT_EGREP,    zNested_MotorolaSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Nested_Motorola
- */
-static const char* apzNested_MotorolaPatch[] = { "sed",
-    "-e", "s@^\\(#undef[ \t][ \t]*PIPE_BUF[ \t]*/\\* max # bytes atomic in write to a\\)$@\\1 */@",
-    "-e", "s@\\(/\\*#define\tHUGE_VAL\t3.[0-9e+]* \\)\\(/\\*error value returned by Math lib\\*/\\)$@\\1*/ \\2@",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
  *  Description of Nested_Sys_Limits fix
  */
 tSCC zNested_Sys_LimitsName[] =
@@ -5563,123 +5201,6 @@ static const char* apzSco_MathPatch[] = { "sed",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Sco_Regset fix
- */
-tSCC zSco_RegsetName[] =
-     "sco_regset";
-
-/*
- *  File name selection pattern
- */
-tSCC zSco_RegsetList[] =
-  "sys/regset.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-tSCC* apzSco_RegsetMachs[] = {
-        "*-*-sco3.2v5*",
-        (const char*)NULL };
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zSco_RegsetSelect0[] =
-       "(struct[ \t]+.*)fpstate";
-
-#define    SCO_REGSET_TEST_CT  1
-static tTestDesc aSco_RegsetTests[] = {
-  { TT_EGREP,    zSco_RegsetSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Sco_Regset
- */
-static const char* apzSco_RegsetPatch[] = {
-    "format",
-    "%1rsfpstate",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Sco_Static_Func fix
- */
-tSCC zSco_Static_FuncName[] =
-     "sco_static_func";
-
-/*
- *  File name selection pattern
- */
-tSCC zSco_Static_FuncList[] =
-  "sys/stat.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-tSCC* apzSco_Static_FuncMachs[] = {
-        "i?86-*-sco3.2*",
-        (const char*)NULL };
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zSco_Static_FuncSelect0[] =
-       "^static int";
-
-#define    SCO_STATIC_FUNC_TEST_CT  1
-static tTestDesc aSco_Static_FuncTests[] = {
-  { TT_EGREP,    zSco_Static_FuncSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Sco_Static_Func
- */
-static const char* apzSco_Static_FuncPatch[] = { "sed",
-    "-e", "/^static int/i\\\n\
-#if __cplusplus\\\n\
-extern \"C\" {\\\n\
-#endif /* __cplusplus */",
-    "-e", "/^}$/a\\\n\
-#if __cplusplus\\\n\
- }\\\n\
-#endif /* __cplusplus */",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Sco_Utime fix
- */
-tSCC zSco_UtimeName[] =
-     "sco_utime";
-
-/*
- *  File name selection pattern
- */
-tSCC zSco_UtimeList[] =
-  "sys/times.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-tSCC* apzSco_UtimeMachs[] = {
-        "i?86-*-sco3.2v4*",
-        (const char*)NULL };
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zSco_UtimeSelect0[] =
-       "\\(const char \\*, struct utimbuf \\*\\);";
-
-#define    SCO_UTIME_TEST_CT  1
-static tTestDesc aSco_UtimeTests[] = {
-  { TT_EGREP,    zSco_UtimeSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Sco_Utime
- */
-static const char* apzSco_UtimePatch[] = {
-    "format",
-    "(const char *, const struct utimbuf *);",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
  *  Description of Solaris_Math_1 fix
  */
 tSCC zSolaris_Math_1Name[] =
@@ -5982,41 +5503,6 @@ static const char* apzSolaris_Math_10Patch[] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Solaris_Mutex_Init_1 fix
- */
-tSCC zSolaris_Mutex_Init_1Name[] =
-     "solaris_mutex_init_1";
-
-/*
- *  File name selection pattern
- */
-tSCC zSolaris_Mutex_Init_1List[] =
-  "pthread.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-#define apzSolaris_Mutex_Init_1Machs (const char**)NULL
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zSolaris_Mutex_Init_1Select0[] =
-       "@\\(#\\)pthread.h[ \t]+1.1[0-9][ \t]+9[567]/[0-9/]+ SMI";
-
-#define    SOLARIS_MUTEX_INIT_1_TEST_CT  1
-static tTestDesc aSolaris_Mutex_Init_1Tests[] = {
-  { TT_EGREP,    zSolaris_Mutex_Init_1Select0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Solaris_Mutex_Init_1
- */
-static const char* apzSolaris_Mutex_Init_1Patch[] = { "sed",
-    "-e", "/define[ \t]*PTHREAD_MUTEX_INI/s/{0, 0,/{{{0}, 0}, {{{0}}},/\n\
-/define[ \t]*PTHREAD_COND_INI/s/{0,/{{{0},0},/",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
  *  Description of Solaris_Mutex_Init_2 fix
  */
 tSCC zSolaris_Mutex_Init_2Name[] =
@@ -6184,42 +5670,6 @@ static const char* apzSolaris_Once_Init_2Patch[] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Solaris_Socket fix
- */
-tSCC zSolaris_SocketName[] =
-     "solaris_socket";
-
-/*
- *  File name selection pattern
- */
-tSCC zSolaris_SocketList[] =
-  "sys/socket.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-#define apzSolaris_SocketMachs (const char**)NULL
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zSolaris_SocketSelect0[] =
-       "@\\(#\\)socket.h[ \t]+1.[123][0-9][ \t]+9[567]/[0-9/]+ SMI";
-
-#define    SOLARIS_SOCKET_TEST_CT  1
-static tTestDesc aSolaris_SocketTests[] = {
-  { TT_EGREP,    zSolaris_SocketSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Solaris_Socket
- */
-static const char* apzSolaris_SocketPatch[] = {
-    "format",
-    "extern int %1(int, %2void *, int, int);",
-    "^extern int (recv|send)\\(int, (const )*char \\*, int, int\\);",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
  *  Description of Solaris_Stdio_Tag fix
  */
 tSCC zSolaris_Stdio_TagName[] =
@@ -6261,96 +5711,6 @@ static const char* apzSolaris_Stdio_TagPatch[] = { "sed",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Solaris_Unistd fix
- */
-tSCC zSolaris_UnistdName[] =
-     "solaris_unistd";
-
-/*
- *  File name selection pattern
- */
-tSCC zSolaris_UnistdList[] =
-  "unistd.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-#define apzSolaris_UnistdMachs (const char**)NULL
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zSolaris_UnistdSelect0[] =
-       "@\\(#\\)unistd.h[ \t]+1.3[0-9][ \t]+9[567]/[0-9/]+ SMI";
-
-/*
- *  content bypass pattern - skip fix if pattern found
- */
-tSCC zSolaris_UnistdBypass0[] =
-       "getpagesize";
-
-#define    SOLARIS_UNISTD_TEST_CT  2
-static tTestDesc aSolaris_UnistdTests[] = {
-  { TT_NEGREP,   zSolaris_UnistdBypass0, (regex_t*)NULL },
-  { TT_EGREP,    zSolaris_UnistdSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Solaris_Unistd
- */
-static const char* apzSolaris_UnistdPatch[] = {
-    "format",
-    "extern int getpagesize();\n\
-%0",
-    "^extern (pid_t|int) getpgid\\(.*\\);",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Solaris_Widec fix
- */
-tSCC zSolaris_WidecName[] =
-     "solaris_widec";
-
-/*
- *  File name selection pattern
- */
-tSCC zSolaris_WidecList[] =
-  "widec.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-tSCC* apzSolaris_WidecMachs[] = {
-        "*-*-solaris2.[0-5]",
-        "*-*-solaris2.[0-5].*",
-        (const char*)NULL };
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zSolaris_WidecSelect0[] =
-       "#include <euc.h>";
-
-/*
- *  content bypass pattern - skip fix if pattern found
- */
-tSCC zSolaris_WidecBypass0[] =
-       "include.*wchar\\.h";
-
-#define    SOLARIS_WIDEC_TEST_CT  2
-static tTestDesc aSolaris_WidecTests[] = {
-  { TT_NEGREP,   zSolaris_WidecBypass0, (regex_t*)NULL },
-  { TT_EGREP,    zSolaris_WidecSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Solaris_Widec
- */
-static const char* apzSolaris_WidecPatch[] = {
-    "format",
-    "%0\n\
-#include <wchar.h>",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
  *  Description of Statsswtch fix
  */
 tSCC zStatsswtchName[] =
@@ -7072,45 +6432,6 @@ static const char* apzSvr4_GetcwdPatch[] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Svr4_Krnl fix
- */
-tSCC zSvr4_KrnlName[] =
-     "svr4_krnl";
-
-/*
- *  File name selection pattern
- */
-tSCC zSvr4_KrnlList[] =
-  "fs/rfs/rf_cache.h\0sys/erec.h\0sys/err.h\0sys/char.h\0sys/getpages.h\0sys/map.h\0sys/cmn_err.h\0sys/kdebugger.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-tSCC* apzSvr4_KrnlMachs[] = {
-        "*-*-sysv4*",
-        "i?86-sequent-ptx*",
-        (const char*)NULL };
-
-/*
- *  content bypass pattern - skip fix if pattern found
- */
-tSCC zSvr4_KrnlBypass0[] =
-       "_KERNEL";
-
-#define    SVR4_KRNL_TEST_CT  1
-static tTestDesc aSvr4_KrnlTests[] = {
-  { TT_NEGREP,   zSvr4_KrnlBypass0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Svr4_Krnl
- */
-static const char* apzSvr4_KrnlPatch[] = {
-    "wrap",
-    "#ifdef _KERNEL\n",
-    "#endif /* _KERNEL */\n",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
  *  Description of Svr4_Profil fix
  */
 tSCC zSvr4_ProfilName[] =
@@ -7388,76 +6709,6 @@ static const char* apzTinfo_CplusplusPatch[] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Ultrix_Atexit_Param fix
- */
-tSCC zUltrix_Atexit_ParamName[] =
-     "ultrix_atexit_param";
-
-/*
- *  File name selection pattern
- */
-tSCC zUltrix_Atexit_ParamList[] =
-  "stdlib.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-#define apzUltrix_Atexit_ParamMachs (const char**)NULL
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zUltrix_Atexit_ParamSelect0[] =
-       "atexit\\(.*\\(\\)";
-
-#define    ULTRIX_ATEXIT_PARAM_TEST_CT  1
-static tTestDesc aUltrix_Atexit_ParamTests[] = {
-  { TT_EGREP,    zUltrix_Atexit_ParamSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Ultrix_Atexit_Param
- */
-static const char* apzUltrix_Atexit_ParamPatch[] = {
-    "format",
-    "atexit( void (*__func)( void )",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Ultrix_Atof_Param fix
- */
-tSCC zUltrix_Atof_ParamName[] =
-     "ultrix_atof_param";
-
-/*
- *  File name selection pattern
- */
-tSCC zUltrix_Atof_ParamList[] =
-  "math.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-#define apzUltrix_Atof_ParamMachs (const char**)NULL
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zUltrix_Atof_ParamSelect0[] =
-       "atof\\([ \t]*char";
-
-#define    ULTRIX_ATOF_PARAM_TEST_CT  1
-static tTestDesc aUltrix_Atof_ParamTests[] = {
-  { TT_EGREP,    zUltrix_Atof_ParamSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Ultrix_Atof_Param
- */
-static const char* apzUltrix_Atof_ParamPatch[] = {
-    "format",
-    "atof(const char",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
  *  Description of Ultrix_Const fix
  */
 tSCC zUltrix_ConstName[] =
@@ -7530,621 +6781,6 @@ static const char* apzUltrix_Const2Patch[] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Ultrix_Const3 fix
- */
-tSCC zUltrix_Const3Name[] =
-     "ultrix_const3";
-
-/*
- *  File name selection pattern
- */
-tSCC zUltrix_Const3List[] =
-  "stdio.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-#define apzUltrix_Const3Machs (const char**)NULL
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zUltrix_Const3Select0[] =
-       "fdopen\\( .*, char \\*";
-
-#define    ULTRIX_CONST3_TEST_CT  1
-static tTestDesc aUltrix_Const3Tests[] = {
-  { TT_EGREP,    zUltrix_Const3Select0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Ultrix_Const3
- */
-static const char* apzUltrix_Const3Patch[] = {
-    "format",
-    "%1 const %3 *__",
-    "([ \t*](fdopen)\\(.*)[ \t]+(char|void) \\*__",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Ultrix_Fix_Fixproto fix
- */
-tSCC zUltrix_Fix_FixprotoName[] =
-     "ultrix_fix_fixproto";
-
-/*
- *  File name selection pattern
- */
-tSCC zUltrix_Fix_FixprotoList[] =
-  "sys/utsname.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-#define apzUltrix_Fix_FixprotoMachs (const char**)NULL
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zUltrix_Fix_FixprotoSelect0[] =
-       "ULTRIX";
-
-#define    ULTRIX_FIX_FIXPROTO_TEST_CT  1
-static tTestDesc aUltrix_Fix_FixprotoTests[] = {
-  { TT_EGREP,    zUltrix_Fix_FixprotoSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Ultrix_Fix_Fixproto
- */
-static const char* apzUltrix_Fix_FixprotoPatch[] = {
-    "format",
-    "struct utsname;\n\
-%0",
-    "^[ \t]*extern[ \t]*int[ \t]*uname\\(\\);",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Ultrix_Ifdef fix
- */
-tSCC zUltrix_IfdefName[] =
-     "ultrix_ifdef";
-
-/*
- *  File name selection pattern
- */
-tSCC zUltrix_IfdefList[] =
-  "sys/file.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-#define apzUltrix_IfdefMachs (const char**)NULL
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zUltrix_IfdefSelect0[] =
-       "^#ifdef KERNEL[ \t]+&&";
-
-#define    ULTRIX_IFDEF_TEST_CT  1
-static tTestDesc aUltrix_IfdefTests[] = {
-  { TT_EGREP,    zUltrix_IfdefSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Ultrix_Ifdef
- */
-static const char* apzUltrix_IfdefPatch[] = {
-    "format",
-    "#if defined(KERNEL) &&",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Ultrix_Locale fix
- */
-tSCC zUltrix_LocaleName[] =
-     "ultrix_locale";
-
-/*
- *  File name selection pattern
- */
-tSCC zUltrix_LocaleList[] =
-  "locale.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-#define apzUltrix_LocaleMachs (const char**)NULL
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zUltrix_LocaleSelect0[] =
-       "@\\(#\\)locale\\.h.*6\\.1.*\\(ULTRIX\\)";
-
-#define    ULTRIX_LOCALE_TEST_CT  1
-static tTestDesc aUltrix_LocaleTests[] = {
-  { TT_EGREP,    zUltrix_LocaleSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Ultrix_Locale
- */
-static const char* apzUltrix_LocalePatch[] = {
-    "wrap",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Ultrix_Math_Ifdef fix
- */
-tSCC zUltrix_Math_IfdefName[] =
-     "ultrix_math_ifdef";
-
-/*
- *  File name selection pattern
- */
-tSCC zUltrix_Math_IfdefList[] =
-  "sys/limits.h\0float.h\0math.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-#define apzUltrix_Math_IfdefMachs (const char**)NULL
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zUltrix_Math_IfdefSelect0[] =
-       "^(#if.*)\\|\\|[ \t]+CC\\$[a-z]+";
-
-#define    ULTRIX_MATH_IFDEF_TEST_CT  1
-static tTestDesc aUltrix_Math_IfdefTests[] = {
-  { TT_EGREP,    zUltrix_Math_IfdefSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Ultrix_Math_Ifdef
- */
-static const char* apzUltrix_Math_IfdefPatch[] = {
-    "format",
-    "%1",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Ultrix_Nested_Ioctl fix
- */
-tSCC zUltrix_Nested_IoctlName[] =
-     "ultrix_nested_ioctl";
-
-/*
- *  File name selection pattern
- */
-tSCC zUltrix_Nested_IoctlList[] =
-  "sys/ioctl.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-#define apzUltrix_Nested_IoctlMachs (const char**)NULL
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zUltrix_Nested_IoctlSelect0[] =
-       "^/\\* #define SIOCSCREEN";
-
-#define    ULTRIX_NESTED_IOCTL_TEST_CT  1
-static tTestDesc aUltrix_Nested_IoctlTests[] = {
-  { TT_EGREP,    zUltrix_Nested_IoctlSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Ultrix_Nested_Ioctl
- */
-static const char* apzUltrix_Nested_IoctlPatch[] = { "sed",
-    "-e", "/^\\/\\* #define SIOCSCREEN/s@/\\* screend@*//* screend@",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Ultrix_Nested_Svc fix
- */
-tSCC zUltrix_Nested_SvcName[] =
-     "ultrix_nested_svc";
-
-/*
- *  File name selection pattern
- */
-tSCC zUltrix_Nested_SvcList[] =
-  "rpc/svc.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-#define apzUltrix_Nested_SvcMachs (const char**)NULL
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zUltrix_Nested_SvcSelect0[] =
-       "^ \\*[ \t]*int protocol;  */\\*";
-
-#define    ULTRIX_NESTED_SVC_TEST_CT  1
-static tTestDesc aUltrix_Nested_SvcTests[] = {
-  { TT_EGREP,    zUltrix_Nested_SvcSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Ultrix_Nested_Svc
- */
-static const char* apzUltrix_Nested_SvcPatch[] = { "sed",
-    "-e", "s@^\\( \\*\tint protocol;  \\)/\\*@\\1*/ /*@",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Ultrix_Stat fix
- */
-tSCC zUltrix_StatName[] =
-     "ultrix_stat";
-
-/*
- *  File name selection pattern
- */
-tSCC zUltrix_StatList[] =
-  "sys/stat.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-#define apzUltrix_StatMachs (const char**)NULL
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zUltrix_StatSelect0[] =
-       "@\\(#\\)stat\\.h.*6\\.1.*\\(ULTRIX\\)";
-
-#define    ULTRIX_STAT_TEST_CT  1
-static tTestDesc aUltrix_StatTests[] = {
-  { TT_EGREP,    zUltrix_StatSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Ultrix_Stat
- */
-static const char* apzUltrix_StatPatch[] = { "sed",
-    "-e", "/^#define[ \t]S_IFPORT[ \t]*S_IFIFO$/a\\\n\
-\\\n\
-/* macro to test for symbolic link */\\\n\
-#define S_ISLNK(mode) (((mode) & S_IFMT) == S_IFLNK)\\\n\n",
-    "-e", "/^[ \t]*fstat(),$/a\\\n\
-\tlstat(),\n",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Ultrix_Static fix
- */
-tSCC zUltrix_StaticName[] =
-     "ultrix_static";
-
-/*
- *  File name selection pattern
- */
-tSCC zUltrix_StaticList[] =
-  "machine/cpu.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-#define apzUltrix_StaticMachs (const char**)NULL
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zUltrix_StaticSelect0[] =
-       "#include \"r[34]_cpu";
-
-#define    ULTRIX_STATIC_TEST_CT  1
-static tTestDesc aUltrix_StaticTests[] = {
-  { TT_EGREP,    zUltrix_StaticSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Ultrix_Static
- */
-static const char* apzUltrix_StaticPatch[] = { "sed",
-    "-e", "s/^static struct tlb_pid_state/struct tlb_pid_state/",
-    "-e", "s/^#include \"r3_cpu\\.h\"$/#include <machine\\/r3_cpu\\.h>/",
-    "-e", "s/^#include \"r4_cpu\\.h\"$/#include <machine\\/r4_cpu\\.h>/",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Ultrix_Stdlib fix
- */
-tSCC zUltrix_StdlibName[] =
-     "ultrix_stdlib";
-
-/*
- *  File name selection pattern
- */
-tSCC zUltrix_StdlibList[] =
-  "stdlib.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-#define apzUltrix_StdlibMachs (const char**)NULL
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zUltrix_StdlibSelect0[] =
-       "@\\(#\\)stdlib\\.h.*6\\.1.*\\(ULTRIX\\)";
-
-#define    ULTRIX_STDLIB_TEST_CT  1
-static tTestDesc aUltrix_StdlibTests[] = {
-  { TT_EGREP,    zUltrix_StdlibSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Ultrix_Stdlib
- */
-static const char* apzUltrix_StdlibPatch[] = { "sed",
-    "-e", "/^char.*getenv( const char .* );.*$/a\\\n\
-int\t\tsetenv( const char *__name, const char *__val, int __ovrwrt );\\\n\
-void\t\tunsetenv( const char *__name );\\\n\
-int\t\tputenv( char *__s );\n",
-    "-e", "/^char.*getenv();.*$/a\\\n\
-int\tsetenv();\\\n\
-void\tunsetenv();\\\n\
-int\tputenv();\n",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Ultrix_Strings fix
- */
-tSCC zUltrix_StringsName[] =
-     "ultrix_strings";
-
-/*
- *  File name selection pattern
- */
-tSCC zUltrix_StringsList[] =
-  "strings.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-#define apzUltrix_StringsMachs (const char**)NULL
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zUltrix_StringsSelect0[] =
-       "@\\(#\\)strings\\.h.*6\\.1.*\\(ULTRIX\\)";
-
-#define    ULTRIX_STRINGS_TEST_CT  1
-static tTestDesc aUltrix_StringsTests[] = {
-  { TT_EGREP,    zUltrix_StringsSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Ultrix_Strings
- */
-static const char* apzUltrix_StringsPatch[] = {
-    "wrap",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Ultrix_Strings2 fix
- */
-tSCC zUltrix_Strings2Name[] =
-     "ultrix_strings2";
-
-/*
- *  File name selection pattern
- */
-tSCC zUltrix_Strings2List[] =
-  "strings.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-#define apzUltrix_Strings2Machs (const char**)NULL
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zUltrix_Strings2Select0[] =
-       "@\\(#\\)strings\\.h.*6\\.1.*\\(ULTRIX\\)";
-
-#define    ULTRIX_STRINGS2_TEST_CT  1
-static tTestDesc aUltrix_Strings2Tests[] = {
-  { TT_EGREP,    zUltrix_Strings2Select0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Ultrix_Strings2
- */
-static const char* apzUltrix_Strings2Patch[] = { "sed",
-    "-e", "/^.*strncmp( const .* );.*/a\\\n\
-\\\n\
-extern int\\\n\
-\tstrcasecmp( const char *__s1, const char *__s2),\\\n\
-\tstrncasecmp( const char *__s1, const char *__s2, size_t __n );\n",
-    "-e", "/^.*strncmp();.*/a\\\n\
-extern int\\\n\
-\tstrcasecmp(),\\\n\
-\tstrncasecmp();\n",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Ultrix_Sys_Time fix
- */
-tSCC zUltrix_Sys_TimeName[] =
-     "ultrix_sys_time";
-
-/*
- *  File name selection pattern
- */
-tSCC zUltrix_Sys_TimeList[] =
-  "sys/time.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-#define apzUltrix_Sys_TimeMachs (const char**)NULL
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zUltrix_Sys_TimeSelect0[] =
-       "@\\(#\\)time\\.h.*6\\.1.*\\(ULTRIX\\)";
-
-#define    ULTRIX_SYS_TIME_TEST_CT  1
-static tTestDesc aUltrix_Sys_TimeTests[] = {
-  { TT_EGREP,    zUltrix_Sys_TimeSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Ultrix_Sys_Time
- */
-static const char* apzUltrix_Sys_TimePatch[] = { "sed",
-    "-e", "/^extern.*time_t.*time( time_t .* );.*$/a\\\n\
-\\\n\
-extern int adjtime(struct timeval *, struct timeval *);\\\n\
-extern int getitimer(int, struct itimerval *);\\\n\
-extern int setitimer(int, struct itimerval *, struct itimerval *);\\\n\
-extern int gettimeofday(struct timeval *, struct timezone *);\\\n\
-extern int settimeofday(struct timeval *, struct timezone *);\\\n\
-extern void profil(const void *, size_t, size_t, unsigned int);\\\n\
-extern int stime(const time_t *);\\\n\
-extern int utimes(const char *, const struct timeval[2]);\\\n\
-extern int select(int, fd_set *, fd_set *, fd_set *, struct timeval *);\n",
-    "-e", "/^extern.*double.*difftime();.*$/a\\\n\
-extern\tint adjtime();\\\n\
-extern\tint getitimer();\\\n\
-extern\tint setitimer();\\\n\
-extern\tint gettimeofday();\\\n\
-extern\tint settimeofday();\\\n\
-extern\tvoid profil();\\\n\
-extern\tint stime();\\\n\
-extern\tint utimes();\\\n\
-extern\tint select();\n",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Ultrix_Unistd fix
- */
-tSCC zUltrix_UnistdName[] =
-     "ultrix_unistd";
-
-/*
- *  File name selection pattern
- */
-tSCC zUltrix_UnistdList[] =
-  "unistd.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-#define apzUltrix_UnistdMachs (const char**)NULL
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zUltrix_UnistdSelect0[] =
-       "@\\(#\\)unistd\\.h.*6\\.1.*\\(ULTRIX\\)";
-
-#define    ULTRIX_UNISTD_TEST_CT  1
-static tTestDesc aUltrix_UnistdTests[] = {
-  { TT_EGREP,    zUltrix_UnistdSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Ultrix_Unistd
- */
-static const char* apzUltrix_UnistdPatch[] = { "sed",
-    "-e", "/^[ \t]*getgroups(),.*$/a\\\n\
-\tgetpagesize(),\n",
-    "-e", "/^[ \t]*fork(),.*$/a\\\n\
-\tvfork(),\n",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Unicosmk_Restrict fix
- */
-tSCC zUnicosmk_RestrictName[] =
-     "unicosmk_restrict";
-
-/*
- *  File name selection pattern
- */
-tSCC zUnicosmk_RestrictList[] =
-  "stdio.h\0stdlib.h\0wchar.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-tSCC* apzUnicosmk_RestrictMachs[] = {
-        "*-*-unicosmk*",
-        (const char*)NULL };
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zUnicosmk_RestrictSelect0[] =
-       "(\\*[ \t]*)restrict([ \t]+)";
-
-#define    UNICOSMK_RESTRICT_TEST_CT  1
-static tTestDesc aUnicosmk_RestrictTests[] = {
-  { TT_EGREP,    zUnicosmk_RestrictSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Unicosmk_Restrict
- */
-static const char* apzUnicosmk_RestrictPatch[] = {
-    "format",
-    "%1__restrict__%2",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Uw7_Byteorder_Fix fix
- */
-tSCC zUw7_Byteorder_FixName[] =
-     "uw7_byteorder_fix";
-
-/*
- *  File name selection pattern
- */
-tSCC zUw7_Byteorder_FixList[] =
-  "arpa/inet.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-tSCC* apzUw7_Byteorder_FixMachs[] = {
-        "*-*-sysv4*",
-        "i?86-*-sysv5*",
-        "i?86-*-udk*",
-        "i?86-*-solaris2.[0-4]",
-        "powerpcle-*-solaris2.[0-4]",
-        "sparc-*-solaris2.[0-4]",
-        (const char*)NULL };
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zUw7_Byteorder_FixSelect0[] =
-       "in_port_t";
-
-/*
- *  perform the 'test' shell command - do fix on success
- */
-tSCC zUw7_Byteorder_FixTest0[] =
-       "-f sys/byteorder.h";
-
-#define    UW7_BYTEORDER_FIX_TEST_CT  2
-static tTestDesc aUw7_Byteorder_FixTests[] = {
-  { TT_TEST,     zUw7_Byteorder_FixTest0,   0 /* unused */ },
-  { TT_EGREP,    zUw7_Byteorder_FixSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Uw7_Byteorder_Fix
- */
-static const char* apzUw7_Byteorder_FixPatch[] = {
-    "format",
-    "",
-    "^extern.*[ \t](htons|ntohs).*\\(in_port_t\\).*;",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
  *  Description of Va_I960_Macro fix
  */
 tSCC zVa_I960_MacroName[] =
@@ -8404,97 +7040,6 @@ typedef void (*__gcc_VOIDFUNCPTR) ();\n\
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Windiss_Math1 fix
- */
-tSCC zWindiss_Math1Name[] =
-     "windiss_math1";
-
-/*
- *  File name selection pattern
- */
-tSCC zWindiss_Math1List[] =
-  "math.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-tSCC* apzWindiss_Math1Machs[] = {
-        "*-*-windiss",
-        (const char*)NULL };
-#define WINDISS_MATH1_TEST_CT  0
-#define aWindiss_Math1Tests   (tTestDesc*)NULL
-
-/*
- *  Fix Command Arguments for Windiss_Math1
- */
-static const char* apzWindiss_Math1Patch[] = { "sed",
-    "-e", "s|inline long double cosl.*|#ifndef __GNUC__|",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Windiss_Math2 fix
- */
-tSCC zWindiss_Math2Name[] =
-     "windiss_math2";
-
-/*
- *  File name selection pattern
- */
-tSCC zWindiss_Math2List[] =
-  "math.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-tSCC* apzWindiss_Math2Machs[] = {
-        "*-*-windiss",
-        (const char*)NULL };
-#define WINDISS_MATH2_TEST_CT  0
-#define aWindiss_Math2Tests   (tTestDesc*)NULL
-
-/*
- *  Fix Command Arguments for Windiss_Math2
- */
-static const char* apzWindiss_Math2Patch[] = { "sed",
-    "-e", "s|/\\* long double declarations \\*/|#endif /* __GNUC__ */|",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Windiss_Valist fix
- */
-tSCC zWindiss_ValistName[] =
-     "windiss_valist";
-
-/*
- *  File name selection pattern
- */
-#define zWindiss_ValistList (char*)NULL
-/*
- *  Machine/OS name selection pattern
- */
-tSCC* apzWindiss_ValistMachs[] = {
-        "*-*-windiss",
-        (const char*)NULL };
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zWindiss_ValistSelect0[] =
-       "(#include.*)diab/va_list.h";
-
-#define    WINDISS_VALIST_TEST_CT  1
-static tTestDesc aWindiss_ValistTests[] = {
-  { TT_EGREP,    zWindiss_ValistSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Windiss_Valist
- */
-static const char* apzWindiss_ValistPatch[] = { "sed",
-    "-e", "s|diab/va_list.h|stdarg.h|",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
  *  Description of X11_Class fix
  */
 tSCC zX11_ClassName[] =
@@ -8663,9 +7208,9 @@ static const char* apzX11_SprintfPatch[] = {
  *
  *  List of all fixes
  */
-#define REGEX_COUNT          257
-#define MACH_LIST_SIZE_LIMIT 261
-#define FIX_COUNT            213
+#define REGEX_COUNT          223
+#define MACH_LIST_SIZE_LIMIT 181
+#define FIX_COUNT            177
 
 /*
  *  Enumerate the fixes
@@ -8679,10 +7224,6 @@ typedef enum {
     AAB_FD_ZERO_SELECTBITS_H_FIXIDX,
     AAB_SOLARIS_SYS_VARARGS_H_FIXIDX,
     AAB_SUN_MEMCPY_FIXIDX,
-    AAB_ULTRIX_ANSI_COMPAT_FIXIDX,
-    AAB_ULTRIX_LIMITS_FIXIDX,
-    AAB_ULTRIX_MEMORY_FIXIDX,
-    AAB_ULTRIX_STRING_FIXIDX,
     AIX_PTHREAD_FIXIDX,
     AIX_SYSMACHINE_FIXIDX,
     AIX_SYSWAIT_FIXIDX,
@@ -8774,8 +7315,6 @@ typedef enum {
     ISC_FMOD_FIXIDX,
     ISC_OMITS_WITH_STDC_FIXIDX,
     KANDR_CONCAT_FIXIDX,
-    LIBC1_G_VA_LIST_FIXIDX,
-    LIBC1_IFDEFD_MEMX_FIXIDX,
     LINUX_IA64_UCONTEXT_FIXIDX,
     LYNXOS_NO_WARNING_IN_SYS_TIME_H_FIXIDX,
     LYNXOS_MISSING_PUTENV_FIXIDX,
@@ -8784,7 +7323,6 @@ typedef enum {
     MATH_EXCEPTION_FIXIDX,
     MATH_HUGE_VAL_FROM_DBL_MAX_FIXIDX,
     NESTED_AUTH_DES_FIXIDX,
-    NESTED_MOTOROLA_FIXIDX,
     NESTED_SYS_LIMITS_FIXIDX,
     NETBSD_C99_INLINE_1_FIXIDX,
     NETBSD_C99_INLINE_2_FIXIDX,
@@ -8806,9 +7344,6 @@ typedef enum {
     RS6000_FCHMOD_FIXIDX,
     RS6000_PARAM_FIXIDX,
     SCO_MATH_FIXIDX,
-    SCO_REGSET_FIXIDX,
-    SCO_STATIC_FUNC_FIXIDX,
-    SCO_UTIME_FIXIDX,
     SOLARIS_MATH_1_FIXIDX,
     SOLARIS_MATH_2_FIXIDX,
     SOLARIS_MATH_3_FIXIDX,
@@ -8816,15 +7351,11 @@ typedef enum {
     SOLARIS_MATH_8_FIXIDX,
     SOLARIS_MATH_9_FIXIDX,
     SOLARIS_MATH_10_FIXIDX,
-    SOLARIS_MUTEX_INIT_1_FIXIDX,
     SOLARIS_MUTEX_INIT_2_FIXIDX,
     SOLARIS_RWLOCK_INIT_1_FIXIDX,
     SOLARIS_ONCE_INIT_1_FIXIDX,
     SOLARIS_ONCE_INIT_2_FIXIDX,
-    SOLARIS_SOCKET_FIXIDX,
     SOLARIS_STDIO_TAG_FIXIDX,
-    SOLARIS_UNISTD_FIXIDX,
-    SOLARIS_WIDEC_FIXIDX,
     STATSSWTCH_FIXIDX,
     STDIO_STDARG_H_FIXIDX,
     STDIO_VA_LIST_FIXIDX,
@@ -8843,7 +7374,6 @@ typedef enum {
     SUNOS_STRLEN_FIXIDX,
     SVR4_DISABLE_OPT_FIXIDX,
     SVR4_GETCWD_FIXIDX,
-    SVR4_KRNL_FIXIDX,
     SVR4_PROFIL_FIXIDX,
     SVR4_SIGHANDLER_TYPE_FIXIDX,
     SVR4_UNDECLARED_GETRNGE_FIXIDX,
@@ -8851,35 +7381,14 @@ typedef enum {
     SYSZ_STDLIB_FOR_SUN_FIXIDX,
     THREAD_KEYWORD_FIXIDX,
     TINFO_CPLUSPLUS_FIXIDX,
-    ULTRIX_ATEXIT_PARAM_FIXIDX,
-    ULTRIX_ATOF_PARAM_FIXIDX,
     ULTRIX_CONST_FIXIDX,
     ULTRIX_CONST2_FIXIDX,
-    ULTRIX_CONST3_FIXIDX,
-    ULTRIX_FIX_FIXPROTO_FIXIDX,
-    ULTRIX_IFDEF_FIXIDX,
-    ULTRIX_LOCALE_FIXIDX,
-    ULTRIX_MATH_IFDEF_FIXIDX,
-    ULTRIX_NESTED_IOCTL_FIXIDX,
-    ULTRIX_NESTED_SVC_FIXIDX,
-    ULTRIX_STAT_FIXIDX,
-    ULTRIX_STATIC_FIXIDX,
-    ULTRIX_STDLIB_FIXIDX,
-    ULTRIX_STRINGS_FIXIDX,
-    ULTRIX_STRINGS2_FIXIDX,
-    ULTRIX_SYS_TIME_FIXIDX,
-    ULTRIX_UNISTD_FIXIDX,
-    UNICOSMK_RESTRICT_FIXIDX,
-    UW7_BYTEORDER_FIX_FIXIDX,
     VA_I960_MACRO_FIXIDX,
     VOID_NULL_FIXIDX,
     VXWORKS_GCC_PROBLEM_FIXIDX,
     VXWORKS_NEEDS_VXTYPES_FIXIDX,
     VXWORKS_NEEDS_VXWORKS_FIXIDX,
     VXWORKS_TIME_FIXIDX,
-    WINDISS_MATH1_FIXIDX,
-    WINDISS_MATH2_FIXIDX,
-    WINDISS_VALIST_FIXIDX,
     X11_CLASS_FIXIDX,
     X11_CLASS_USAGE_FIXIDX,
     X11_NEW_FIXIDX,
@@ -8927,26 +7436,6 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      AAB_SUN_MEMCPY_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT,
      aAab_Sun_MemcpyTests,   apzAab_Sun_MemcpyPatch, 0 },
 
-  {  zAab_Ultrix_Ansi_CompatName,    zAab_Ultrix_Ansi_CompatList,
-     apzAab_Ultrix_Ansi_CompatMachs,
-     AAB_ULTRIX_ANSI_COMPAT_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT,
-     aAab_Ultrix_Ansi_CompatTests,   apzAab_Ultrix_Ansi_CompatPatch, 0 },
-
-  {  zAab_Ultrix_LimitsName,    zAab_Ultrix_LimitsList,
-     apzAab_Ultrix_LimitsMachs,
-     AAB_ULTRIX_LIMITS_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT,
-     aAab_Ultrix_LimitsTests,   apzAab_Ultrix_LimitsPatch, 0 },
-
-  {  zAab_Ultrix_MemoryName,    zAab_Ultrix_MemoryList,
-     apzAab_Ultrix_MemoryMachs,
-     AAB_ULTRIX_MEMORY_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT,
-     aAab_Ultrix_MemoryTests,   apzAab_Ultrix_MemoryPatch, 0 },
-
-  {  zAab_Ultrix_StringName,    zAab_Ultrix_StringList,
-     apzAab_Ultrix_StringMachs,
-     AAB_ULTRIX_STRING_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT,
-     aAab_Ultrix_StringTests,   apzAab_Ultrix_StringPatch, 0 },
-
   {  zAix_PthreadName,    zAix_PthreadList,
      apzAix_PthreadMachs,
      AIX_PTHREAD_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -9402,16 +7891,6 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      KANDR_CONCAT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aKandr_ConcatTests,   apzKandr_ConcatPatch, 0 },
 
-  {  zLibc1_G_Va_ListName,    zLibc1_G_Va_ListList,
-     apzLibc1_G_Va_ListMachs,
-     LIBC1_G_VA_LIST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aLibc1_G_Va_ListTests,   apzLibc1_G_Va_ListPatch, 0 },
-
-  {  zLibc1_Ifdefd_MemxName,    zLibc1_Ifdefd_MemxList,
-     apzLibc1_Ifdefd_MemxMachs,
-     LIBC1_IFDEFD_MEMX_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aLibc1_Ifdefd_MemxTests,   apzLibc1_Ifdefd_MemxPatch, 0 },
-
   {  zLinux_Ia64_UcontextName,    zLinux_Ia64_UcontextList,
      apzLinux_Ia64_UcontextMachs,
      LINUX_IA64_UCONTEXT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -9452,11 +7931,6 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      NESTED_AUTH_DES_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aNested_Auth_DesTests,   apzNested_Auth_DesPatch, 0 },
 
-  {  zNested_MotorolaName,    zNested_MotorolaList,
-     apzNested_MotorolaMachs,
-     NESTED_MOTOROLA_TEST_CT, FD_MACH_ONLY,
-     aNested_MotorolaTests,   apzNested_MotorolaPatch, 0 },
-
   {  zNested_Sys_LimitsName,    zNested_Sys_LimitsList,
      apzNested_Sys_LimitsMachs,
      NESTED_SYS_LIMITS_TEST_CT, FD_MACH_ONLY,
@@ -9562,21 +8036,6 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      SCO_MATH_TEST_CT, FD_MACH_ONLY,
      aSco_MathTests,   apzSco_MathPatch, 0 },
 
-  {  zSco_RegsetName,    zSco_RegsetList,
-     apzSco_RegsetMachs,
-     SCO_REGSET_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aSco_RegsetTests,   apzSco_RegsetPatch, 0 },
-
-  {  zSco_Static_FuncName,    zSco_Static_FuncList,
-     apzSco_Static_FuncMachs,
-     SCO_STATIC_FUNC_TEST_CT, FD_MACH_ONLY,
-     aSco_Static_FuncTests,   apzSco_Static_FuncPatch, 0 },
-
-  {  zSco_UtimeName,    zSco_UtimeList,
-     apzSco_UtimeMachs,
-     SCO_UTIME_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aSco_UtimeTests,   apzSco_UtimePatch, 0 },
-
   {  zSolaris_Math_1Name,    zSolaris_Math_1List,
      apzSolaris_Math_1Machs,
      SOLARIS_MATH_1_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -9612,11 +8071,6 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      SOLARIS_MATH_10_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aSolaris_Math_10Tests,   apzSolaris_Math_10Patch, 0 },
 
-  {  zSolaris_Mutex_Init_1Name,    zSolaris_Mutex_Init_1List,
-     apzSolaris_Mutex_Init_1Machs,
-     SOLARIS_MUTEX_INIT_1_TEST_CT, FD_MACH_ONLY,
-     aSolaris_Mutex_Init_1Tests,   apzSolaris_Mutex_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,
@@ -9637,26 +8091,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      SOLARIS_ONCE_INIT_2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aSolaris_Once_Init_2Tests,   apzSolaris_Once_Init_2Patch, 0 },
 
-  {  zSolaris_SocketName,    zSolaris_SocketList,
-     apzSolaris_SocketMachs,
-     SOLARIS_SOCKET_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aSolaris_SocketTests,   apzSolaris_SocketPatch, 0 },
-
   {  zSolaris_Stdio_TagName,    zSolaris_Stdio_TagList,
      apzSolaris_Stdio_TagMachs,
      SOLARIS_STDIO_TAG_TEST_CT, FD_MACH_ONLY,
      aSolaris_Stdio_TagTests,   apzSolaris_Stdio_TagPatch, 0 },
 
-  {  zSolaris_UnistdName,    zSolaris_UnistdList,
-     apzSolaris_UnistdMachs,
-     SOLARIS_UNISTD_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aSolaris_UnistdTests,   apzSolaris_UnistdPatch, 0 },
-
-  {  zSolaris_WidecName,    zSolaris_WidecList,
-     apzSolaris_WidecMachs,
-     SOLARIS_WIDEC_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aSolaris_WidecTests,   apzSolaris_WidecPatch, 0 },
-
   {  zStatsswtchName,    zStatsswtchList,
      apzStatsswtchMachs,
      STATSSWTCH_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -9747,11 +8186,6 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      SVR4_GETCWD_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aSvr4_GetcwdTests,   apzSvr4_GetcwdPatch, 0 },
 
-  {  zSvr4_KrnlName,    zSvr4_KrnlList,
-     apzSvr4_KrnlMachs,
-     SVR4_KRNL_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aSvr4_KrnlTests,   apzSvr4_KrnlPatch, 0 },
-
   {  zSvr4_ProfilName,    zSvr4_ProfilList,
      apzSvr4_ProfilMachs,
      SVR4_PROFIL_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -9787,16 +8221,6 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      TINFO_CPLUSPLUS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aTinfo_CplusplusTests,   apzTinfo_CplusplusPatch, 0 },
 
-  {  zUltrix_Atexit_ParamName,    zUltrix_Atexit_ParamList,
-     apzUltrix_Atexit_ParamMachs,
-     ULTRIX_ATEXIT_PARAM_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aUltrix_Atexit_ParamTests,   apzUltrix_Atexit_ParamPatch, 0 },
-
-  {  zUltrix_Atof_ParamName,    zUltrix_Atof_ParamList,
-     apzUltrix_Atof_ParamMachs,
-     ULTRIX_ATOF_PARAM_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aUltrix_Atof_ParamTests,   apzUltrix_Atof_ParamPatch, 0 },
-
   {  zUltrix_ConstName,    zUltrix_ConstList,
      apzUltrix_ConstMachs,
      ULTRIX_CONST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -9807,86 +8231,6 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      ULTRIX_CONST2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aUltrix_Const2Tests,   apzUltrix_Const2Patch, 0 },
 
-  {  zUltrix_Const3Name,    zUltrix_Const3List,
-     apzUltrix_Const3Machs,
-     ULTRIX_CONST3_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aUltrix_Const3Tests,   apzUltrix_Const3Patch, 0 },
-
-  {  zUltrix_Fix_FixprotoName,    zUltrix_Fix_FixprotoList,
-     apzUltrix_Fix_FixprotoMachs,
-     ULTRIX_FIX_FIXPROTO_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aUltrix_Fix_FixprotoTests,   apzUltrix_Fix_FixprotoPatch, 0 },
-
-  {  zUltrix_IfdefName,    zUltrix_IfdefList,
-     apzUltrix_IfdefMachs,
-     ULTRIX_IFDEF_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aUltrix_IfdefTests,   apzUltrix_IfdefPatch, 0 },
-
-  {  zUltrix_LocaleName,    zUltrix_LocaleList,
-     apzUltrix_LocaleMachs,
-     ULTRIX_LOCALE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aUltrix_LocaleTests,   apzUltrix_LocalePatch, 0 },
-
-  {  zUltrix_Math_IfdefName,    zUltrix_Math_IfdefList,
-     apzUltrix_Math_IfdefMachs,
-     ULTRIX_MATH_IFDEF_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aUltrix_Math_IfdefTests,   apzUltrix_Math_IfdefPatch, 0 },
-
-  {  zUltrix_Nested_IoctlName,    zUltrix_Nested_IoctlList,
-     apzUltrix_Nested_IoctlMachs,
-     ULTRIX_NESTED_IOCTL_TEST_CT, FD_MACH_ONLY,
-     aUltrix_Nested_IoctlTests,   apzUltrix_Nested_IoctlPatch, 0 },
-
-  {  zUltrix_Nested_SvcName,    zUltrix_Nested_SvcList,
-     apzUltrix_Nested_SvcMachs,
-     ULTRIX_NESTED_SVC_TEST_CT, FD_MACH_ONLY,
-     aUltrix_Nested_SvcTests,   apzUltrix_Nested_SvcPatch, 0 },
-
-  {  zUltrix_StatName,    zUltrix_StatList,
-     apzUltrix_StatMachs,
-     ULTRIX_STAT_TEST_CT, FD_MACH_ONLY,
-     aUltrix_StatTests,   apzUltrix_StatPatch, 0 },
-
-  {  zUltrix_StaticName,    zUltrix_StaticList,
-     apzUltrix_StaticMachs,
-     ULTRIX_STATIC_TEST_CT, FD_MACH_ONLY,
-     aUltrix_StaticTests,   apzUltrix_StaticPatch, 0 },
-
-  {  zUltrix_StdlibName,    zUltrix_StdlibList,
-     apzUltrix_StdlibMachs,
-     ULTRIX_STDLIB_TEST_CT, FD_MACH_ONLY,
-     aUltrix_StdlibTests,   apzUltrix_StdlibPatch, 0 },
-
-  {  zUltrix_StringsName,    zUltrix_StringsList,
-     apzUltrix_StringsMachs,
-     ULTRIX_STRINGS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aUltrix_StringsTests,   apzUltrix_StringsPatch, 0 },
-
-  {  zUltrix_Strings2Name,    zUltrix_Strings2List,
-     apzUltrix_Strings2Machs,
-     ULTRIX_STRINGS2_TEST_CT, FD_MACH_ONLY,
-     aUltrix_Strings2Tests,   apzUltrix_Strings2Patch, 0 },
-
-  {  zUltrix_Sys_TimeName,    zUltrix_Sys_TimeList,
-     apzUltrix_Sys_TimeMachs,
-     ULTRIX_SYS_TIME_TEST_CT, FD_MACH_ONLY,
-     aUltrix_Sys_TimeTests,   apzUltrix_Sys_TimePatch, 0 },
-
-  {  zUltrix_UnistdName,    zUltrix_UnistdList,
-     apzUltrix_UnistdMachs,
-     ULTRIX_UNISTD_TEST_CT, FD_MACH_ONLY,
-     aUltrix_UnistdTests,   apzUltrix_UnistdPatch, 0 },
-
-  {  zUnicosmk_RestrictName,    zUnicosmk_RestrictList,
-     apzUnicosmk_RestrictMachs,
-     UNICOSMK_RESTRICT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aUnicosmk_RestrictTests,   apzUnicosmk_RestrictPatch, 0 },
-
-  {  zUw7_Byteorder_FixName,    zUw7_Byteorder_FixList,
-     apzUw7_Byteorder_FixMachs,
-     UW7_BYTEORDER_FIX_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aUw7_Byteorder_FixTests,   apzUw7_Byteorder_FixPatch, 0 },
-
   {  zVa_I960_MacroName,    zVa_I960_MacroList,
      apzVa_I960_MacroMachs,
      VA_I960_MACRO_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -9917,21 +8261,6 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      VXWORKS_TIME_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aVxworks_TimeTests,   apzVxworks_TimePatch, 0 },
 
-  {  zWindiss_Math1Name,    zWindiss_Math1List,
-     apzWindiss_Math1Machs,
-     WINDISS_MATH1_TEST_CT, FD_MACH_ONLY,
-     aWindiss_Math1Tests,   apzWindiss_Math1Patch, 0 },
-
-  {  zWindiss_Math2Name,    zWindiss_Math2List,
-     apzWindiss_Math2Machs,
-     WINDISS_MATH2_TEST_CT, FD_MACH_ONLY,
-     aWindiss_Math2Tests,   apzWindiss_Math2Patch, 0 },
-
-  {  zWindiss_ValistName,    zWindiss_ValistList,
-     apzWindiss_ValistMachs,
-     WINDISS_VALIST_TEST_CT, FD_MACH_ONLY,
-     aWindiss_ValistTests,   apzWindiss_ValistPatch, 0 },
-
   {  zX11_ClassName,    zX11_ClassList,
      apzX11_ClassMachs,
      X11_CLASS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,