From fb2fd3e12c28c6faf4d048591793b9c1a5be1619 Mon Sep 17 00:00:00 2001 From: Hans-Peter Nilsson Date: Tue, 26 Nov 2002 08:21:35 +0000 Subject: [PATCH] * config/tc-cris.c (cris_relax_frag): Fix typo in comment. (md_assemble): Don't pass on branches to constants as relaxable. Tweak comment. --- gas/ChangeLog | 6 ++++++ gas/config/tc-cris.c | 8 +++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/gas/ChangeLog b/gas/ChangeLog index e877a41253..6ca492de28 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,9 @@ +2002-11-26 Hans-Peter Nilsson + + * config/tc-cris.c (cris_relax_frag): Fix typo in comment. + (md_assemble): Don't pass on branches to constants as relaxable. + Tweak comment. + 2002-11-25 Svein E. Seldal * config/tc-tic4x.c (c4x_operands_match): Bugfix in direct mode diff --git a/gas/config/tc-cris.c b/gas/config/tc-cris.c index b263da7176..8f4b63324b 100644 --- a/gas/config/tc-cris.c +++ b/gas/config/tc-cris.c @@ -360,7 +360,7 @@ cris_relax_frag (seg, fragP, stretch) const relax_typeS *table = TC_GENERIC_RELAX_TABLE; /* We only have to cope with frags as prepared by - md_estimate_size_before_relax. The dword cases may geet here + md_estimate_size_before_relax. The dword cases may get here because of the different reasons that they aren't relaxable. */ switch (fragP->fr_subtype) { @@ -924,8 +924,7 @@ md_assemble (str) is_undefined = 1; } - if (output_instruction.expr.X_op == O_constant - || to_seg == now_seg || is_undefined) + if (to_seg == now_seg || is_undefined) { /* Handle complex expressions. */ valueT addvalue @@ -949,8 +948,7 @@ md_assemble (str) { /* We have: to_seg != now_seg && to_seg != undefined_section. This means it is a branch to a known symbol in another - section. Code in data? Weird but valid. Emit a 32-bit - branch. */ + section, perhaps an absolute address. Emit a 32-bit branch. */ char *cond_jump = frag_more (10); gen_cond_branch_32 (opcodep, cond_jump, frag_now, -- 2.34.1