From e3f5cc86f875375ac87d4cdaac62f82ab4428295 Mon Sep 17 00:00:00 2001
From: Mark Mitchell <mark@codesourcery.com>
Date: Thu, 15 Jul 1999 13:59:04 +0000
Subject: [PATCH] configure.in: Use t-iris6, even with GNU LD.

	* configure.in: Use t-iris6, even with GNU LD.
	* config/mips/iris6gld.h: Fix typo in linker spec.
	* config/mips/t-iris6gld: Remove.

From-SVN: r28115
---
 gcc/ChangeLog              |  6 ++++++
 gcc/config/mips/iris6gld.h |  2 +-
 gcc/config/mips/t-iris6gld | 10 ----------
 gcc/configure.in           |  3 +--
 4 files changed, 8 insertions(+), 13 deletions(-)
 delete mode 100644 gcc/config/mips/t-iris6gld

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 71e7ff1c8c4..3a19f31f4d6 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+1999-07-15  Mark Mitchell  <mark@codesourcery.com>
+
+	* configure.in: Use t-iris6, even with GNU LD.
+	* config/mips/iris6gld.h: Fix typo in linker spec.
+	* config/mips/t-iris6gld: Remove.
+
 Thu Jul 15 15:15:43 1999  David Edelsohn  <edelsohn@gnu.org>
 
 	* rs6000.md (insv, extzv): Remove SImode dependence in named
diff --git a/gcc/config/mips/iris6gld.h b/gcc/config/mips/iris6gld.h
index d3c67841f3e..59a7347838e 100644
--- a/gcc/config/mips/iris6gld.h
+++ b/gcc/config/mips/iris6gld.h
@@ -45,4 +45,4 @@ Boston, MA 02111-1307, USA.  */
 %{!static: \
   %{!shared: %{!non_shared: %{!call_shared: -call_shared}}}} \
 %{rpath} -init __do_global_ctors -fini __do_global_dtors \
-%{mabi=32: -melf32bsmip}%{mabi=n32: -melfbmipn32}%{mabi=64: -melfbmip64}%{!mabi*: -melf32bmipn32}"
+%{mabi=32: -melf32bsmip}%{mabi=n32: -melfbmipn32}%{mabi=64: -melf64bmip}%{!mabi*: -melf32bmipn32}"
diff --git a/gcc/config/mips/t-iris6gld b/gcc/config/mips/t-iris6gld
deleted file mode 100644
index c70eb065358..00000000000
--- a/gcc/config/mips/t-iris6gld
+++ /dev/null
@@ -1,10 +0,0 @@
-# Suppress building libgcc1.a, since the MIPS compiler port is complete
-# and does not need anything from libgcc1.a.
-LIBGCC1 = 
-CROSS_LIBGCC1 = 
-
-# We don't multilib because we don't yet have 64-bit linker support in
-# GNU ld.
-
-CRTSTUFF_T_CFLAGS=-g1
-
diff --git a/gcc/configure.in b/gcc/configure.in
index c25ca57831d..a3ae27c499a 100644
--- a/gcc/configure.in
+++ b/gcc/configure.in
@@ -2242,11 +2242,10 @@ changequote([,])dnl
 		if test "x$gnu_ld" = xyes
 		then
 			tm_file="mips/iris6.h mips/iris6gld.h"
-			tmake_file=mips/t-iris6gld
 		else
 			tm_file=mips/iris6.h
-			tmake_file=mips/t-iris6
 		fi
+		tmake_file=mips/t-iris6
 		xm_file=mips/xm-iris6.h
 		xmake_file=mips/x-iris6
 # 		if test x$enable_threads = xyes; then