diff options
| author | 2015-05-21 12:26:43 +0000 | |
|---|---|---|
| committer | 2015-05-21 12:26:44 +0000 | |
| commit | d6a1eaef02d0c73a8c24ff93ff68fc4f0d46925f (patch) | |
| tree | 4078995c91b3862cb899966d34b31b0c7b05072d /compiler/utils/arm/assembler_arm32.h | |
| parent | 9758a8e4f7a8823161604aa876517e9ff5b8bb12 (diff) | |
| parent | 1f277e3cef6c33cd35e91123978491d83338d2ad (diff) | |
Merge "Revert "Introduce a NearLabel in thumb2.""
Diffstat (limited to 'compiler/utils/arm/assembler_arm32.h')
| -rw-r--r-- | compiler/utils/arm/assembler_arm32.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/utils/arm/assembler_arm32.h b/compiler/utils/arm/assembler_arm32.h index 45647675e8..55ec7b46d8 100644 --- a/compiler/utils/arm/assembler_arm32.h +++ b/compiler/utils/arm/assembler_arm32.h @@ -201,8 +201,8 @@ class Arm32Assembler FINAL : public ArmAssembler { void vpopd(DRegister reg, int nregs, Condition cond = AL) OVERRIDE; // Branch instructions. - void b(Label* label, Condition cond = AL) OVERRIDE; - void bl(Label* label, Condition cond = AL) OVERRIDE; + void b(Label* label, Condition cond = AL); + void bl(Label* label, Condition cond = AL); void blx(Register rm, Condition cond = AL) OVERRIDE; void bx(Register rm, Condition cond = AL) OVERRIDE; void Lsl(Register rd, Register rm, uint32_t shift_imm, bool setcc = false, |