3.4 PATCH: Remove unnecessary config/mips/xm-iris5.h

Rainer Orth ro@TechFak.Uni-Bielefeld.DE
Wed Oct 1 20:40:00 GMT 2003


To check if there's any need left for xm-iris5.h, I've removed the file and
all references to it and re-bootstrapped mainline on mips-sgi-irix5.3 both
with cc/native as/ld and gcc 2.95/gas/gld 2.14.90: both bootstraps
succeeded without problems, and while there are a couple of testsuite
regressions, they are obviously not related to this change.

Besides, I have not been able to manually produce any conflicts between
<inttypes.h> and <sys/types.h>, neither with cc nor with gcc 2.95.

If anything should come up later nonetheless, it can certainly be handled
by fixincludes.

I didn't check the mips-sgi-irix6*o32 configuration, both because it uses
the same headers as mips-sgi-irix6*, where xm-iris5.h isn't necessary, and
because this configuration will go as soon as the IRIX 6 O32 integration
patch is in.

Ok for mainline?

	Rainer

-----------------------------------------------------------------------------
Rainer Orth, Faculty of Technology, Bielefeld University


Wed Oct  1 22:30:01 2003  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>

	* config/mips/xm-iris5.h: Remove, unnecessary.
	* config.build (mips-sgi-irix5*): Remove.
	(mips-sgi-irix6*o32): Likewise.
	* config.gcc (mips-sgi-irix6*o32): Remove xm_file.
	(mips-sgi-irix5cross64): Likewise.
	(mips-sgi-irix5*): Likewise.
	* config.host (mips-sgi-irix5*): Remove.
	(mips-sgi-irix6*o32): Likewise.

Index: gcc/config.build
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config.build,v
retrieving revision 1.2
diff -u -p -r1.2 config.build
--- gcc/config.build	19 Sep 2003 19:46:06 -0000	1.2
+++ gcc/config.build	1 Oct 2003 20:32:16 -0000
@@ -115,14 +115,6 @@ case $build in
     # HP 9000 series 300
     build_install_headers_dir=install-headers-cpio
     ;;
-  mips-sgi-irix5*) 
-    # SGI System V r4, IRIX 5
-    build_xm_file=mips/xm-iris5.h
-    ;;
-  mips-sgi-irix6*o32) 
-    # SGI System V r4, IRIX 6, O32 ABI
-    build_xm_file=mips/xm-iris5.h
-    ;;
   *-*-sysv*)
     # All other System V variants.
     build_install_headers_dir=install-headers-cpio
Index: gcc/config.gcc
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config.gcc,v
retrieving revision 1.388
diff -u -p -r1.388 config.gcc
--- gcc/config.gcc	29 Sep 2003 20:02:06 -0000	1.388
+++ gcc/config.gcc	1 Oct 2003 20:32:16 -0000
@@ -1394,7 +1394,6 @@ mips-sgi-irix6*o32)		# SGI System V.4., 
 	fi
 	tm_file="${tm_file} mips/iris6-o32.h"
 	tmake_file="${tmake_file} mips/t-iris mips/t-iris5-6"
-	xm_file=mips/xm-iris5.h
 	target_cpu_default="MASK_ABICALLS"
 	# mips-tfile doesn't work yet
 	# See comment in mips/iris5.h file.
@@ -1418,7 +1417,6 @@ mips-sgi-irix6*)		# SGI System V.4., IRI
 	;;
 mips-sgi-irix5cross64)		# Irix5 host, Irix 6 target, cross64
 	tm_file="${tm_file} mips/iris5.h mips/iris6.h mips/cross64.h"
-	xm_file=mips/xm-iris5.h
 	tmake_file="mips/t-iris mips/t-cross64"
 	target_cpu_default="MASK_ABICALLS|MASK_FLOAT64|MASK_64BIT"
 	tm_defines="MIPS_ISA_DEFAULT=3 MIPS_ABI_DEFAULT=ABI_N32"
@@ -1442,7 +1440,6 @@ mips-sgi-irix5*)		# SGI System V.4., IRI
 		tmake_file=mips/t-iris5-as
 	fi
 	tmake_file="${tmake_file} mips/t-iris mips/t-iris5-6"
-	xm_file=mips/xm-iris5.h
 	target_cpu_default="MASK_ABICALLS"
 	# mips-tfile doesn't work yet
 	# See comment in mips/iris5.h file.
Index: gcc/config.host
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config.host,v
retrieving revision 2.4
diff -u -p -r2.4 config.host
--- gcc/config.host	23 Sep 2003 22:29:01 -0000	2.4
+++ gcc/config.host	1 Oct 2003 20:32:16 -0000
@@ -145,12 +145,6 @@ case ${host} in
   i860-*-sysv4*)
     host_xmake_file=i860/x-sysv4
     ;;
-  mips-sgi-irix6*o32) # SGI System V.4., IRIX 6, O32 ABI
-    host_xm_file=mips/xm-iris5.h
-    ;;
-  mips-sgi-irix5*) # SGI System V.4., IRIX 5
-    host_xm_file=mips/xm-iris5.h
-    ;;
   powerpc-*-darwin*)
     # powerpc-darwin host support.
     out_host_hook_obj=host-darwin.o



More information about the Gcc-patches mailing list