commit 2106f4ba95004fdfc76ad3fa308a07fdbf475984
author Christopher Ferris <cferris@google.com> Fri May 01 15:02:03 2015 -0700
committer Christopher Ferris <cferris@google.com> Fri May 01 17:09:49 2015 -0700
tree ba5f3a525e4288db1f8af44c5b26284fb0d630d9
parent b74d889211f30d99c222fa7d3cfaf4a7390d6a95

Add load base to map for relocation packing.

The new linker relocation packing support uses non-zero load bases,
so we better handle them properly.

Also print out the load base for a map if it's non-zero.

Bug: 20687795
(cherry picked from commit 329ed7dae49eba09bdf865dd999d1a7e73bb9687)

Change-Id: Ibc37d8c8bb032820dca4e7531184349ba6d402d2

libbacktrace/UnwindMap.cpp

diff --git a/libbacktrace/UnwindMap.cpp b/libbacktrace/UnwindMap.cpp
index fa59d07..4a4e2f3 100644
--- a/libbacktrace/UnwindMap.cpp
+++ b/libbacktrace/UnwindMap.cpp
@@ -51,6 +51,7 @@
 
     map.start = unw_map.start;
     map.end = unw_map.end;
+    map.load_base = unw_map.load_base;
     map.flags = unw_map.flags;
     map.name = unw_map.path;
 
@@ -91,6 +92,7 @@
 
       map.start = unw_map.start;
       map.end = unw_map.end;
+      map.load_base = unw_map.load_base;
       map.flags = unw_map.flags;
       map.name = unw_map.path;