* config/mips/mips.c (override_options): Don't override N32 for

        a 64-bit ISA.

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 74a936b..4cec626 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,8 @@
 2002-04-16  Richard Henderson  <rth@redhat.com>
 
+        * config/mips/mips.c (override_options): Don't override N32 for
+        a 64-bit ISA.
+
        PR 6202
        * config/mips/mips.md (can_delay): Split out of existing define_delays.
        (HILO_delay): Set can_delay false.

diff --git a/gcc/config/mips/mips.c b/gcc/config/mips/mips.c
index 8188c7b..0da1adb 100644 (file)
--- a/gcc/config/mips/mips.c
+++ b/gcc/config/mips/mips.c
@@ -4860,7 +4860,7 @@ override_options ()
        {
          if (! ISA_HAS_64BIT_REGS)
            mips_abi = ABI_32;
-         else
+         else if (mips_abi != ABI_N32)
            mips_abi = ABI_64;
        }
     }