diff options
| author | Stephen Hines <srhines@google.com> | 2012-12-15 14:58:03 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-12-15 14:58:03 -0800 |
| commit | 4a6531fe862ed026a69f6e5c9770f3d236296c84 (patch) | |
| tree | 2b9829bebfbe6b4ff31053950075936f00e4ba43 | |
| parent | fb0cfd4c8672ced693271f7a68942345405d69c3 (diff) | |
| parent | b5431067fe923eeb9ab836d471d953de61373bff (diff) | |
| download | linkloader-tools_r22.tar.gz | |
am b5431067: Merge "Add proper number of stubs for ARM JUMP24 relocations."HEADtools_r22.2tools_r22mastermainjb-mr1.1-dev-plus-aosp
* commit 'b5431067fe923eeb9ab836d471d953de61373bff':
Add proper number of stubs for ARM JUMP24 relocations.
| -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; } } |