diff options
| author | Elliott Hughes <enh@google.com> | 2014-02-01 07:48:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-02-01 07:48:24 +0000 |
| commit | cf53e5dbdfa06a16104f4ffa03aeeb538fbd1509 (patch) | |
| tree | 3de994bb5a992d9c310fda99fc4bc3ca8d1c6896 | |
| parent | 434edbe6fffb9445316567ac6de3f407c005b37b (diff) | |
| parent | f7b4b519e4c7df19faa04371d64b7560a08005e0 (diff) | |
| download | system_core-cf53e5dbdfa06a16104f4ffa03aeeb538fbd1509.zip system_core-cf53e5dbdfa06a16104f4ffa03aeeb538fbd1509.tar.gz system_core-cf53e5dbdfa06a16104f4ffa03aeeb538fbd1509.tar.bz2 | |
Merge "Fix debuggerd's symbol offset output."
| -rwxr-xr-x | debuggerd/tombstone.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/debuggerd/tombstone.cpp b/debuggerd/tombstone.cpp index 5acf16d..c630020 100755 --- a/debuggerd/tombstone.cpp +++ b/debuggerd/tombstone.cpp @@ -243,7 +243,7 @@ static void dump_stack_segment( if (!func_name.empty()) { if (!i && label >= 0) { if (offset) { - _LOG(log, scope_flags, " #%02d %" PRIPTR " %" PRIPTR " %s (%s+%" PRIxPTR "u)\n", + _LOG(log, scope_flags, " #%02d %" PRIPTR " %" PRIPTR " %s (%s+%" PRIuPTR ")\n", label, *sp, stack_content, map_name, func_name.c_str(), offset); } else { _LOG(log, scope_flags, " #%02d %" PRIPTR " %" PRIPTR " %s (%s)\n", @@ -251,7 +251,7 @@ static void dump_stack_segment( } } else { if (offset) { - _LOG(log, scope_flags, " %" PRIPTR " %" PRIPTR " %s (%s+%" PRIxPTR "u)\n", + _LOG(log, scope_flags, " %" PRIPTR " %" PRIPTR " %s (%s+%" PRIuPTR ")\n", *sp, stack_content, map_name, func_name.c_str(), offset); } else { _LOG(log, scope_flags, " %" PRIPTR " %" PRIPTR " %s (%s)\n", |