* config/tc-m68hc11.c (build_jump_insn): Allocate worst case storage

	for bra/bsr and use frag_variant(), this ensure that the possible
	16-bit BFD_RELOC_16 will be in the same frag.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 03a82109ca1af29ae0b1dd9ffe8afc96e604d0c7..e0d697f52b0607447f458833260822c71026936f 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2001-11-01  Stephane Carrez  <Stephane.Carrez@worldnet.fr>
+
+       * config/tc-m68hc11.c (build_jump_insn): Allocate worst case storage
+       for bra/bsr and use frag_variant(), this ensure that the possible
+       16-bit BFD_RELOC_16 will be in the same frag.
+
 2001-10-16  Alan Modra  <amodra@bigpond.net.au>
 
        From Andrew Pines <apines@cosmodog.com>

diff --git a/gas/config/tc-m68hc11.c b/gas/config/tc-m68hc11.c
index 16c3fd69a16fc551b10701dc05fd138013168b52..a5ae3ab86e82f696abe64f53de229cf43fb6ef27 100644 (file)
--- a/gas/config/tc-m68hc11.c
+++ b/gas/config/tc-m68hc11.c
@@ -1519,12 +1519,14 @@ build_jump_insn (opcode, operands, nb_operands, jmp_mode)
       /* bra/bsr made be changed into jmp/jsr.  */
       else if (code == M6811_BSR || code == M6811_BRA || code == M6812_BSR)
        {
-         opcode = m68hc11_new_insn (2);
+          /* Allocate worst case storage.  */
+         opcode = m68hc11_new_insn (3);
          number_to_chars_bigendian (opcode, code, 1);
          number_to_chars_bigendian (opcode + 1, 0, 1);
-         frag_var (rs_machine_dependent, 2, 1,
-                   ENCODE_RELAX (STATE_PC_RELATIVE, STATE_UNDF),
-                   operands[0].exp.X_add_symbol, (offsetT) n, opcode);
+         frag_variant (rs_machine_dependent, 1, 1,
+                        ENCODE_RELAX (STATE_PC_RELATIVE, STATE_UNDF),
+                        operands[0].exp.X_add_symbol, (offsetT) n,
+                        opcode);
        }
       else if (current_architecture & cpu6812)
        {