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 | ffdd91e3b81020c601f7d99f7f61701f4d7de4b6 (patch) | |
| tree | 958a1ceaeda72588f4e6cd5fad35c3b02732c2b0 /llvm/lib/Target/ARM/ARMCodeEmitter.cpp | |
| parent | b12642253390f6257f7177e7bf474b6608a6585c (diff) | |
| download | bcm5719-llvm-ffdd91e3b81020c601f7d99f7f61701f4d7de4b6.tar.gz bcm5719-llvm-ffdd91e3b81020c601f7d99f7f61701f4d7de4b6.zip | |
Handle ARM machine constantpool entry with non-lazy ptr.
llvm-svn: 58882
Diffstat (limited to 'llvm/lib/Target/ARM/ARMCodeEmitter.cpp')
| -rw-r--r-- | llvm/lib/Target/ARM/ARMCodeEmitter.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/llvm/lib/Target/ARM/ARMCodeEmitter.cpp b/llvm/lib/Target/ARM/ARMCodeEmitter.cpp index 32cf226c497..49d2cb0ae6e 100644 --- a/llvm/lib/Target/ARM/ARMCodeEmitter.cpp +++ b/llvm/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); |
