diff options
| author | Evan Cheng <evan.cheng@apple.com> | 2008-11-08 01:31:27 +0000 |
|---|---|---|
| committer | Evan Cheng <evan.cheng@apple.com> | 2008-11-08 01:31:27 +0000 |
| commit | e96a490d7a0e224961d37f60f85e8556a64ed2b1 (patch) | |
| tree | 8e08427d0f274f2b95911caf6bf81ff2ad73ad42 /lib/Target/ARM/ARMCodeEmitter.cpp | |
| parent | fd827c41cec48d4b8a6159ad29f5069d613170a8 (diff) | |
| download | external_llvm-e96a490d7a0e224961d37f60f85e8556a64ed2b1.zip external_llvm-e96a490d7a0e224961d37f60f85e8556a64ed2b1.tar.gz external_llvm-e96a490d7a0e224961d37f60f85e8556a64ed2b1.tar.bz2 | |
Handle ARM machine constantpool entry with non-lazy ptr.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@58882 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Target/ARM/ARMCodeEmitter.cpp')
| -rw-r--r-- | lib/Target/ARM/ARMCodeEmitter.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/Target/ARM/ARMCodeEmitter.cpp b/lib/Target/ARM/ARMCodeEmitter.cpp index 32cf226..49d2cb0 100644 --- a/lib/Target/ARM/ARMCodeEmitter.cpp +++ b/lib/Target/ARM/ARMCodeEmitter.cpp @@ -336,8 +336,13 @@ void ARMCodeEmitter::emitConstPoolInstruction(const MachineInstr &MI) { GlobalValue *GV = ACPV->getGV(); if (GV) { assert(!ACPV->isStub() && "Don't know how to deal this yet!"); - emitGlobalAddress(GV, ARM::reloc_arm_machine_cp_entry, false, - (intptr_t)ACPV); + if (ACPV->isNonLazyPointer()) + MCE.addRelocation(MachineRelocation::getGVNonLazyPtr( + MCE.getCurrentPCOffset(), ARM::reloc_arm_machine_cp_entry, GV, + (intptr_t)ACPV, false)); + else + emitGlobalAddress(GV, ARM::reloc_arm_machine_cp_entry, + ACPV->isStub(), (intptr_t)ACPV); } else { assert(!ACPV->isNonLazyPointer() && "Don't know how to deal this yet!"); emitExternalSymbolAddress(ACPV->getSymbol(), ARM::reloc_arm_absolute); |