From: Ian Lance Taylor <ian@airs.com>
Date: Tue, 11 Jan 1994 19:18:45 +0000 (+0000)
Subject: 	* config/tc-mips.c (macro): Corrected $at warnings in a couple of
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8197b58995daa7e84204c0565a303f4ecf4183cd;p=binutils-gdb.git

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

diff --git a/gas/ChangeLog b/gas/ChangeLog
index b9ee1499a8c..cf7ff6918fb 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 68c9c390891..c3e821c679e 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);