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 8af4719be2652980b561ba2660cd7fc3fba22720..4daa60e37e1173d8277a33c5da74d32ab158da36 100644 (file)
--- 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 23a949d1ad695cf5fd5ff9bb31568770abb8ba2e..e5df1a919560b8f1d161e6e25073d74e1bc78b4e 100644 (file)
--- 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)