* 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.

1 files changed, 3 insertions, 9 deletions

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