commit 20bc061dc7a03249c90f8765ae757395587ce4f1
author Evgeniy Stepanov <eugenis@google.com> Fri Jun 22 14:52:52 2012 +0400
committer Evgeniy Stepanov <eugenis@google.com> Fri Jun 22 14:56:01 2012 +0400
tree 41bf1f05ba88f835bd7a47843c4757ed356e4b0c
parent 63d0ceec75927155947c07bc45cb9fed5e527922

Add module base to main executable's ARM_exidx.

BUG:6697872

Change-Id: I448f4b86397307086231776da38a7af334a75fe5

linker/linker.c

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 @@
             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