Fix irix5 build failure due to bad definition of HAVE_INTTYPES_H.

	* configure.in (mips-sgi-irix5cross64, mips-sgi-irix5*): Remove
	HAVE_INTTYPES_H from xm_defines.  Define xm_file to mips/xm-iris5.h.
	* mips/xm-iris5.h (USG): Delete.

From-SVN: r21112

gcc/ChangeLog

+Mon Jul 13 18:59:13 1998  Jim Wilson  <wilson@cygnus.com>
+
+	* configure.in (mips-sgi-irix5cross64, mips-sgi-irix5*): Remove
+	HAVE_INTTYPES_H from xm_defines.  Define xm_file to mips/xm-iris5.h.
+	* mips/xm-iris5.h (USG): Delete.
+
 Mon Jul 13 17:18:47 1998  Nick Clifton  <nickc@cygnus.com>
 
 	* cccp.c (main): Add support for parsing --help.

gcc/config/mips/xm-iris5.h

 #include "mips/xm-mips.h"
 
-#define USG
-#define HAVE_VPRINTF
-
-#define bcopy(a,b,c) memcpy (b,a,c)
-#define bzero(a,b) memset (a,0,b)
-#define bcmp(a,b,c) memcmp (a,b,c)
+/* On SGI IRIX 5.3, inttypes.h clashes with sys/types.h, but the clash
+   (when compiled with GCC) is a warning, so configure.in thinks it's OK
+   to use it.  Work around this problem.  */
 
+#ifdef HAVE_INTTYPES_H
+#undef HAVE_INTTYPES_H
+#endif

gcc/configure

@@ -3678,7 +3678,8 @@ for machine in $build $host $target; do
  		;;
 	mips-sgi-irix5cross64)		# Irix5 host, Irix 6 target, cross64
 		tm_file="mips/iris6.h mips/cross64.h"
-		xm_defines="USG HAVE_INTTYPES_H"
+		xm_defines=USG
+		xm_file="mips/xm-iris5.h"
 		fixincludes=Makefile.in
 		xmake_file=mips/x-iris
 		tmake_file=mips/t-cross64
@@ -3719,7 +3720,8 @@ for machine in $build $host $target; do
 		else
 			tm_file=mips/iris5.h
 		fi
-		xm_defines="USG HAVE_INTTYPES_H"
+		xm_defines=USG
+		xm_file="mips/xm-iris5.h"
 		fixincludes=fixinc.irix
 		xmake_file=mips/x-iris
 		# mips-tfile doesn't work yet

gcc/configure.in

@@ -1775,7 +1775,8 @@ for machine in $build $host $target; do
  		;;
 	mips-sgi-irix5cross64)		# Irix5 host, Irix 6 target, cross64
 		tm_file="mips/iris6.h mips/cross64.h"
-		xm_defines="USG HAVE_INTTYPES_H"
+		xm_defines=USG
+		xm_file="mips/xm-iris5.h"
 		fixincludes=Makefile.in
 		xmake_file=mips/x-iris
 		tmake_file=mips/t-cross64
@@ -1816,7 +1817,8 @@ for machine in $build $host $target; do
 		else
 			tm_file=mips/iris5.h
 		fi
-		xm_defines="USG HAVE_INTTYPES_H"
+		xm_defines=USG
+		xm_file="mips/xm-iris5.h"
 		fixincludes=fixinc.irix
 		xmake_file=mips/x-iris
 		# mips-tfile doesn't work yet