From 1f277e3cef6c33cd35e91123978491d83338d2ad Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Thu, 21 May 2015 12:26:31 +0000 Subject: Revert "Introduce a NearLabel in thumb2." Fails some benchmarks and libcore tests. This reverts commit db0bbab279534974dca507946c66cff2d05dc9f9. Change-Id: I5d1afef5ede87e65d61f49529027c5c2f35b17fb --- compiler/utils/arm/assembler_arm32.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'compiler/utils/arm/assembler_arm32.h') 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, -- cgit v1.2.3-59-g8ed1b