This is the mail archive of the binutils-cvs@sourceware.org mailing list for the binutils project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[binutils-gdb] Fix strip so that is accepts -M as an abbreviation for --merge-notes.


https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=ea8fae9fe75706235ac49c507f1c5e039f4b4e1e

commit ea8fae9fe75706235ac49c507f1c5e039f4b4e1e
Author: Nick Clifton <nickc@redhat.com>
Date:   Thu Oct 5 13:48:32 2017 +0100

    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:
---
 binutils/ChangeLog | 6 ++++++
 binutils/objcopy.c | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 8af4719..4daa60e 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,5 +1,11 @@
 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
 	* readelf.c (dump_relocations): Do not truncate reloc names when
 	displaying output in wide mode.
diff --git a/binutils/objcopy.c b/binutils/objcopy.c
index 23a949d..e5df1a9 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)


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]