From: Aldy Hernandez <aldyh@redhat.com>
Date: Fri, 7 Sep 2001 12:52:49 +0000 (+0000)
Subject: mips.c (override_options): Allow abi32 with 64 bit registers.
X-Git-Tag: prereleases/libstdc++-3.0.95~2212
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1dee47c328c72ff265a18e00d3b8b6d559634e85;p=thirdparty%2Fgcc.git

mips.c (override_options): Allow abi32 with 64 bit registers.

    * config/mips/mips.c (override_options): Allow abi32 with 64 bit
	registers.

From-SVN: r45464
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 21d02443c611..3dffbb67bced 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2001-09-06  Aldy Hernandez  <aldyh@redhat.com>
+
+	* config/mips/mips.c (override_options): Allow abi32 with 64 bit
+	registers.
+
 2001-09-07  Andreas Jaeger  <aj@suse.de>
 
 	* i386.h (TARGET_SWITCHES): Fix descriptions.
diff --git a/gcc/config/mips/mips.c b/gcc/config/mips/mips.c
index 583cf7385340..db32d4765fcb 100644
--- a/gcc/config/mips/mips.c
+++ b/gcc/config/mips/mips.c
@@ -4819,9 +4819,8 @@ override_options ()
   /* If both ABI and ISA were specified, check for conflicts.  */
   else if (mips_isa_string && mips_abi_string)
     {
-      if ((! ISA_HAS_64BIT_REGS && (mips_abi == ABI_N32 || mips_abi == ABI_64
+      if (! ISA_HAS_64BIT_REGS && (mips_abi == ABI_N32 || mips_abi == ABI_64
 			     || mips_abi == ABI_O64))
-	  || (ISA_HAS_64BIT_REGS && mips_abi == ABI_32))
 	error ("-mabi=%s does not support -mips%d", mips_abi_string, mips_isa);
     }