aboutsummaryrefslogtreecommitdiff
path: root/gas
diff options
context:
space:
mode:
Diffstat (limited to 'gas')
-rw-r--r--gas/ChangeLog4
-rw-r--r--gas/config/tc-mips.c3
2 files changed, 5 insertions, 2 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog
index c9a9cfe..0c99bf3 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 3c0596d..2239f08 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;