diff options
author | Christopher Ferris <cferris@google.com> | 2015-05-01 15:02:03 -0700 |
---|---|---|
committer | Christopher Ferris <cferris@google.com> | 2015-05-01 16:04:24 -0700 |
commit | 329ed7dae49eba09bdf865dd999d1a7e73bb9687 (patch) | |
tree | ac1e24fea451c6ac8f5e5101e32f3f69f76d0d55 /debuggerd | |
parent | f1a58f8f33509201cabe71c6a9d01aa6b8f99966 (diff) | |
download | system_core-329ed7dae49eba09bdf865dd999d1a7e73bb9687.zip system_core-329ed7dae49eba09bdf865dd999d1a7e73bb9687.tar.gz system_core-329ed7dae49eba09bdf865dd999d1a7e73bb9687.tar.bz2 |
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 'debuggerd')
-rw-r--r-- | debuggerd/tombstone.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/debuggerd/tombstone.cpp b/debuggerd/tombstone.cpp index 094ab48..81da16d 100644 --- a/debuggerd/tombstone.cpp +++ b/debuggerd/tombstone.cpp @@ -379,6 +379,9 @@ static void dump_all_maps(Backtrace* backtrace, BacktraceMap* map, log_t* log, p line += " (BuildId: " + build_id + ")"; } } + if (it->load_base != 0) { + line += android::base::StringPrintf(" (load base 0x%" PRIxPTR ")", it->load_base); + } _LOG(log, logtype::MAPS, "%s\n", line.c_str()); } if (print_fault_address_marker) { |