summaryrefslogtreecommitdiffstats
path: root/libbacktrace/UnwindMap.cpp
diff options
context:
space:
mode:
authorChristopher Ferris <cferris@google.com>2015-05-01 15:02:03 -0700
committerChristopher Ferris <cferris@google.com>2015-05-01 16:04:24 -0700
commit329ed7dae49eba09bdf865dd999d1a7e73bb9687 (patch)
treeac1e24fea451c6ac8f5e5101e32f3f69f76d0d55 /libbacktrace/UnwindMap.cpp
parentf1a58f8f33509201cabe71c6a9d01aa6b8f99966 (diff)
downloadsystem_core-329ed7dae49eba09bdf865dd999d1a7e73bb9687.tar.gz
system_core-329ed7dae49eba09bdf865dd999d1a7e73bb9687.tar.bz2
system_core-329ed7dae49eba09bdf865dd999d1a7e73bb9687.zip
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
Diffstat (limited to 'libbacktrace/UnwindMap.cpp')
-rw-r--r--libbacktrace/UnwindMap.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/libbacktrace/UnwindMap.cpp b/libbacktrace/UnwindMap.cpp
index fa59d0789..4a4e2f33c 100644
--- a/libbacktrace/UnwindMap.cpp
+++ b/libbacktrace/UnwindMap.cpp
@@ -51,6 +51,7 @@ bool UnwindMap::GenerateMap() {
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 @@ bool UnwindMapLocal::GenerateMap() {
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;