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 21d02443c6119a08d2b2b8cac9e03f2b659662e9..3dffbb67bced6c94170f5887b2de87b9692f6837 100644 (file)
--- 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 583cf7385340e54eeb7d8c2abfe6caee91f415e2..db32d4765fcb047c96a331cfbcbef21d8c05241e 100644 (file)
--- 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);
     }