Made fixincludes a toplevel build module.

toplevel:
2004-08-31  Paolo Bonzini  <bonzini@gnu.org>

	* Makefile.def (build_modules): Add fixincludes.
	(dependencies): Make gcc depend on fixincludes.
	* configure.in (build_tools): Add fixincludes.
	(build_configdirs): Always include build_libs.
	* Makefile.in: Regenerate.
	* configure: Regenerate.

contrib:
2004-08-04  Paolo Bonzini  <bonzini@gnu.org>

	* gcc_update: Add fixincludes.

fixincludes:
2004-08-31  Paolo Bonzini  <bonzini@gnu.org>

	* .cvsignore: New.
	* Makefile.in: From gcc/fixinc/Makefile.in, making it fully
	autoconfiscated.
	* configure.ac: New.
	* config.h.in: Generate.
	* configure: Generate.
	* aclocal.m4: New.
	* fixlib.h: Remove inclusions of gcc files.
	* system.h: New.

	Other files copied from gcc/fixinc.

gcc:
2004-08-31  Paolo Bonzini  <bonzini@gnu.org>

	* Makefile.in (build_subdir): New substitution.
	(fixinc.sh): Simplify heavily since fixincludes is already built.
	(stmp-fixinc): Depend on specs.ready.
	(install-mkheaders): Use new location of fixincludes.
	(clean): Do not descend into fixinc.
	(FORBUILD): Replace with ../$(build_subdir).
	* configure.ac (build_subdir): Substitute.
	(FORBUILD): Do not set.
	(all_outputs): Remove fixinc/Makefile.
	(default commands): Do not create links in fixinc.
	* mkfixinc.sh: New, from fixinc/mkfixinc.sh without
	the fixincludes configuration steps and substituting
	@FIXINCL@ in fixinc.in.
	* fixinc.in: New, from fixinc/fixincl.sh.

	* fixinc/*: Removed.

From-SVN: r86824

18 files changed, 454 insertions, 0 deletions

diff --git a/fixincludes/tests/base/sys/asm.h b/fixincludes/tests/base/sys/asm.h
new file mode 100644
index 0000000..658830a
--- /dev/null
+++ b/fixincludes/tests/base/sys/asm.h
@@ -0,0 +1,14 @@
+/*  DO NOT EDIT THIS FILE.
+
+    It has been auto-edited by fixincludes from:
+
+	"fixinc/tests/inc/sys/asm.h"
+
+    This had to be done to correct non-standard usages in the
+    original, manufacturer supplied header file.  */
+
+
+
+#if defined( IRIX_ASM_APOSTROPHE_CHECK )
+	# and we are on vacation
+#endif  /* IRIX_ASM_APOSTROPHE_CHECK */
diff --git a/fixincludes/tests/base/sys/cdefs.h b/fixincludes/tests/base/sys/cdefs.h
new file mode 100644
index 0000000..8d95282
--- /dev/null
+++ b/fixincludes/tests/base/sys/cdefs.h
@@ -0,0 +1,19 @@
+/*  DO NOT EDIT THIS FILE.
+
+    It has been auto-edited by fixincludes from:
+
+	"fixinc/tests/inc/sys/cdefs.h"
+
+    This had to be done to correct non-standard usages in the
+    original, manufacturer supplied header file.  */
+
+
+
+#if defined( FREEBSD_GCC3_BREAKAGE_CHECK )
+#if __GNUC__ == 2 && __GNUC_MINOR__ >= 7 || __GNUC__ >= 3
+#endif  /* FREEBSD_GCC3_BREAKAGE_CHECK */
+
+
+#if defined( NETBSD_EXTRA_SEMICOLON_CHECK )
+#define __END_DECLS }
+#endif  /* NETBSD_EXTRA_SEMICOLON_CHECK */
diff --git a/fixincludes/tests/base/sys/file.h b/fixincludes/tests/base/sys/file.h
new file mode 100644
index 0000000..c5016a4
--- /dev/null
+++ b/fixincludes/tests/base/sys/file.h
@@ -0,0 +1,21 @@
+/*  DO NOT EDIT THIS FILE.
+
+    It has been auto-edited by fixincludes from:
+
+	"fixinc/tests/inc/sys/file.h"
+
+    This had to be done to correct non-standard usages in the
+    original, manufacturer supplied header file.  */
+
+
+
+#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
new file mode 100644
index 0000000..8e260a5
--- /dev/null
+++ b/fixincludes/tests/base/sys/ioctl.h
@@ -0,0 +1,15 @@
+/*  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
new file mode 100644
index 0000000..cd8ba2a
--- /dev/null
+++ b/fixincludes/tests/base/sys/limits.h
@@ -0,0 +1,36 @@
+/*  DO NOT EDIT THIS FILE.
+
+    It has been auto-edited by fixincludes from:
+
+	"fixinc/tests/inc/sys/limits.h"
+
+    This had to be done to correct non-standard usages in the
+    original, manufacturer supplied header file.  */
+
+
+
+#if defined( LIMITS_IFNDEFS_CHECK )
+#ifndef DBL_DIG
+ #	define	DBL_DIG 	 0  /* somthin' */
+#endif
+#endif  /* LIMITS_IFNDEFS_CHECK */
+
+
+#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/machine.h b/fixincludes/tests/base/sys/machine.h
new file mode 100644
index 0000000..a037413
--- /dev/null
+++ b/fixincludes/tests/base/sys/machine.h
@@ -0,0 +1,16 @@
+/*  DO NOT EDIT THIS FILE.
+
+    It has been auto-edited by fixincludes from:
+
+	"fixinc/tests/inc/sys/machine.h"
+
+    This had to be done to correct non-standard usages in the
+    original, manufacturer supplied header file.  */
+
+
+
+#if defined( AIX_SYSMACHINE_CHECK )
+#define FOO  bar \
+ baz \
+ bat
+#endif  /* AIX_SYSMACHINE_CHECK */
diff --git a/fixincludes/tests/base/sys/mman.h b/fixincludes/tests/base/sys/mman.h
new file mode 100644
index 0000000..8fa2fb1
--- /dev/null
+++ b/fixincludes/tests/base/sys/mman.h
@@ -0,0 +1,25 @@
+/*  DO NOT EDIT THIS FILE.
+
+    It has been auto-edited by fixincludes from:
+
+	"fixinc/tests/inc/sys/mman.h"
+
+    This had to be done to correct non-standard usages in the
+    original, manufacturer supplied header file.  */
+
+#ifndef FIXINC_WRAP_SYS_MMAN_H_CXX_UNREADY
+#define FIXINC_WRAP_SYS_MMAN_H_CXX_UNREADY 1
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+#if defined( CXX_UNREADY_CHECK )
+extern void* malloc( size_t );
+#endif  /* CXX_UNREADY_CHECK */
+#ifdef __cplusplus
+}
+#endif
+
+#endif  /* FIXINC_WRAP_SYS_MMAN_H_CXX_UNREADY */
diff --git a/fixincludes/tests/base/sys/param.h b/fixincludes/tests/base/sys/param.h
new file mode 100644
index 0000000..4126924
--- /dev/null
+++ b/fixincludes/tests/base/sys/param.h
@@ -0,0 +1,16 @@
+/*  DO NOT EDIT THIS FILE.
+
+    It has been auto-edited by fixincludes from:
+
+	"fixinc/tests/inc/sys/param.h"
+
+    This had to be done to correct non-standard usages in the
+    original, manufacturer supplied header file.  */
+
+
+
+#if defined( HPUX_MAXINT_CHECK )
+#ifndef MAXINT
+#define MAXINT 0x7FFFFFFF
+#endif
+#endif  /* HPUX_MAXINT_CHECK */
diff --git a/fixincludes/tests/base/sys/regset.h b/fixincludes/tests/base/sys/regset.h
new file mode 100644
index 0000000..6723427
--- /dev/null
+++ b/fixincludes/tests/base/sys/regset.h
@@ -0,0 +1,26 @@
+/*  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/signal.h b/fixincludes/tests/base/sys/signal.h
new file mode 100644
index 0000000..7a9ecb1
--- /dev/null
+++ b/fixincludes/tests/base/sys/signal.h
@@ -0,0 +1,30 @@
+/*  DO NOT EDIT THIS FILE.
+
+    It has been auto-edited by fixincludes from:
+
+	"fixinc/tests/inc/sys/signal.h"
+
+    This had to be done to correct non-standard usages in the
+    original, manufacturer supplied header file.  */
+
+
+
+#if defined( AIX_VOLATILE_CHECK )
+typedef int sig_atomic_t;
+#endif  /* AIX_VOLATILE_CHECK */
+
+
+#if defined( SUN_SIGNAL_CHECK )
+#ifdef __cplusplus
+void	(*signal(...))(...);
+#else
+void	(*signal())();
+#endif
+#endif  /* SUN_SIGNAL_CHECK */
+
+
+#if defined( SVR4_SIGHANDLER_TYPE_CHECK )
+#define SIG_DFL (void (*)(int))0
+#define SIG_IGN (void (*)(int))0
+
+#endif  /* SVR4_SIGHANDLER_TYPE_CHECK */
diff --git a/fixincludes/tests/base/sys/socket.h b/fixincludes/tests/base/sys/socket.h
new file mode 100644
index 0000000..0898ed0
--- /dev/null
+++ b/fixincludes/tests/base/sys/socket.h
@@ -0,0 +1,26 @@
+/*  DO NOT EDIT THIS FILE.
+
+    It has been auto-edited by fixincludes from:
+
+	"fixinc/tests/inc/sys/socket.h"
+
+    This had to be done to correct non-standard usages in the
+    original, manufacturer supplied header file.  */
+
+
+
+#if defined( IRIX_SOCKLEN_T_CHECK )
+#define _SOCKLEN_T
+#if _NO_XOPEN4 && _NO_XOPEN5
+typedef int socklen_t;
+#else
+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/spinlock.h b/fixincludes/tests/base/sys/spinlock.h
new file mode 100644
index 0000000..a25f650
--- /dev/null
+++ b/fixincludes/tests/base/sys/spinlock.h
@@ -0,0 +1,14 @@
+/*  DO NOT EDIT THIS FILE.
+
+    It has been auto-edited by fixincludes from:
+
+	"fixinc/tests/inc/sys/spinlock.h"
+
+    This had to be done to correct non-standard usages in the
+    original, manufacturer supplied header file.  */
+
+
+
+#if defined( HP_INLINE_CHECK )
+ # include <machine/mumble.h>
+#endif  /* HP_INLINE_CHECK */
diff --git a/fixincludes/tests/base/sys/stat.h b/fixincludes/tests/base/sys/stat.h
new file mode 100644
index 0000000..c2b2fb6
--- /dev/null
+++ b/fixincludes/tests/base/sys/stat.h
@@ -0,0 +1,68 @@
+/*  DO NOT EDIT THIS FILE.
+
+    It has been auto-edited by fixincludes from:
+
+	"fixinc/tests/inc/sys/stat.h"
+
+    This had to be done to correct non-standard usages in the
+    original, manufacturer supplied header file.  */
+
+
+
+#if defined( ALPHA___EXTERN_PREFIX_SYS_STAT_CHECK )
+#   if defined(__DECC) || defined(__PRAGMA_EXTERN_PREFIX)
+#endif  /* ALPHA___EXTERN_PREFIX_SYS_STAT_CHECK */
+
+
+#if defined( RS6000_FCHMOD_CHECK )
+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>
+#include <types/vxTypesOld.h>
+#endif  /* VXWORKS_NEEDS_VXWORKS_CHECK */
diff --git a/fixincludes/tests/base/sys/time.h b/fixincludes/tests/base/sys/time.h
new file mode 100644
index 0000000..f009f7e
--- /dev/null
+++ b/fixincludes/tests/base/sys/time.h
@@ -0,0 +1,41 @@
+/*  DO NOT EDIT THIS FILE.
+
+    It has been auto-edited by fixincludes from:
+
+	"fixinc/tests/inc/sys/time.h"
+
+    This had to be done to correct non-standard usages in the
+    original, manufacturer supplied header file.  */
+
+
+
+#if defined( HPUX_SYSTIME_CHECK )
+struct sigevent;
+#endif  /* HPUX_SYSTIME_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
new file mode 100644
index 0000000..2de7d78
--- /dev/null
+++ b/fixincludes/tests/base/sys/times.h
@@ -0,0 +1,14 @@
+/*  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/types.h b/fixincludes/tests/base/sys/types.h
new file mode 100644
index 0000000..683b5e9
--- /dev/null
+++ b/fixincludes/tests/base/sys/types.h
@@ -0,0 +1,30 @@
+/*  DO NOT EDIT THIS FILE.
+
+    It has been auto-edited by fixincludes from:
+
+	"fixinc/tests/inc/sys/types.h"
+
+    This had to be done to correct non-standard usages in the
+    original, manufacturer supplied header file.  */
+
+
+
+#if defined( GNU_TYPES_CHECK )
+#if !defined(_GCC_PTRDIFF_T)
+#define _GCC_PTRDIFF_T
+typedef __PTRDIFF_TYPE__ ptrdiff_t;
+#endif
+ /* long int */
+#if !defined(_GCC_SIZE_T)
+#define _GCC_SIZE_T
+typedef __SIZE_TYPE__ size_t;
+#endif
+ /* uint_t */
+#ifndef __cplusplus
+#if !defined(_GCC_WCHAR_T) && ! defined(__cplusplus)
+#define _GCC_WCHAR_T
+typedef __WCHAR_TYPE__ wchar_t;
+#endif
+
+#endif /* ushort_t */
+#endif  /* GNU_TYPES_CHECK */
diff --git a/fixincludes/tests/base/sys/utsname.h b/fixincludes/tests/base/sys/utsname.h
new file mode 100644
index 0000000..5f06415
--- /dev/null
+++ b/fixincludes/tests/base/sys/utsname.h
@@ -0,0 +1,16 @@
+/*  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/sys/wait.h b/fixincludes/tests/base/sys/wait.h
new file mode 100644
index 0000000..a0311c6
--- /dev/null
+++ b/fixincludes/tests/base/sys/wait.h
@@ -0,0 +1,27 @@
+/*  DO NOT EDIT THIS FILE.
+
+    It has been auto-edited by fixincludes from:
+
+	"fixinc/tests/inc/sys/wait.h"
+
+    This had to be done to correct non-standard usages in the
+    original, manufacturer supplied header file.  */
+
+
+
+#if defined( AIX_SYSWAIT_CHECK )
+/* bos325, */
+struct rusage;
+extern pid_t wait3();
+	/* pid_t wait3(int *, int, struct rusage *); */
+#endif  /* AIX_SYSWAIT_CHECK */
+
+
+#if defined( AIX_SYSWAIT_2_CHECK )
+#define WSTOPSIG(__x)    (int)(WIFSTOPPED(__x) ? (int)((((unsigned int)__x) >> 8) & 0xff) : -1)
+#endif  /* AIX_SYSWAIT_2_CHECK */
+
+
+#if defined( NEXT_WAIT_UNION_CHECK )
+extern pid_d wait(void*);
+#endif  /* NEXT_WAIT_UNION_CHECK */