diff options
| -rw-r--r-- | src/common/mac/dump_syms.mm | 8 | ||||
| -rw-r--r-- | src/tools/mac/crash_report/on_demand_symbol_supplier.mm | 3 |
2 files changed, 9 insertions, 2 deletions
diff --git a/src/common/mac/dump_syms.mm b/src/common/mac/dump_syms.mm index 066683f3..cc2efe17 100644 --- a/src/common/mac/dump_syms.mm +++ b/src/common/mac/dump_syms.mm @@ -449,12 +449,16 @@ bool DumpSymbols::WriteSymbolFile(FILE *stream) { = NXGetArchInfoFromCpuType(selected_object_file_->cputype, selected_object_file_->cpusubtype); + const char *selected_arch_name = selected_arch_info->name; + if (strcmp(selected_arch_name, "i386") == 0) + selected_arch_name = "x86"; + // Produce a name to use in error messages that includes the // filename, and the architecture, if there is more than one. selected_object_name_ = [object_filename_ UTF8String]; if (object_files_.size() > 1) { selected_object_name_ += ", architecture "; - selected_object_name_ + selected_arch_info->name; + selected_object_name_ + selected_arch_name; } // Compute a module name, to appear in the MODULE record. @@ -467,7 +471,7 @@ bool DumpSymbols::WriteSymbolFile(FILE *stream) { identifier += "0"; // Create a module to hold the debugging information. - Module module([module_name UTF8String], "mac", selected_arch_info->name, + Module module([module_name UTF8String], "mac", selected_arch_name, identifier); // Parse the selected object file. 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; |