summaryrefslogtreecommitdiffstats
path: root/linker
diff options
context:
space:
mode:
authorEvgeniy Stepanov <eugenis@google.com>2012-06-22 14:52:52 +0400
committerEvgeniy Stepanov <eugenis@google.com>2012-06-22 14:56:01 +0400
commit20bc061dc7a03249c90f8765ae757395587ce4f1 (patch)
tree41bf1f05ba88f835bd7a47843c4757ed356e4b0c /linker
parent63d0ceec75927155947c07bc45cb9fed5e527922 (diff)
downloadbionic-20bc061dc7a03249c90f8765ae757395587ce4f1.zip
bionic-20bc061dc7a03249c90f8765ae757395587ce4f1.tar.gz
bionic-20bc061dc7a03249c90f8765ae757395587ce4f1.tar.bz2
Add module base to main executable's ARM_exidx.
BUG:6697872 Change-Id: I448f4b86397307086231776da38a7af334a75fe5
Diffstat (limited to 'linker')
-rw-r--r--linker/linker.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/linker/linker.c b/linker/linker.c
index d26272c..1dd1d09 100644
--- a/linker/linker.c
+++ b/linker/linker.c
@@ -1727,7 +1727,7 @@ static int soinfo_link_image(soinfo *si, unsigned wr_offset)
if(phdr->p_type == PT_ARM_EXIDX) {
/* exidx entries (used for stack unwinding) are 8 bytes each.
*/
- si->ARM_exidx = (unsigned *)phdr->p_vaddr;
+ si->ARM_exidx = (unsigned *)(base + phdr->p_vaddr);
si->ARM_exidx_count = phdr->p_memsz / 8;
}
#endif