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 a64917e122c7d61f3c1dd91e5900b783cacf86b2..7528f0bbc52fc4c15d87788aaeaea2134657fa53 100644 (file)
--- 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 72387b29ccc6250198210ec191c57e925b9e80e1..616055f27f726b3cf616c6a305f93890526b72f5 100644 (file)
--- 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 fe8ec936b54988a8334d06149fe740754dae96ca..7cac56a180982894e30967e00c50d3ca11204fb8 100755 (executable)
--- 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 7f1a9d9269c271c0e4389f4fab64f232ab85a4be..770cf72e394075f7af541b0d212335a931acaab0 100644 (file)
--- 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