Write field indicating multiple symbols at an address in dump_syms

Updates dump_syms to write the optional 'm' first field in FUNCTION and
PUBLIC records to indicate that the address corresponds to more than one
symbol.

Bug: google-breakpad:751
Change-Id: I850b0122324ed5f9ec747aa92ba354a3126a7ef9
Reviewed-on: https://chromium-review.googlesource.com/820711
Reviewed-by: Mark Mentovai <mark@chromium.org>

1 files changed, 3 insertions, 13 deletions

diff --git a/src/tools/windows/dump_syms/dump_syms.cc b/src/tools/windows/dump_syms/dump_syms.cc
index dcbe39ae..8ea777a5 100644
--- a/src/tools/windows/dump_syms/dump_syms.cc
+++ b/src/tools/windows/dump_syms/dump_syms.cc
@@ -42,22 +42,12 @@ using google_breakpad::PDBSourceLineWriter;
 
 int wmain(int argc, wchar_t **argv) {
   if (argc < 2) {
-    fprintf(stderr,
-            "Usage: %ws [--enable_multiple_field] <file.[pdb|exe|dll]>\n",
-            argv[0]);
+    fprintf(stderr, "Usage: %ws <file.[pdb|exe|dll]>\n", argv[0]);
     return 1;
   }
 
-  // This is a temporary option to enable writing the optional 'm' field on FUNC
-  // and PUBLIC, denoting multiple symbols for the address. This option will be
-  // removed, with the behavior enabled by default, after all symbol file
-  // readers have had a chance to update.
-  bool enable_multiple_field =
-    (argc >= 3 && wcscmp(L"--enable_multiple_field", argv[1]) == 0);
-
-  PDBSourceLineWriter writer(enable_multiple_field);
-  if (!writer.Open(wstring(argv[enable_multiple_field ? 2 : 1]),
-                   PDBSourceLineWriter::ANY_FILE)) {
+  PDBSourceLineWriter writer;
+  if (!writer.Open(wstring(argv[1]), PDBSourceLineWriter::ANY_FILE)) {
     fprintf(stderr, "Open failed\n");
     return 1;
   }