Make objdump's --wide command line option affect its output of DWARF debug information.

[binutils-gdb.git] / binutils / objdump.c

diff --git a/binutils/objdump.c b/binutils/objdump.c
index b9fecefca5ae8f80a1d21d0364be489e2f7736ef..46b4417b998e529029ce43a70f0681c56fadbcb5 100644 (file)
--- a/binutils/objdump.c
+++ b/binutils/objdump.c
@@ -3728,12 +3728,16 @@ main (int argc, char **argv)
          machine = optarg;
          break;
        case 'M':
-         if (disassembler_options)
-           /* Ignore potential memory leak for now.  */
-           disassembler_options = concat (disassembler_options, ",",
-                                          optarg, (const char *) NULL);
-         else
-           disassembler_options = optarg;
+         {
+           char *options;
+           if (disassembler_options)
+             /* Ignore potential memory leak for now.  */
+             options = concat (disassembler_options, ",",
+                               optarg, (const char *) NULL);
+           else
+             options = optarg;
+           disassembler_options = remove_whitespace_and_extra_commas (options);
+         }
          break;
        case 'j':
          add_only (optarg);
@@ -3762,7 +3766,7 @@ main (int argc, char **argv)
            }
          break;
        case 'w':
-         wide_output = TRUE;
+         do_wide = wide_output = TRUE;
          break;
        case OPTION_ADJUST_VMA:
          adjust_section_vma = parse_vma (optarg, "--adjust-vma");