diff options
| author | Shih-wei Liao <sliao@google.com> | 2010-08-10 14:48:29 -0700 |
|---|---|---|
| committer | Shih-wei Liao <sliao@google.com> | 2010-08-10 14:48:29 -0700 |
| commit | 3e5165a7cc01d28b680a5f409eda72788cb451d3 (patch) | |
| tree | d04996a45659fbd445bd0f2a94794219c3896d82 | |
| parent | 97bca3642164e5e7b735914fb5bfeb5a163c0885 (diff) | |
| download | external_llvm-3e5165a7cc01d28b680a5f409eda72788cb451d3.zip external_llvm-3e5165a7cc01d28b680a5f409eda72788cb451d3.tar.gz external_llvm-3e5165a7cc01d28b680a5f409eda72788cb451d3.tar.bz2 | |
Make resolveRelocDestAddr handle the right relocation set. Otherwise, assertion failures "Can't handle this machine constant pool entry yet!" may occur.
Change-Id: I3235610163e6ce762f0493a1eaf5036805346c09
| -rw-r--r-- | lib/Target/ARM/ARMJITInfo.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/Target/ARM/ARMJITInfo.cpp b/lib/Target/ARM/ARMJITInfo.cpp index df8a4f5..11ededf 100644 --- a/lib/Target/ARM/ARMJITInfo.cpp +++ b/lib/Target/ARM/ARMJITInfo.cpp @@ -252,6 +252,7 @@ intptr_t ARMJITInfo::resolveRelocDestAddr(MachineRelocation *MR) const { case ARM::reloc_arm_jt_base: // Jump table base address. return getJumpTableBaseAddr(MR->getJumpTableIndex()); + case ARM::reloc_arm_so_imm: case ARM::reloc_arm_cp_entry: case ARM::reloc_arm_vfp_cp_entry: // Constant pool entry address. |