From: Ian Lance Taylor <ian@airs.com>
Date: Mon, 14 Aug 1995 21:33:29 +0000 (+0000)
Subject: 	* config/tc-m68k.c (s_reg): Rename local op to rop to avoid
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8e11ad0acda1ef8d35a922c58c9d50bf86ddebfe;p=binutils-gdb.git

	* config/tc-m68k.c (s_reg): Rename local op to rop to avoid
	confusion with macro op.
---

diff --git a/gas/ChangeLog b/gas/ChangeLog
index dd09b54ad34..386185ee11b 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -5,6 +5,9 @@ Mon Aug 14 14:08:07 1995  Jeff Law  (law@snake.cs.utah.edu)
 
 Mon Aug 14 15:45:07 1995  Ian Lance Taylor  <ian@cygnus.com>
 
+	* config/tc-m68k.c (s_reg): Rename local op to rop to avoid
+	confusion with macro op.
+
 	* gasp.c (strip_comments): Comment out; it's not used.
 	(do_end): Add parameter.  In MRI mode, print it out.
 	(do_irp): New static function.
diff --git a/gas/config/tc-m68k.c b/gas/config/tc-m68k.c
index f1cb10bdd2d..2f4f338519a 100644
--- a/gas/config/tc-m68k.c
+++ b/gas/config/tc-m68k.c
@@ -4375,7 +4375,7 @@ s_reg (ignore)
 {
   char *s;
   int c;
-  struct m68k_op op;
+  struct m68k_op rop;
   unsigned long mask;
 
   if (mri_line_label == NULL)
@@ -4398,12 +4398,12 @@ s_reg (ignore)
   c = *input_line_pointer;
   *input_line_pointer = '\0';
 
-  if (m68k_ip_op (s, &op) != 0)
+  if (m68k_ip_op (s, &rop) != 0)
     {
-      if (op.error == NULL)
+      if (rop.error == NULL)
 	as_bad ("bad register list");
       else
-	as_bad ("bad register list: %s", op.error);
+	as_bad ("bad register list: %s", rop.error);
       *input_line_pointer = c;
       ignore_rest_of_line ();
       return;
@@ -4411,22 +4411,22 @@ s_reg (ignore)
 
   *input_line_pointer = c;
 
-  if (op.mode == REGLST)
-    mask = op.mask;
-  else if (op.mode == DREG)
-    mask = 1 << (op.reg - DATA0);
-  else if (op.mode == AREG)
-    mask = 1 << (op.reg - ADDR0 + 8);
-  else if (op.mode == FPREG)
-    mask = 1 << (op.reg - FP0 + 16);
-  else if (op.mode == CONTROL
-	   && op.reg == FPI)
+  if (rop.mode == REGLST)
+    mask = rop.mask;
+  else if (rop.mode == DREG)
+    mask = 1 << (rop.reg - DATA0);
+  else if (rop.mode == AREG)
+    mask = 1 << (rop.reg - ADDR0 + 8);
+  else if (rop.mode == FPREG)
+    mask = 1 << (rop.reg - FP0 + 16);
+  else if (rop.mode == CONTROL
+	   && rop.reg == FPI)
     mask = 1 << 24;
-  else if (op.mode == CONTROL
-	   && op.reg == FPS)
+  else if (rop.mode == CONTROL
+	   && rop.reg == FPS)
     mask = 1 << 25;
-  else if (op.mode == CONTROL
-	   && op.reg == FPC)
+  else if (rop.mode == CONTROL
+	   && rop.reg == FPC)
     mask = 1 << 26;
   else
     {