diff options
| author | mark@chromium.org <mark@chromium.org@4c0a9323-5329-0410-9bdc-e9ce6186880e> | 2010-08-06 19:47:16 +0000 |
|---|---|---|
| committer | mark@chromium.org <mark@chromium.org@4c0a9323-5329-0410-9bdc-e9ce6186880e> | 2010-08-06 19:47:16 +0000 |
| commit | 0ab73db415a14651bd8e336b26d33a7be4a37aad (patch) | |
| tree | fd46dba665dd686cdc92dcbb410b768c9171f392 /src/tools | |
| parent | Fix HandleInvalidParameter/HandlePureVirtualCall to dynamically lookup the Rt... (diff) | |
| download | breakpad-0ab73db415a14651bd8e336b26d33a7be4a37aad.tar.xz | |
Breakpad uses x86 as the architecture name, not i386. Most tools don't care
what architecture name is shown in a symbol file's MODULE line, but the Mac
crash_report tool's on_demand_symbol_supplier does. The new Mac dumper
inadvertently used i386. Correct that to make it x86. Temporarily make the
on_demand_symbol_supplier accept symbol files whose architecture is i386.
Also add x86_64 to the set of architectures that the on_demand_symbol_supplier
considers valid.
BUG=none
TEST=none
Review URL: http://breakpad.appspot.com/143001
git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@638 4c0a9323-5329-0410-9bdc-e9ce6186880e
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/mac/crash_report/on_demand_symbol_supplier.mm | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/tools/mac/crash_report/on_demand_symbol_supplier.mm b/src/tools/mac/crash_report/on_demand_symbol_supplier.mm index 0f37686f..8dc7c0de 100644 --- a/src/tools/mac/crash_report/on_demand_symbol_supplier.mm +++ b/src/tools/mac/crash_report/on_demand_symbol_supplier.mm @@ -86,7 +86,10 @@ OnDemandSymbolSupplier::OnDemandSymbolSupplier(const string &search_dir, NSScanner *scanner = [NSScanner scannerWithString:dataStr]; BOOL goodScan = [scanner scanString:@"MODULE mac " intoString:nil]; if (goodScan) { + // TODO(mark): remove i386 from this list. goodScan = ([scanner scanString:@"x86 " intoString:nil] || + [scanner scanString:@"i386 " intoString:nil] || + [scanner scanString:@"x86_64 " intoString:nil] || [scanner scanString:@"ppc " intoString:nil]); if (goodScan) { NSString *moduleID; |