* 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

24 files changed, 6 insertions, 407 deletions

diff --git a/fixincludes/tests/base/_G_config.h b/fixincludes/tests/base/_G_config.h
deleted file mode 100644
index 99f0c82223c..00000000000
--- a/fixincludes/tests/base/_G_config.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/*  DO NOT EDIT THIS FILE.
-
-    It has been auto-edited by fixincludes from:
-
-	"fixinc/tests/inc/_G_config.h"
-
-    This had to be done to correct non-standard usages in the
-    original, manufacturer supplied header file.  */
-
-
-
-#if defined( LIBC1_G_VA_LIST_CHECK )
-typedef __builtin_va_list _G_va_list;
-#endif  /* LIBC1_G_VA_LIST_CHECK */
diff --git a/fixincludes/tests/base/arpa/inet.h b/fixincludes/tests/base/arpa/inet.h
deleted file mode 100644
index acd8ed54577..00000000000
--- a/fixincludes/tests/base/arpa/inet.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/*  DO NOT EDIT THIS FILE.
-
-    It has been auto-edited by fixincludes from:
-
-	"fixinc/tests/inc/arpa/inet.h"
-
-    This had to be done to correct non-standard usages in the
-    original, manufacturer supplied header file.  */
-
-
-
-#if defined( UW7_BYTEORDER_FIX_CHECK )
-
-
-#endif  /* UW7_BYTEORDER_FIX_CHECK */
diff --git a/fixincludes/tests/base/fs/rfs/rf_cache.h b/fixincludes/tests/base/fs/rfs/rf_cache.h
deleted file mode 100644
index 45fec6349e0..00000000000
--- a/fixincludes/tests/base/fs/rfs/rf_cache.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*  DO NOT EDIT THIS FILE.
-
-    It has been auto-edited by fixincludes from:
-
-	"fixinc/tests/inc/fs/rfs/rf_cache.h"
-
-    This had to be done to correct non-standard usages in the
-    original, manufacturer supplied header file.  */
-
-#ifndef FIXINC_WRAP_FS_RFS_RF_CACHE_H_SVR4_KRNL
-#define FIXINC_WRAP_FS_RFS_RF_CACHE_H_SVR4_KRNL 1
-
-#ifdef _KERNEL
-
-
-#if defined( SVR4_KRNL_CHECK )
-
-#endif  /* SVR4_KRNL_CHECK */
-#endif /* _KERNEL */
-
-#endif  /* FIXINC_WRAP_FS_RFS_RF_CACHE_H_SVR4_KRNL */
diff --git a/fixincludes/tests/base/locale.h b/fixincludes/tests/base/locale.h
deleted file mode 100644
index 3b079e544c9..00000000000
--- a/fixincludes/tests/base/locale.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*  DO NOT EDIT THIS FILE.
-
-    It has been auto-edited by fixincludes from:
-
-	"fixinc/tests/inc/locale.h"
-
-    This had to be done to correct non-standard usages in the
-    original, manufacturer supplied header file.  */
-
-#ifndef FIXINC_WRAP_LOCALE_H_ULTRIX_LOCALE
-#define FIXINC_WRAP_LOCALE_H_ULTRIX_LOCALE 1
-
-
-
-#if defined( ULTRIX_LOCALE_CHECK )
-@(#)locale.h   6.1     (ULTRIX)
-
-#endif  /* ULTRIX_LOCALE_CHECK */
-
-#endif  /* FIXINC_WRAP_LOCALE_H_ULTRIX_LOCALE */
diff --git a/fixincludes/tests/base/machine/cpu.h b/fixincludes/tests/base/machine/cpu.h
deleted file mode 100644
index 5662d291dd7..00000000000
--- a/fixincludes/tests/base/machine/cpu.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*  DO NOT EDIT THIS FILE.
-
-    It has been auto-edited by fixincludes from:
-
-	"fixinc/tests/inc/machine/cpu.h"
-
-    This had to be done to correct non-standard usages in the
-    original, manufacturer supplied header file.  */
-
-
-
-#if defined( ULTRIX_STATIC_CHECK )
-struct tlb_pid_state {
-#include <machine/r3_cpu.h>
-
-#endif  /* ULTRIX_STATIC_CHECK */
diff --git a/fixincludes/tests/base/math.h b/fixincludes/tests/base/math.h
index 2f6547d0096..5b5b1d1ede0 100644
--- a/fixincludes/tests/base/math.h
+++ b/fixincludes/tests/base/math.h
@@ -118,22 +118,6 @@ int foo;
 #endif
 #endif  /* STRICT_ANSI_NOT_CTD_CHECK */
 
-
-#if defined( ULTRIX_ATOF_PARAM_CHECK )
-extern double atof(const char *__nptr);
-
-#endif  /* ULTRIX_ATOF_PARAM_CHECK */
-
-
-#if defined( WINDISS_MATH1_CHECK )
-#ifndef __GNUC__
-#endif  /* WINDISS_MATH1_CHECK */
-
-
-#if defined( WINDISS_MATH2_CHECK )
-#endif /* __GNUC__ */
-#endif  /* WINDISS_MATH2_CHECK */
-
 #endif  /* FIXINC_WRAP_MATH_H_EXCEPTION_STRUCTURE */
 #ifdef __cplusplus
 #undef exception
diff --git a/fixincludes/tests/base/pthread.h b/fixincludes/tests/base/pthread.h
index e75a6ee0e33..1da740f566c 100644
--- a/fixincludes/tests/base/pthread.h
+++ b/fixincludes/tests/base/pthread.h
@@ -47,7 +47,7 @@
 #else
 # define PTHREAD_MUTEX_INITIALIZER {0, _PTHREAD_MVALID | _PTHREAD_MVF_STA, 0, 0, 0, 0, 0, 0 }
 # define PTHREAD_MUTEX_INITWITHNAME_NP(_n_,_a_)     {0, _PTHREAD_MVALID | _PTHREAD_MVF_STA, _n_, _a_, 0, 0, 0, 0 }
-# define PTHREAD_COND_INITWITHNAME_NP(_n_,_a_)     {{{0},0}, _PTHREAD_CVALID | _PTHREAD_CVF_STA, _n_, _a_, 0, 0 }
+# define PTHREAD_COND_INITWITHNAME_NP(_n_,_a_)     {0, _PTHREAD_CVALID | _PTHREAD_CVF_STA, _n_, _a_, 0, 0 }
 #endif
 
 #define PTHREAD_RWLOCK_INITIALIZER {_PTHREAD_RWVALID | _PTHREAD_RWVF_STA, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
@@ -107,22 +107,6 @@ extern int __sigsetjmp (struct __jmp_buf_tag *__env, int __savemask);
 #endif  /* PTHREAD_INCOMPLETE_STRUCT_ARGUMENT_CHECK */
 
 
-#if defined( SOLARIS_MUTEX_INIT_1_CHECK )
-#ident "@(#)pthread.h  1.16    97/05/05 SMI"
-#if __STDC__ - 0 == 0 && !defined(_NO_LONGLONG)
-#define PTHREAD_MUTEX_INITIALIZER	{{{0}, 0}, {{{0}}}, 0}
-#else
-#define PTHREAD_MUTEX_INITIALIZER	{{{0}, 0}, {{{0}}}, {0}}
-#endif
-#if __STDC__ - 0 == 0 && !defined(_NO_LONGLONG)
-#define PTHREAD_COND_INITIALIZER	{{{0},0}, 0} /* */
-#else
-#define PTHREAD_COND_INITIALIZER	{{{0},0}, {0}} /* */
-#endif
-
-#endif  /* SOLARIS_MUTEX_INIT_1_CHECK */
-
-
 #if defined( SOLARIS_MUTEX_INIT_2_CHECK )
 #ident "@(#)pthread.h  1.26  98/04/12 SMI"
 #if __STDC__ - 0 == 0 && !defined(_NO_LONGLONG)
diff --git a/fixincludes/tests/base/rpc/svc.h b/fixincludes/tests/base/rpc/svc.h
deleted file mode 100644
index 4e1245fb04f..00000000000
--- a/fixincludes/tests/base/rpc/svc.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/*  DO NOT EDIT THIS FILE.
-
-    It has been auto-edited by fixincludes from:
-
-	"fixinc/tests/inc/rpc/svc.h"
-
-    This had to be done to correct non-standard usages in the
-    original, manufacturer supplied header file.  */
-
-
-
-#if defined( ULTRIX_NESTED_SVC_CHECK )
- *	int protocol;  */ /* like TCP or UDP
-
-#endif  /* ULTRIX_NESTED_SVC_CHECK */
diff --git a/fixincludes/tests/base/stdio.h b/fixincludes/tests/base/stdio.h
index b6a8a9b7e1c..8c46498af9f 100644
--- a/fixincludes/tests/base/stdio.h
+++ b/fixincludes/tests/base/stdio.h
@@ -100,15 +100,4 @@ extern char *tempnam( const char *, const char *);
 
 #endif  /* ULTRIX_CONST2_CHECK */
 
-
-#if defined( ULTRIX_CONST3_CHECK )
-extern FILE *	fdopen( int __filedes, const char *__type );
-
-#endif  /* ULTRIX_CONST3_CHECK */
-
-
-#if defined( UNICOSMK_RESTRICT_CHECK )
-void f (char * __restrict__ x);
-#endif  /* UNICOSMK_RESTRICT_CHECK */
-
 #endif  /* FIXINC_WRAP_STDIO_H_STDIO_STDARG_H */
diff --git a/fixincludes/tests/base/stdlib.h b/fixincludes/tests/base/stdlib.h
index 9f69414e212..e7174e19108 100644
--- a/fixincludes/tests/base/stdlib.h
+++ b/fixincludes/tests/base/stdlib.h
@@ -50,23 +50,3 @@ extern void *	realloc(void*,size_t);
 extern void *	bsearch(void*,size_t,size_t);
 
 #endif  /* SYSZ_STDLIB_FOR_SUN_CHECK */
-
-
-#if defined( ULTRIX_ATEXIT_PARAM_CHECK )
-int atexit( void (*__func)( void ) );
-
-#endif  /* ULTRIX_ATEXIT_PARAM_CHECK */
-
-
-#if defined( ULTRIX_STDLIB_CHECK )
-@(#)stdlib.h      6.1     (ULTRIX)
-char *		getenv( const char *__name );
-int		setenv( const char *__name, const char *__val, int __ovrwrt );
-void		unsetenv( const char *__name );
-int		putenv( char *__s );
-char	*getenv();
-int	setenv();
-void	unsetenv();
-int	putenv();
-
-#endif  /* ULTRIX_STDLIB_CHECK */
diff --git a/fixincludes/tests/base/string.h b/fixincludes/tests/base/string.h
index 0c70f3014f1..5156cd5c33d 100644
--- a/fixincludes/tests/base/string.h
+++ b/fixincludes/tests/base/string.h
@@ -7,7 +7,8 @@
     This had to be done to correct non-standard usages in the
     original, manufacturer supplied header file.  */
 
-#ifndef _STRING_INCLUDED
-  #define _STRING_INCLUDED
-  #include <strings.h>
-#endif /* _STRING_INCLUDED */
+
+
+#if defined( SVR4_DISABLE_OPT_CHECK )
+
+#endif  /* SVR4_DISABLE_OPT_CHECK */
diff --git a/fixincludes/tests/base/strings.h b/fixincludes/tests/base/strings.h
index f17d3f81197..60b73ac6e49 100644
--- a/fixincludes/tests/base/strings.h
+++ b/fixincludes/tests/base/strings.h
@@ -7,34 +7,8 @@
     This had to be done to correct non-standard usages in the
     original, manufacturer supplied header file.  */
 
-#ifndef FIXINC_WRAP_STRINGS_H_ULTRIX_STRINGS
-#define FIXINC_WRAP_STRINGS_H_ULTRIX_STRINGS 1
-
 
 
 #if defined( SUNOS_STRLEN_CHECK )
  __SIZE_TYPE__ strlen(); /* string length */
 #endif  /* SUNOS_STRLEN_CHECK */
-
-
-#if defined( ULTRIX_STRINGS_CHECK )
-@(#)strings.h   6.1     (ULTRIX)
-
-#endif  /* ULTRIX_STRINGS_CHECK */
-
-
-#if defined( ULTRIX_STRINGS2_CHECK )
-@(#)strings.h      6.1     (ULTRIX)
-	strncmp( const char *__s1, const char *__s2, size_t __n );
-
-extern int
-	strcasecmp( const char *__s1, const char *__s2),
-	strncasecmp( const char *__s1, const char *__s2, size_t __n );
-	strncmp();
-extern int
-	strcasecmp(),
-	strncasecmp();
-
-#endif  /* ULTRIX_STRINGS2_CHECK */
-
-#endif  /* FIXINC_WRAP_STRINGS_H_ULTRIX_STRINGS */
diff --git a/fixincludes/tests/base/sys/file.h b/fixincludes/tests/base/sys/file.h
index c5016a48fa3..ba56a414c4b 100644
--- a/fixincludes/tests/base/sys/file.h
+++ b/fixincludes/tests/base/sys/file.h
@@ -12,10 +12,3 @@
 #if defined( HP_SYSFILE_CHECK )
 extern void foo(struct file *, ...); /* HPUX_SOURCE - bad varargs */
 #endif  /* HP_SYSFILE_CHECK */
-
-
-#if defined( ULTRIX_IFDEF_CHECK )
-#if defined(KERNEL) && defined( mumbojumbo )
-int oops;
-#endif
-#endif  /* ULTRIX_IFDEF_CHECK */
diff --git a/fixincludes/tests/base/sys/ioctl.h b/fixincludes/tests/base/sys/ioctl.h
deleted file mode 100644
index 8e260a57114..00000000000
--- a/fixincludes/tests/base/sys/ioctl.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/*  DO NOT EDIT THIS FILE.
-
-    It has been auto-edited by fixincludes from:
-
-	"fixinc/tests/inc/sys/ioctl.h"
-
-    This had to be done to correct non-standard usages in the
-    original, manufacturer supplied header file.  */
-
-
-
-#if defined( ULTRIX_NESTED_IOCTL_CHECK )
-/* #define SIOCSCREENON _IOWR('i', 49, int)*//* screend, net/gw_screen.h */
-
-#endif  /* ULTRIX_NESTED_IOCTL_CHECK */
diff --git a/fixincludes/tests/base/sys/limits.h b/fixincludes/tests/base/sys/limits.h
index 0ef2ff5ad5e..4a80d3bb298 100644
--- a/fixincludes/tests/base/sys/limits.h
+++ b/fixincludes/tests/base/sys/limits.h
@@ -9,21 +9,9 @@
 
 
 
-#if defined( NESTED_MOTOROLA_CHECK )
-#undef PIPE_BUF /* max # bytes atomic in write to a */
-		/* PIPE */
-/*#define	HUGE_VAL	3.9e+9 */ /*error value returned by Math lib*/
-#endif  /* NESTED_MOTOROLA_CHECK */
-
-
 #if defined( NESTED_SYS_LIMITS_CHECK )
 /*
 #define CHILD_MAX 20  Max, Max, ... */ /*
 #define OPEN_MAX  20  Max, Max, ... */
 
 #endif  /* NESTED_SYS_LIMITS_CHECK */
-
-
-#if defined( ULTRIX_MATH_IFDEF_CHECK )
-#if     defined(__GFLOAT) 
-#endif  /* ULTRIX_MATH_IFDEF_CHECK */
diff --git a/fixincludes/tests/base/sys/regset.h b/fixincludes/tests/base/sys/regset.h
deleted file mode 100644
index 6723427e89c..00000000000
--- a/fixincludes/tests/base/sys/regset.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*  DO NOT EDIT THIS FILE.
-
-    It has been auto-edited by fixincludes from:
-
-	"fixinc/tests/inc/sys/regset.h"
-
-    This had to be done to correct non-standard usages in the
-    original, manufacturer supplied header file.  */
-
-
-
-#if defined( SCO_REGSET_CHECK )
-union u_fps {
-    struct	rsfpstate
-    {
-       int whatever;
-    }
-};
-union _u_fps {
-    struct _rsfpstate
-    {
-       int whatever;
-    }
-};
-
-#endif  /* SCO_REGSET_CHECK */
diff --git a/fixincludes/tests/base/sys/socket.h b/fixincludes/tests/base/sys/socket.h
index 61b58a8bd3e..3c6e420275c 100644
--- a/fixincludes/tests/base/sys/socket.h
+++ b/fixincludes/tests/base/sys/socket.h
@@ -35,10 +35,3 @@ typedef int socklen_t;
 typedef u_int32_t socklen_t;
 #endif /* _NO_XOPEN4 && _NO_XOPEN5 */
 #endif  /* IRIX_SOCKLEN_T_CHECK */
-
-
-#if defined( SOLARIS_SOCKET_CHECK )
-#ident   "@(#)socket.h   1.30    97/01/20 SMI"
-extern int recv(int, void *, int, int);
-extern int send(int, const void *, int, int);
-#endif  /* SOLARIS_SOCKET_CHECK */
diff --git a/fixincludes/tests/base/sys/stat.h b/fixincludes/tests/base/sys/stat.h
index d677a13292f..5c254ea94c5 100644
--- a/fixincludes/tests/base/sys/stat.h
+++ b/fixincludes/tests/base/sys/stat.h
@@ -33,48 +33,6 @@ extern int fchmod(int, mode_t);
 #endif  /* RS6000_FCHMOD_CHECK */
 
 
-#if defined( SCO_STATIC_FUNC_CHECK )
-#ifdef __STDC__
-#if __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-static int	stat(const char *__f, struct stat *__p) {
-	return __stat32(__f, __p);
-}
-#if __cplusplus
- }
-#endif /* __cplusplus */
-
-#  else /* !__STDC__ THIS FAILS ON BSD SYSTEMS */
-#if __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-static int	stat(__f, __p)
-	char *__f;
-	struct stat *__p;
-{
-	return __stat32(__f, __p);
-}
-#if __cplusplus
- }
-#endif /* __cplusplus */
-#endif
-#endif  /* SCO_STATIC_FUNC_CHECK */
-
-
-#if defined( ULTRIX_STAT_CHECK )
-@(#)stat.h      6.1     (ULTRIX)
-#define S_IFPORT S_IFIFO
-
-/* macro to test for symbolic link */
-#define S_ISLNK(mode) (((mode) & S_IFMT) == S_IFLNK)
-
-	fstat(),
-	lstat(),
-/* THE INSERTION LINE FAILS ON BSD SYSTEMS */
-#endif  /* ULTRIX_STAT_CHECK */
-
-
 #if defined( VXWORKS_NEEDS_VXWORKS_CHECK )
 #include </dev/null> /* ULONG */
 # define	__INCstath <sys/stat.h>
diff --git a/fixincludes/tests/base/sys/time.h b/fixincludes/tests/base/sys/time.h
index 442118b0ace..1c730c495b7 100644
--- a/fixincludes/tests/base/sys/time.h
+++ b/fixincludes/tests/base/sys/time.h
@@ -17,30 +17,3 @@ struct sigevent;
 #if defined( LYNXOS_NO_WARNING_IN_SYS_TIME_H_CHECK )
 
 #endif  /* LYNXOS_NO_WARNING_IN_SYS_TIME_H_CHECK */
-
-
-#if defined( ULTRIX_SYS_TIME_CHECK )
-@(#)time.h      6.1     (ULTRIX)
-extern time_t		time( time_t *__tloc );
-
-extern int adjtime(struct timeval *, struct timeval *);
-extern int getitimer(int, struct itimerval *);
-extern int setitimer(int, struct itimerval *, struct itimerval *);
-extern int gettimeofday(struct timeval *, struct timezone *);
-extern int settimeofday(struct timeval *, struct timezone *);
-extern void profil(const void *, size_t, size_t, unsigned int);
-extern int stime(const time_t *);
-extern int utimes(const char *, const struct timeval[2]);
-extern int select(int, fd_set *, fd_set *, fd_set *, struct timeval *);
-extern double difftime();
-extern	int adjtime();
-extern	int getitimer();
-extern	int setitimer();
-extern	int gettimeofday();
-extern	int settimeofday();
-extern	void profil();
-extern	int stime();
-extern	int utimes();
-extern	int select();
-
-#endif  /* ULTRIX_SYS_TIME_CHECK */
diff --git a/fixincludes/tests/base/sys/times.h b/fixincludes/tests/base/sys/times.h
deleted file mode 100644
index 2de7d78aa83..00000000000
--- a/fixincludes/tests/base/sys/times.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/*  DO NOT EDIT THIS FILE.
-
-    It has been auto-edited by fixincludes from:
-
-	"fixinc/tests/inc/sys/times.h"
-
-    This had to be done to correct non-standard usages in the
-    original, manufacturer supplied header file.  */
-
-
-
-#if defined( SCO_UTIME_CHECK )
-extern int utime(const char *, const struct utimbuf *);
-#endif  /* SCO_UTIME_CHECK */
diff --git a/fixincludes/tests/base/sys/utsname.h b/fixincludes/tests/base/sys/utsname.h
deleted file mode 100644
index 5f064154001..00000000000
--- a/fixincludes/tests/base/sys/utsname.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*  DO NOT EDIT THIS FILE.
-
-    It has been auto-edited by fixincludes from:
-
-	"fixinc/tests/inc/sys/utsname.h"
-
-    This had to be done to correct non-standard usages in the
-    original, manufacturer supplied header file.  */
-
-
-
-#if defined( ULTRIX_FIX_FIXPROTO_CHECK )
-/* ULTRIX's uname */
-struct utsname;
-extern	int	uname();
-#endif  /* ULTRIX_FIX_FIXPROTO_CHECK */
diff --git a/fixincludes/tests/base/testing.h b/fixincludes/tests/base/testing.h
index 88b931e8d0d..43a4ff715df 100644
--- a/fixincludes/tests/base/testing.h
+++ b/fixincludes/tests/base/testing.h
@@ -74,13 +74,6 @@ BSD43__IOWR('T', 1) /* Some are multi-line */
 #endif  /* IO_QUOTES_USE_CHECK */
 
 
-#if defined( LIBC1_IFDEFD_MEMX_CHECK )
-/* Copy N bytes of SRC to DEST.  */
-extern __ptr_t memcpy __P ((__ptr_t __dest, __const __ptr_t __src,
-                         size_t __n));
-#endif  /* LIBC1_IFDEFD_MEMX_CHECK */
-
-
 #if defined( MACHINE_ANSI_H_VA_LIST_CHECK )
  # define _BSD_VA_LIST_	__builtin_va_list
 #endif  /* MACHINE_ANSI_H_VA_LIST_CHECK */
@@ -127,8 +120,3 @@ extern unsigned int
 extern size_t
 	strlen(), strspn();
 #endif  /* SYSV68_STRING_CHECK */
-
-
-#if defined( WINDISS_VALIST_CHECK )
-#include <stdarg.h>
-#endif  /* WINDISS_VALIST_CHECK */
diff --git a/fixincludes/tests/base/unistd.h b/fixincludes/tests/base/unistd.h
index 98e8c34b8ca..756451d837b 100644
--- a/fixincludes/tests/base/unistd.h
+++ b/fixincludes/tests/base/unistd.h
@@ -12,22 +12,3 @@
 #if defined( ALPHA_SBRK_CHECK )
 extern void *sbrk(ptrdiff_t increment);
 #endif  /* ALPHA_SBRK_CHECK */
-
-
-#if defined( SOLARIS_UNISTD_CHECK )
-#ident "@(#)unistd.h   1.33    95/08/28 SMI"
-extern int getpagesize();
-extern pid_t getpgid(pid_t);
-extern int getpagesize();
-extern int getpgid();
-#endif  /* SOLARIS_UNISTD_CHECK */
-
-
-#if defined( ULTRIX_UNISTD_CHECK )
-@(#)unistd.h      6.1     (ULTRIX)
-	getgroups(),
-	getpagesize(),
-	fork(),
-	vfork(),
-
-#endif  /* ULTRIX_UNISTD_CHECK */
diff --git a/fixincludes/tests/base/widec.h b/fixincludes/tests/base/widec.h
deleted file mode 100644
index e3c17fff77b..00000000000
--- a/fixincludes/tests/base/widec.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/*  DO NOT EDIT THIS FILE.
-
-    It has been auto-edited by fixincludes from:
-
-	"fixinc/tests/inc/widec.h"
-
-    This had to be done to correct non-standard usages in the
-    original, manufacturer supplied header file.  */
-
-
-
-#if defined( SOLARIS_WIDEC_CHECK )
-#include <euc.h>
-#include <wchar.h>
-#endif  /* SOLARIS_WIDEC_CHECK */