* config/mips/iris5.h (SET_FILE_NUMBER): Moved here from iris3.h.

	Undef before redefinition.
	(LABEL_AFTER_LOC): Likewise.
	(DEFAULT_SIGNED_CHAR): Likewise.
	(ASM_OUTPUT_ASCII): Moved here from iris4.h.
	Fix IRIX spelling.

	* config/mips/iris3.h: Remove, unused.
	* config/mips/iris4.h: Likewise.

	* config/mips/mips.h (STACK_ARGS_ADJUST): Remove, unused.

	* config/mips/iris5.h (TARGET_DEFAULT): Move ...
	* config.gcc (mips-sgi-irix6*o32, mips-sgi-irix5*): ... here to
	target_cpu_default.

	* config/mips/iris5.h: Move explicit includes ...
	* config.gcc (mips-sgi-irix6*o32, mips-sgi-irix5*): ... here.

	* config/mips/iris6.h (MIPS_ISA_DEFAULT, MIPS_ABI_DEFAULT): Move ...
	* config.gcc (mips-sgi-irix6*, mips-sgi-irix5cross64): ... here to
	tm_defines.

	* config/mips/iris6.h (TARGET_DEFAULT): Move ...
	* config.gcc (mips-sgi-irix6*, mips-sgi-irix5cross64): ... here to
	target_cpu_default.

	* config/mips/iris6.h: Fix IRIX spelling.
	(MULTILIB_DEFAULTS): Undef before redefinition.

	* config/mips/iris6.h: Move explicit includes ...
	* config.gcc (mips-sgi-irix6*, mips-sgi-irix5cross64): ... here.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@68808 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 14 insertions, 8 deletions

diff --git a/gcc/config.gcc b/gcc/config.gcc
index 688604cda32..7bcfb40028a 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -1391,21 +1391,23 @@ mcore-*-pe*)
 	tmake_file=mcore/t-mcore-pe
 	;;
 mips-sgi-irix6*o32)		# SGI System V.4., IRIX 6, O32 ABI
+	tm_file="${tm_file} mips/iris5.h"
 	if test x$gas = xyes
 	then
-		tm_file="mips/iris5.h mips/iris5gas.h mips/iris6-o32-gas.h"
+		tm_file="${tm_file} mips/iris5gas.h mips/iris6-o32-gas.h"
 		if test x$stabs = xyes
 		then
 			tm_file="${tm_file} dbx.h mips/dbxmdebug.h"
 		fi
 		tmake_file=mips/t-iris5-gas
 	else
-		tm_file="mips/iris5.h mips/iris6-o32-as.h"
+		tm_file="${tm_file} mips/iris6-o32-as.h"
 		tmake_file=mips/t-iris5-as
 	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.
 	use_collect2=yes
@@ -1414,21 +1416,24 @@ mips-sgi-irix6*o32)		# SGI System V.4., IRIX 6, O32 ABI
 #	fi
 	;;
 mips-sgi-irix6*)		# SGI System V.4., IRIX 6
+	tm_file="${tm_file} mips/iris5.h mips/iris6.h"
 	if test "x$gnu_ld" = xyes
 	then
-		tm_file="mips/iris6.h mips/iris6gld.h"
-	else
-		tm_file=mips/iris6.h
+		tm_file="${tm_file} mips/iris6gld.h"
 	fi
 	tmake_file="mips/t-iris mips/t-iris5-6 mips/t-iris6"
+	target_cpu_default="MASK_ABICALLS|MASK_FLOAT64|MASK_64BIT"
+	tm_defines="MIPS_ISA_DEFAULT=3 MIPS_ABI_DEFAULT=ABI_N32"
 #	if test x$enable_threads = xyes; then
 #		thread_file='irix'
 #	fi
 	;;
 mips-sgi-irix5cross64)		# Irix5 host, Irix 6 target, cross64
-	tm_file="mips/iris6.h mips/cross64.h"
+	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"
 	# See comment in mips/iris[56].h files.
 	use_collect2=yes
 #	if test x$enable_threads = xyes; then
@@ -1436,20 +1441,21 @@ mips-sgi-irix5cross64)		# Irix5 host, Irix 6 target, cross64
 #	fi
 	;;
 mips-sgi-irix5*)		# SGI System V.4., IRIX 5
+	tm_file="${tm_file} mips/iris5.h"
 	if test x$gas = xyes
 	then
-		tm_file="mips/iris5.h mips/iris5gas.h"
+		tm_file="${tm_file} mips/iris5gas.h"
 		if test x$stabs = xyes
 		then
 			tm_file="${tm_file} dbx.h mips/dbxmdebug.h"
 		fi
 		tmake_file=mips/t-iris5-gas
 	else
-		tm_file=mips/iris5.h
 		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.
 	use_collect2=yes