From 1733aa8e100abadcf7d1942396e26fd161ab6818 Mon Sep 17 00:00:00 2001
From: ths <ths>
Date: Thu, 22 Apr 2004 22:00:47 +0000
Subject: [PATCH] * config/tc-mips.c (macro): One more use of load_delay_nop.

---
 gas/ChangeLog        | 4 ++++
 gas/config/tc-mips.c | 3 +--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/gas/ChangeLog b/gas/ChangeLog
index c9a9cfe8e3..0c99bf3970 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,7 @@
+2004-04-22  Thiemo Seufer  <seufer@csv.ica.uni-stuttgart.de>
+
+	* config/tc-mips.c (macro): One more use of load_delay_nop.
+
 2004-04-22  Atsushi Nemoto  <anemo@mba.ocn.ne.jp>
 
 	* config/tc-mips.c (load_delay_nop): New function.
diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c
index 3c0596d84b..2239f08938 100644
--- a/gas/config/tc-mips.c
+++ b/gas/config/tc-mips.c
@@ -7554,8 +7554,7 @@ macro2 (struct mips_cl_insn *ip)
       if (treg == tempreg)
         return;
       /* Protect second load's delay slot.  */
-      if (!gpr_interlocks)
-	macro_build (NULL, "nop", "");
+      load_delay_nop ();
       move_register (treg, tempreg);
       break;
 
-- 
2.11.0