From: Jim Wilson <wilson@cygnus.com>
Date: Mon, 13 Jul 1998 19:01:14 +0000 (+0000)
Subject: Fix irix5 build failure due to bad definition of HAVE_INTTYPES_H.
X-Git-Tag: prereleases/egcs-1.1-prerelease~274
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=74c55ab0bbf121c9367586ed227b0f2fc67c47ee;p=thirdparty%2Fgcc.git

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
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a64917e122c7..7528f0bbc52f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+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.
diff --git a/gcc/config/mips/xm-iris5.h b/gcc/config/mips/xm-iris5.h
index 72387b29ccc6..616055f27f72 100644
--- a/gcc/config/mips/xm-iris5.h
+++ b/gcc/config/mips/xm-iris5.h
@@ -1,9 +1,9 @@
 #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
diff --git a/gcc/configure b/gcc/configure
index fe8ec936b549..7cac56a18098 100755
--- a/gcc/configure
+++ b/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
diff --git a/gcc/configure.in b/gcc/configure.in
index 7f1a9d9269c2..770cf72e3940 100644
--- a/gcc/configure.in
+++ b/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