summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephane Carrez <stcarrez@nerim.fr>2001-11-01 09:57:24 +0000
committerStephane Carrez <stcarrez@nerim.fr>2001-11-01 09:57:24 +0000
commitc3f118876af79d1ce51765860684bf17effeaef3 (patch)
treef3e769a7094a24dbb6df18acf1412121387decd1
parent41e27f512a5123bc28e982264b9ceb3b78e6da85 (diff)
downloadbinutils-gdb-c3f118876af79d1ce51765860684bf17effeaef3.tar.gz
* 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.
-rw-r--r--gas/ChangeLog6
-rw-r--r--gas/config/tc-m68hc11.c10
2 files changed, 12 insertions, 4 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 03a82109ca1..e0d697f52b0 100644
--- 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 16c3fd69a16..a5ae3ab86e8 100644
--- 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)
{