am f51bee45: am 784b6181: am cf53e5db: Merge "Fix debuggerd\'s symbol offset output."

* commit 'f51bee45b015730b5f2759e89882c0cb457c22a3':
  Fix debuggerd's symbol offset output.
This commit is contained in:
Elliott Hughes 2014-02-03 16:59:59 +00:00 committed by Android Git Automerger
commit 32b3697946
1 changed files with 2 additions and 2 deletions

View File

@ -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",