From: Nick Clifton <nickc@redhat.com>
Date: Thu, 5 Oct 2017 12:48:32 +0000 (+0100)
Subject: Fix strip so that is accepts -M as an abbreviation for --merge-notes.
X-Git-Tag: users/gbenson/thread_db-test/2017-11-22~635
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ea8fae9fe75706235ac49c507f1c5e039f4b4e1e;p=thirdparty%2Fbinutils-gdb.git

Fix strip so that is accepts -M as an abbreviation for --merge-notes.

	PR 22260
	* objcopy.c (strip_main): Add 'M' character to short options list
	when calling getopt_long.
---

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 8af4719be26..4daa60e37e1 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,9 @@
+2017-10-05  Nick Clifton  <nickc@redhat.com>
+
+	PR 22260
+	* objcopy.c (strip_main): Add 'M' character to short options list
+	when calling getopt_long.
+
 2017-10-05  Nick Clifton  <nickc@redhat.com>
 
 	PR 22262
diff --git a/binutils/objcopy.c b/binutils/objcopy.c
index 23a949d1ad6..e5df1a91956 100644
--- a/binutils/objcopy.c
+++ b/binutils/objcopy.c
@@ -4131,7 +4131,7 @@ strip_main (int argc, char *argv[])
 
   merge_notes = TRUE;
 
-  while ((c = getopt_long (argc, argv, "I:O:F:K:N:R:o:sSpdgxXHhVvwDU",
+  while ((c = getopt_long (argc, argv, "I:O:F:K:MN:R:o:sSpdgxXHhVvwDU",
 			   strip_options, (int *) 0)) != EOF)
     {
       switch (c)