* config/tc-m68k.c (md_assemble): Ensure variable part of frag is

	allocated in the same chunk as the fixed part.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index ebc5b4a0700cb7fbe8ec65485a83f35f4c0b7d0a..8564e7fdaec3ea2aa90e6bb0d2719f6eff424b45 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2001-05-27  Alan Modra  <amodra@one.net.au>
+
+       * config/tc-m68k.c (md_assemble): Ensure variable part of frag is
+       allocated in the same chunk as the fixed part.
+
 2001-05-26  Alan Modra  <amodra@one.net.au>
 
        * write.c (relax_segment <rs_space>): Calculate growth using

diff --git a/gas/config/tc-m68k.c b/gas/config/tc-m68k.c
index 842510f957735747b7e70c0b488edbfd27296d47..62382ecbb7debbf25e326b71ac7df37b9f03b27a 100644 (file)
--- a/gas/config/tc-m68k.c
+++ b/gas/config/tc-m68k.c
@@ -3664,6 +3664,21 @@ md_assemble (str)
     }
 
   /* There's some frag hacking */
+  {
+    /* Calculate the max frag size.  */
+    int wid;
+
+    wid = 2 * the_ins.fragb[0].fragoff;
+    for (n = 1; n < the_ins.nfrag; n++)
+      wid += 2 * (the_ins.numo - the_ins.fragb[n - 1].fragoff);
+    /* frag_var part.  */
+    wid += 10;
+    /* Make sure the whole insn fits in one chunk, in particular that
+       the var part is attached, as we access one byte before the
+       variable frag for byte branches.  */
+    frag_grow (wid);
+  }
+
   for (n = 0, fromP = &the_ins.opcode[0]; n < the_ins.nfrag; n++)
     {
       int wid;