am f761709a: am 1829b14c: am 18e754ee: Merge "Fix LP64 tombstone.cpp build failure."

* commit 'f761709a8e0f440afbdcd0df8f78d5e8ebc94211':
  Fix LP64 tombstone.cpp build failure.
This commit is contained in:
Elliott Hughes 2014-07-08 18:45:30 +00:00 committed by Android Git Automerger
commit 81542db7c2

View file

@ -329,7 +329,7 @@ static void dump_backtrace_and_stack(Backtrace* backtrace, log_t* log) {
}
static void dump_map(log_t* log, const backtrace_map_t* map, bool fault_addr) {
_LOG(log, logtype::MAPS, "%s%" PRIPTR "-%" PRIPTR " %c%c%c %7d %s\n",
_LOG(log, logtype::MAPS, "%s%" PRIPTR "-%" PRIPTR " %c%c%c %7" PRIdPTR " %s\n",
(fault_addr? "--->" : " "), map->start, map->end - 1,
(map->flags & PROT_READ) ? 'r' : '-', (map->flags & PROT_WRITE) ? 'w' : '-',
(map->flags & PROT_EXEC) ? 'x' : '-',