fix net-equip pr 2975: tm-m68k.c(m68k_ip): adjust for pc-rel offset before using...

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 672cad5715fea55798d14ba995e26fa3fefb32e9..fb772ad7426d441245d2760b0babd584e9525ce7 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+Mon Jul 19 12:35:39 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
+
+       * config/tc-m68k.c (m68k_ip, case AINDX): Add 6 to operand
+       expression (to take the pc-rel instruction itself into account)
+       before using the expression, instead of after.
+
 Fri Jul 16 08:56:04 1993  Ian Lance Taylor  (ian@cygnus.com)
 
        * read.c (float_cons): Simplified parsing logic.  If

diff --git a/gas/config/tc-m68k.c b/gas/config/tc-m68k.c
index d176838a29887fce185a075ac34c9825119c68bc..f0d419b57063f5c3547b11ed32116ccd678721ec 100644 (file)
--- a/gas/config/tc-m68k.c
+++ b/gas/config/tc-m68k.c
@@ -2443,8 +2443,8 @@ m68k_ip (instring)
                {
                  if (opP->reg == PC || opP->reg == ZPC)
                    {
-                     add_fix (siz1 == 3 ? 'l' : 'w', opP->con1, 1);
                      opP->con1->e_exp.X_add_number += 6;
+                     add_fix (siz1 == 3 ? 'l' : 'w', opP->con1, 1);
                    }
                  else
                    add_fix (siz1 == 3 ? 'l' : 'w', opP->con1, 0);
@@ -2458,8 +2458,8 @@ m68k_ip (instring)
                {
                  if (opP->reg == PC || opP->reg == ZPC)
                    {
-                     add_fix (siz2 == 3 ? 'l' : 'w', opP->con2, 1);
                      opP->con1->e_exp.X_add_number += 6;
+                     add_fix (siz2 == 3 ? 'l' : 'w', opP->con2, 1);
                    }
                  else
                    add_fix (siz2 == 3 ? 'l' : 'w', opP->con2, 0);