From: Richard Henderson <rth@redhat.com>
Date: Wed, 17 Apr 2002 00:43:04 +0000 (-0700)
Subject: mips.c (override_options): Don't override N32 for a 64-bit ISA.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=409d3c6029fbe29f747035c5644d792fbc248d03;p=gcc.git

mips.c (override_options): Don't override N32 for a 64-bit ISA.

        * config/mips/mips.c (override_options): Don't override N32 for
        a 64-bit ISA.

From-SVN: r52389
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 74a936b630f..4cec626296f 100644
--- 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 8188c7bbc1f..0da1adb8720 100644
--- 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;
 	}
     }