aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gas/ChangeLog3
-rw-r--r--gas/config/tc-mips.c6
2 files changed, 7 insertions, 2 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog
index b9ee149..cf7ff69 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,5 +1,8 @@
Tue Jan 11 13:01:20 1994 Ian Lance Taylor (ian@tweedledumb.cygnus.com)
+ * config/tc-mips.c (macro): Corrected $at warnings in a couple of
+ spots.
+
* listing.c (listing_prev_line): New function.
* listing.c: Include subsegs.h.
(listing_prev_line): New function.
diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c
index 68c9c39..c3e821c 100644
--- a/gas/config/tc-mips.c
+++ b/gas/config/tc-mips.c
@@ -2690,9 +2690,11 @@ macro (ip)
treg, (int) BFD_RELOC_MIPS_GPREL, GP);
p = frag_var (rs_machine_dependent, 8, 0,
RELAX_ENCODE (4, 8, 0, 4, 0,
- mips_warn_about_macros),
+ (mips_warn_about_macros
+ || (used_at && mips_noat))),
offset_expr.X_add_symbol, (long) 0,
(char *) NULL);
+ used_at = 0;
}
macro_build_lui (p, &icnt, &offset_expr, tempreg);
if (p != NULL)
@@ -3012,7 +3014,7 @@ macro (ip)
(int) BFD_RELOC_MIPS_GPREL, tempreg);
p = frag_var (rs_machine_dependent, 12 + off, 0,
RELAX_ENCODE (8 + off, 12 + off, 0, 4 + off, 1,
- ! used_at && mips_noat),
+ used_at && mips_noat),
offset_expr.X_add_symbol, (long) 0,
(char *) NULL);