* config.gcc (mips-sgi-irix6*o32): Removed.

	* config/mips/iris6-o32-as.h: Likewise.
	* config/mips/iris6-o32-gas.h: Likewise.
	* config/mips/iris6-o32.h: Likewise.


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

5 files changed, 8 insertions, 92 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6e361e776bc..92999ec12cf 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2004-01-22  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
+
+	* config.gcc (mips-sgi-irix6*o32): Removed.
+	* config/mips/iris6-o32-as.h: Likewise.
+	* config/mips/iris6-o32-gas.h: Likewise.
+	* config/mips/iris6-o32.h: Likewise.
+
 2004-01-22  Jan Hubicka  <jh@suse.cz>
 
 	* cfgcleanup.c (first_pass): New static variable.
diff --git a/gcc/config.gcc b/gcc/config.gcc
index fd75363eba2..977f7fbf7e8 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -1,5 +1,5 @@
 # GCC target-specific configuration file.
-# Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2003
+# Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
 # Free Software Foundation, Inc.
 
 #This file is part of GCC.
@@ -1441,34 +1441,6 @@ mcore-*-pe*)
 	tmake_file=mcore/t-mcore-pe
 	use_fixproto=yes
 	;;
-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="${tm_file} mips/sdb.h 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="${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"
-	target_cpu_default="MASK_ABICALLS"
-	# mips-tfile doesn't work yet
-	# See comment in mips/iris5.h file.
-	if test x$gas = xno
-	then
-		use_collect2=yes
-	fi
-#	if test x$enable_threads = xyes; then
-#		thread_file='irix'
-#	fi
-	use_fixproto=yes
-	;;
 mips-sgi-irix6*)		# SGI System V.4., IRIX 6
 	tm_file="${tm_file} mips/iris5.h mips/iris6.h"
 	tmake_file="mips/t-iris mips/t-iris5-6 mips/t-iris6"
diff --git a/gcc/config/mips/iris6-o32-as.h b/gcc/config/mips/iris6-o32-as.h
deleted file mode 100644
index 5cda89e13cf..00000000000
--- a/gcc/config/mips/iris6-o32-as.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Definitions of target machine for GNU compiler, for MIPS running IRIX 6
-   (O32 ABI) using the SGI assembler.  */
-
-/* Enforce use of O32 linker, irrespective of SGI_ABI environment variable
-   and machine type (e.g., R8000 systems default to -64).  Copied from
-   iris5.h, only adding -32.  The default options -call_shared -no_unresolved
-   are only passed if not invoked with -r.  */
-#undef LINK_SPEC
-#define LINK_SPEC "\
-%{G*} %{EB} %{EL} %{mips1} %{mips2} %{mips3} \
-%{bestGnum} %{shared} %{non_shared} \
-%{call_shared} %{no_archive} %{exact_version} \
-%{static: -non_shared} \
-%{!static: \
-  %{!shared:%{!non_shared:%{!call_shared:%{!r: -call_shared -no_unresolved}}}}} \
-%{rpath} \
--_SYSTYPE_SVR4 \
--32"
diff --git a/gcc/config/mips/iris6-o32-gas.h b/gcc/config/mips/iris6-o32-gas.h
deleted file mode 100644
index fb540a922cf..00000000000
--- a/gcc/config/mips/iris6-o32-gas.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Definitions of target machine for GNU compiler, for MIPS running IRIX 6
-   (O32 ABI) using the GNU assembler.  */
-
-/* Enforce use of O32 linker, irrespective of SGI_ABI environment variable
-   and machine type (e.g., R8000 systems default to -64).  Copied from
-   iris5gas.h, only adding -32.  The default options -call_shared
-   -no_unresolved are only passed if not invoked with -r.  */
-#undef LINK_SPEC
-#define LINK_SPEC "\
-%{G*} %{EB} %{EL} %{mips1} %{mips2} %{mips3} \
-%{bestGnum} %{shared} %{non_shared} \
-%{call_shared} %{no_archive} %{exact_version} \
-%{static: -non_shared} \
-%{!static: \
-  %{!shared:%{!non_shared:%{!call_shared:%{!r: -call_shared -no_unresolved}}}}} \
-%{rpath} -init __do_global_ctors -fini __do_global_dtors \
-%{shared:-hidden_symbol __do_global_ctors,__do_global_ctors_1,__do_global_dtors} \
--_SYSTYPE_SVR4 \
--32"
diff --git a/gcc/config/mips/iris6-o32.h b/gcc/config/mips/iris6-o32.h
deleted file mode 100644
index a525db163ae..00000000000
--- a/gcc/config/mips/iris6-o32.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Definitions of target machine for GNU compiler, for MIPS running IRIX 6
-   (O32 ABI).  */
-
-/* The O32 ABI on IRIX 6 defaults to the mips2 ISA.  */
-#undef MIPS_CPU_STRING_DEFAULT
-#define MIPS_CPU_STRING_DEFAULT "mips2"
-
-/* Specify wchar_t and wint_t types.  */
-#undef WCHAR_TYPE
-#define WCHAR_TYPE "long int"
-
-#undef WCHAR_TYPE_SIZE
-#define WCHAR_TYPE_SIZE 32
-
-#undef WINT_TYPE
-#define WINT_TYPE "long int"
-
-#undef WINT_TYPE_SIZE
-#define WINT_TYPE_SIZE 32
-
-/* Enforce use of O32 assembler, irrespective of SGI_ABI environment variable
-   and machine type (e.g., R8000 systems default to -64).  Gas doesn't need
-   this, but doesn't hurt either.  Need to pass -mips2 to gas which defaults
-   to -mips1 if no ISA is specified.  */
-#undef SUBTARGET_ASM_SPEC
-#define SUBTARGET_ASM_SPEC "-32 %{!mips*:-mips2}"