aboutsummaryrefslogtreecommitdiff
path: root/binutils/objdump.c
diff options
context:
space:
mode:
authorNick Clifton <nickc@redhat.com>2003-07-18 11:34:41 +0000
committerNick Clifton <nickc@redhat.com>2003-07-18 11:34:41 +0000
commit31e0f3cd45f5e24eb497bcbb1eec8e22b387ed9c (patch)
tree7f4a6c5fe2608e2f29d8599219254119482133e1 /binutils/objdump.c
parent278a7cf7f0a800f2d1ed8bc3609c78a83cf2efb8 (diff)
downloadgdb-31e0f3cd45f5e24eb497bcbb1eec8e22b387ed9c.zip
gdb-31e0f3cd45f5e24eb497bcbb1eec8e22b387ed9c.tar.gz
gdb-31e0f3cd45f5e24eb497bcbb1eec8e22b387ed9c.tar.bz2
* objdump.c (main) :Accept multiple -M switch.
* doc/binutils.texi: Document that multiple -M switches are accepted and that a single -M switch can contain comma separated options. * arm-dis.c (parse_arm_disassembler_option): Do not expect option string to be NUL terminated. (parse_disassembler_options): Allow options to be space or comma separated.
Diffstat (limited to 'binutils/objdump.c')
-rw-r--r--binutils/objdump.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/binutils/objdump.c b/binutils/objdump.c
index 4fc84ff..47da66f 100644
--- a/binutils/objdump.c
+++ b/binutils/objdump.c
@@ -2661,12 +2661,10 @@ main (argc, argv)
break;
case 'M':
if (disassembler_options)
- {
- non_fatal ("multiple separate -M options are not supported.");
- non_fatal ("please combine them into a single, space separated option.");
- non_fatal ("ignoring option '-M%s'", disassembler_options);
- }
- disassembler_options = optarg;
+ /* Ignore potential memory leak for now. */
+ disassembler_options = concat (disassembler_options, ",", optarg, NULL);
+ else
+ disassembler_options = optarg;
break;
case 'j':
if (only == NULL)