From 5f926055cb88089d8ca27243f35a9dfd89d981f0 Mon Sep 17 00:00:00 2001 From: Vladimir Marko Date: Fri, 30 Sep 2016 17:04:49 +0000 Subject: Revert "Store resolved Strings for AOT code in .bss." There are some issues with oat_test64 on host and aosp_mips-eng. Also reverts "compiler_driver: Fix build." Bug: 20323084 Bug: 30627598 This reverts commit 63dccbbefef3014c99c22748d18befcc7bcb3b41. This reverts commit 04a44135ace10123f059373691594ae0f270a8a4. Change-Id: I568ba3e58cf103987fdd63c8a21521010a9f27c4 --- compiler/utils/arm/assembler_arm.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'compiler/utils/arm/assembler_arm.h') diff --git a/compiler/utils/arm/assembler_arm.h b/compiler/utils/arm/assembler_arm.h index 0ed8a35338..ee5811c3c0 100644 --- a/compiler/utils/arm/assembler_arm.h +++ b/compiler/utils/arm/assembler_arm.h @@ -262,6 +262,12 @@ class Address : public ValueObject { CHECK_NE(rm, PC); } + // LDR(literal) - pc relative load. + explicit Address(int32_t offset) : + rn_(PC), rm_(R0), offset_(offset), + am_(Offset), is_immed_offset_(false), shift_(LSL) { + } + static bool CanHoldLoadOffsetArm(LoadOperandType type, int offset); static bool CanHoldStoreOffsetArm(StoreOperandType type, int offset); -- cgit v1.2.3-59-g8ed1b