diff -ur breakpad.org/src/processor/stackwalk_common.cc breakpad/src/processor/stackwalk_common.cc --- breakpad.org/src/processor/stackwalk_common.cc 2016-06-27 02:06:43.304932691 +0200 +++ breakpad/src/processor/stackwalk_common.cc 2016-06-27 02:10:22.815642476 +0200 @@ -750,7 +750,7 @@ // one per line, in the following machine-readable pipe-delimited // text format: // Module|{Module Filename}|{Version}|{Debug Filename}|{Debug Identifier}| -// {Base Address}|{Max Address}|{Main} +// {Base Address}|{Max Address}|{Main}|{Code Identifier} static void PrintModulesMachineReadable(const CodeModules *modules) { if (!modules) return; @@ -767,7 +767,7 @@ ++module_sequence) { const CodeModule *module = modules->GetModuleAtSequence(module_sequence); uint64_t base_address = module->base_address(); - printf("Module%c%s%c%s%c%s%c%s%c0x%08" PRIx64 "%c0x%08" PRIx64 "%c%d\n", + printf("Module%c%s%c%s%c%s%c%s%c0x%08" PRIx64 "%c0x%08" PRIx64 "%c%d%c%s\n", kOutputSeparator, StripSeparator(PathnameStripper::File(module->code_file())).c_str(), kOutputSeparator, StripSeparator(module->version()).c_str(), @@ -778,7 +778,9 @@ kOutputSeparator, base_address, kOutputSeparator, base_address + module->size() - 1, kOutputSeparator, - main_module != NULL && base_address == main_address ? 1 : 0); + main_module != NULL && base_address == main_address ? 1 : 0, + kOutputSeparator, + StripSeparator(PathnameStripper::File(module->code_identifier())).c_str()); } }