diff options
| author | Nick Clifton <nickc@redhat.com> | 2003-07-18 11:34:41 +0000 |
|---|---|---|
| committer | Nick Clifton <nickc@redhat.com> | 2003-07-18 11:34:41 +0000 |
| commit | 31e0f3cd45f5e24eb497bcbb1eec8e22b387ed9c (patch) | |
| tree | 7f4a6c5fe2608e2f29d8599219254119482133e1 /binutils | |
| parent | 278a7cf7f0a800f2d1ed8bc3609c78a83cf2efb8 (diff) | |
| download | gdb-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')
| -rw-r--r-- | binutils/ChangeLog | 7 | ||||
| -rw-r--r-- | binutils/doc/binutils.texi | 12 | ||||
| -rw-r--r-- | binutils/objdump.c | 10 |
3 files changed, 14 insertions, 15 deletions
diff --git a/binutils/ChangeLog b/binutils/ChangeLog index d715ad0..11a79ce 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,10 @@ +2003-07-18 Nick Clifton <nickc@redhat.com> + + * 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. + 2003-07-17 Nick Clifton <nickc@redhat.com> * objdump.c (main): Issue a warning message if multiple -M diff --git a/binutils/doc/binutils.texi b/binutils/doc/binutils.texi index 85025db..256acf0 100644 --- a/binutils/doc/binutils.texi +++ b/binutils/doc/binutils.texi @@ -1625,15 +1625,9 @@ architectures with the @option{-i} option. @item -M @var{options} @itemx --disassembler-options=@var{options} Pass target specific information to the disassembler. Only supported on -some targets. Note only a single instance of the option on the -command line is supported. If the option occurs more than once, the -earlier versions will be ignored. If it is necessary to specify more -than one disassembler option then they should be placed together into -a space separated list. ie: - -@smallexample - -M"first-disassembler-option second-disassembler-option" -@end smallexample +some targets. If it is necessary to specify more than one +disassembler option then multiple @option{-M} options can be used or +can be placed together into a comma separated list. If the target is an ARM architecture then this switch can be used to select which register name set is used during disassembler. Specifying 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) |