diff options
| author | 2015-05-21 12:26:31 +0000 | |
|---|---|---|
| committer | 2015-05-21 12:26:31 +0000 | |
| commit | 1f277e3cef6c33cd35e91123978491d83338d2ad (patch) | |
| tree | 85cae510b2103fe6685982b74f44a7cafb7428e4 /compiler/utils/arm/assembler_arm32.h | |
| parent | db0bbab279534974dca507946c66cff2d05dc9f9 (diff) | |
Revert "Introduce a NearLabel in thumb2."
Fails some benchmarks and libcore tests.
This reverts commit db0bbab279534974dca507946c66cff2d05dc9f9.
Change-Id: I5d1afef5ede87e65d61f49529027c5c2f35b17fb
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, |