From 9f816fad04c902184ed584dfd456a86fa095ccc8 Mon Sep 17 00:00:00 2001
From: rsandifo <rsandifo@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Sun, 17 Apr 2005 07:52:22 +0000
Subject: [PATCH] 	* config/mips/iris6.h (DRIVER_SELF_SPECS): Check
 -march as well as 	-mipsN before forcing a default of -mips2.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@98265 138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/ChangeLog           | 5 +++++
 gcc/config/mips/iris6.h | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4698d048c5cd..94dc52b65d78 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-17  Richard Sandiford  <rsandifo@redhat.com>
+
+	* config/mips/iris6.h (DRIVER_SELF_SPECS): Check -march as well as
+	-mipsN before forcing a default of -mips2.
+
 2005-04-17  Kazu Hirata  <kazu@cs.umass.edu>
 
 	* predict.h (IS_TAKEN): Remove.
diff --git a/gcc/config/mips/iris6.h b/gcc/config/mips/iris6.h
index b64d371b8f34..4e91bca16354 100644
--- a/gcc/config/mips/iris6.h
+++ b/gcc/config/mips/iris6.h
@@ -32,7 +32,7 @@ Boston, MA 02111-1307, USA.  */
    easier to write.  Default to the mips2 ISA for the O32 ABI.  */
 #define DRIVER_SELF_SPECS \
   "%{!mabi=*: -mabi=n32}", \
-  "%{mabi=32: %{!mips*: -mips2}}"
+  "%{mabi=32: %{!mips*: %{!march*: -mips2}}}"
 
 /* Force the generation of dwarf .debug_frame sections even if not
    compiling -g.  This guarantees that we can unwind the stack.  */
-- 
GitLab