diff options
-rw-r--r-- | gas/ChangeLog | 6 | ||||
-rw-r--r-- | gas/config/tc-arm.c | 10 |
2 files changed, 11 insertions, 5 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog index 34a1b8f..18ae993 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,9 @@ +2006-11-12 Mark Shinwell <shinwell@codesourcery.com> + + * config/tc-arm.c (do_t_czb): Rename to do_t_cbz. + (insns): Adjust accordingly. + (md_apply_fix): Alter comments to use CBZ instead of CZB. + 2006-11-10 Pedro Alves <pedro_alves@portugalmail.pt> * config/tc-arm.c (arm_fix_adjustable) [OBJ_COFF]: Delete. diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c index 8aa3d41..dcc8e80 100644 --- a/gas/config/tc-arm.c +++ b/gas/config/tc-arm.c @@ -8970,7 +8970,7 @@ do_t_cpy (void) } static void -do_t_czb (void) +do_t_cbz (void) { constraint (current_it_mask, BAD_NOT_IT); constraint (inst.operands[0].reg > 7, BAD_HIREG); @@ -14980,8 +14980,8 @@ static const struct asm_opcode insns[] = TC3(ldrsbt, 03000d0, f9100e00, 2, (RR, ADDR), ldsttv4, t_ldstt), TC3(strht, 02000b0, f8200e00, 2, (RR, ADDR), ldsttv4, t_ldstt), - UT(cbnz, b900, 2, (RR, EXP), t_czb), - UT(cbz, b100, 2, (RR, EXP), t_czb), + UT(cbnz, b900, 2, (RR, EXP), t_cbz), + UT(cbz, b100, 2, (RR, EXP), t_cbz), /* ARM does not really have an IT instruction, so always allow it. */ #undef ARM_VARIANT #define ARM_VARIANT &arm_ext_v1 @@ -18027,8 +18027,8 @@ md_apply_fix (fixS * fixP, } break; - case BFD_RELOC_THUMB_PCREL_BRANCH7: /* CZB */ - /* CZB can only branch forward. */ + case BFD_RELOC_THUMB_PCREL_BRANCH7: /* CBZ */ + /* CBZ can only branch forward. */ if (value & ~0x7e) as_bad_where (fixP->fx_file, fixP->fx_line, _("branch out of range")); |