summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Shinwell <shinwell@codesourcery.com>2006-10-31 16:46:37 +0000
committerMark Shinwell <shinwell@codesourcery.com>2006-10-31 16:46:37 +0000
commitc8b0079035f7dd97a3ad4dd482b265fff30e97a1 (patch)
treeff43138fa0d8fb5755153c7659ec07169fdeff00
parente2ee1ce49cf68888384dfbd037e128b546682424 (diff)
downloadbinutils-redhat-c8b0079035f7dd97a3ad4dd482b265fff30e97a1.tar.gz
gas/
* 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.
-rw-r--r--ChangeLog.csl7
-rw-r--r--gas/config/tc-arm.c12
2 files changed, 13 insertions, 6 deletions
diff --git a/ChangeLog.csl b/ChangeLog.csl
index 68f42e78e5..fbb65ad8ed 100644
--- a/ChangeLog.csl
+++ b/ChangeLog.csl
@@ -1,3 +1,10 @@
+2006-10-31 Mark Shinwell <shinwell@codesourcery.com>
+
+ gas/
+ * 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-10-30 Paul Brook <paul@codesourcery.com>
bfd/
diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c
index b018a2fa4b..18437e5bd0 100644
--- a/gas/config/tc-arm.c
+++ b/gas/config/tc-arm.c
@@ -8973,7 +8973,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);
@@ -14972,8 +14972,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
@@ -17979,10 +17979,10 @@ 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. */
- /* Attempts to use CZB to branch to the next instruction
+ /* Attempts to use CBZ to branch to the next instruction
(which, strictly speaking, are prohibited) will be turned into
no-ops. */
if (value == -2)