From: Nick Clifton <nickc@redhat.com>
Date: Thu, 17 Jul 2003 17:02:46 +0000 (+0000)
Subject: 	* objdump.c (main): Issue a warning message if multiple -M
X-Git-Tag: ezannoni_pie-20030916-branchpoint~732
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=073fbac62c4e7eb6b2c259fd5a6c5059b7cb9813;p=external%2Fbinutils.git

	* objdump.c (main): Issue a warning message if multiple -M
	switches are used.

	* doc/binutils.texi (objdump): Update documentation about -M
	option.
---

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 2918f4b..d715ad0 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,5 +1,13 @@
 2003-07-17  Nick Clifton  <nickc@redhat.com>
 
+	* 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  <nickc@redhat.com>
+
 	* po/es.po: New Spanish translation.
 
 2003-07-11  Alan Modra  <amodra@bigpond.net.au>
diff --git a/binutils/doc/binutils.texi b/binutils/doc/binutils.texi
index 899ab53..85025db 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 dd8a536..4fc84ff 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':