commit 808f4fd3b5f0d1fa01c43340e5f13aceb7952c37
author Christopher Ferris <cferris@google.com> Fri May 01 15:02:03 2015 -0700
committer Christopher Ferris <cferris@google.com> Fri May 01 16:04:24 2015 -0700
tree ac1e24fea451c6ac8f5e5101e32f3f69f76d0d55
parent c50b99480a253471bdcdac544b81a12f123476b2

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
Change-Id: Iec2d1db2051e7b4a278c1dfa57d745128a7f2974

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;