From 073fbac62c4e7eb6b2c259fd5a6c5059b7cb9813 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Thu, 17 Jul 2003 17:02:46 +0000 Subject: [PATCH] * objdump.c (main): Issue a warning message if multiple -M switches are used. * doc/binutils.texi (objdump): Update documentation about -M option. --- binutils/ChangeLog | 8 ++++++++ binutils/doc/binutils.texi | 10 +++++++++- binutils/objdump.c | 6 ++++++ 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 2918f4b8fcc..d715ad0c44c 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,11 @@ +2003-07-17 Nick Clifton + + * objdump.c (main): Issue a warning message if multiple -M + switches are used. + + * doc/binutils.texi (objdump): Update documentation about -M + option. + 2003-07-17 Nick Clifton * po/es.po: New Spanish translation. diff --git a/binutils/doc/binutils.texi b/binutils/doc/binutils.texi index 899ab5367d3..85025db946c 100644 --- a/binutils/doc/binutils.texi +++ b/binutils/doc/binutils.texi @@ -1625,7 +1625,15 @@ 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. +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 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 dd8a5362410..4fc84ffa5bb 100644 --- a/binutils/objdump.c +++ b/binutils/objdump.c @@ -2660,6 +2660,12 @@ main (argc, argv) machine = optarg; 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; break; case 'j': -- 2.30.2