diff options
| author | David Tweed <david.tweed@arm.com> | 2013-05-17 14:31:59 +0000 |
|---|---|---|
| committer | David Tweed <david.tweed@arm.com> | 2013-05-17 14:31:59 +0000 |
| commit | 3285dc1364133caa63f45c5ed8365f0267d3ba1a (patch) | |
| tree | 1d790d3d4ac23d28935c42f8bd0ce7fab28dbd58 /llvm/lib | |
| parent | 2dbe06a987d25e518a158342dd927b83d968aef7 (diff) | |
| download | bcm5719-llvm-3285dc1364133caa63f45c5ed8365f0267d3ba1a.tar.gz bcm5719-llvm-3285dc1364133caa63f45c5ed8365f0267d3ba1a.zip | |
r182085 introduced a change that triggered an assertion on ARM. This is an immediate fix
which doesn't resolve the deeper problem.
llvm-svn: 182098
Diffstat (limited to 'llvm/lib')
| -rw-r--r-- | llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp b/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp index 57676ffaf45..2773bf1e191 100644 --- a/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp +++ b/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp @@ -277,6 +277,7 @@ void RuntimeDyldELF::resolveX86Relocation(const SectionEntry &Section, } } +// FIXME: PR16013: this routine needs modification to handle repeated relocations. void RuntimeDyldELF::resolveAArch64Relocation(const SectionEntry &Section, uint64_t Offset, uint64_t Value, @@ -356,6 +357,7 @@ void RuntimeDyldELF::resolveAArch64Relocation(const SectionEntry &Section, } } +// FIXME: PR16013: this routine needs modification to handle repeated relocations. void RuntimeDyldELF::resolveARMRelocation(const SectionEntry &Section, uint64_t Offset, uint32_t Value, @@ -391,8 +393,8 @@ void RuntimeDyldELF::resolveARMRelocation(const SectionEntry &Section, // We are not expecting any other addend in the relocation address. // Using 0x000F0FFF because MOVW has its 16 bit immediate split into 2 // non-contiguous fields. - assert((*TargetPtr & 0x000F0FFF) == 0); Value = Value & 0xFFFF; + *TargetPtr &= ~0x000F0FFF; // Not really right; see FIXME at top. *TargetPtr |= Value & 0xFFF; *TargetPtr |= ((Value >> 12) & 0xF) << 16; break; @@ -402,8 +404,8 @@ void RuntimeDyldELF::resolveARMRelocation(const SectionEntry &Section, case ELF::R_ARM_MOVT_ABS : // We are not expecting any other addend in the relocation address. // Use 0x000F0FFF for the same reason as R_ARM_MOVW_ABS_NC. - assert((*TargetPtr & 0x000F0FFF) == 0); Value = (Value >> 16) & 0xFFFF; + *TargetPtr &= ~0x000F0FFF; // Not really right; see FIXME at top. *TargetPtr |= Value & 0xFFF; *TargetPtr |= ((Value >> 12) & 0xF) << 16; break; |
