diff options
| author | Stephen Hines <srhines@google.com> | 2012-12-14 17:31:05 -0800 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2012-12-14 17:31:05 -0800 |
| commit | b5431067fe923eeb9ab836d471d953de61373bff (patch) | |
| tree | 2b9829bebfbe6b4ff31053950075936f00e4ba43 | |
| parent | 909a0d7444300529d07e4a29f5c8cd526746987e (diff) | |
| parent | ac584bea7b04063b483134c7063d3efdf395c0da (diff) | |
| download | linkloader-b5431067fe923eeb9ab836d471d953de61373bff.tar.gz | |
Merge "Add proper number of stubs for ARM JUMP24 relocations."jb-mr1-dev-plus-aosp
| -rw-r--r-- | include/impl/ELFSectionRelTable.hxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/include/impl/ELFSectionRelTable.hxx b/include/impl/ELFSectionRelTable.hxx index d5d04a2..c6c4dde 100644 --- a/include/impl/ELFSectionRelTable.hxx +++ b/include/impl/ELFSectionRelTable.hxx @@ -98,9 +98,13 @@ getMaxNumStubs(ELFObjectTy const *obj) const { for (size_t i = 0; i < size(); ++i) { ELFRelocTy *rel = table[i]; - if (rel->getType() == R_ARM_CALL || - rel->getType() == R_ARM_THM_CALL) { + switch (rel->getType()) { + case R_ARM_CALL: + case R_ARM_THM_CALL: + case R_ARM_JUMP24: + case R_ARM_THM_JUMP24: sym_index_set.insert(rel->getSymTabIndex()); + break; } } |