* config/tc-mips.c (macro): Corrected $at warnings in a couple of

	spots.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index b9ee1499a8c09b4d1a9c97ca00a7a74e62760aa9..cf7ff6918fb6a8f8cb6c8a76789a15325b26ec9c 100644 (file)
--- 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 68c9c3908912e758aac994cdbe222a7341617648..c3e821c679e75afb9a37ddac9e13dcf8227236b0 100644 (file)
--- 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);