summaryrefslogtreecommitdiff
path: root/binutils
diff options
context:
space:
mode:
authorNick Clifton <nickc@redhat.com>2017-10-05 13:48:32 +0100
committerNick Clifton <nickc@redhat.com>2017-10-05 13:48:32 +0100
commitea8fae9fe75706235ac49c507f1c5e039f4b4e1e (patch)
tree7f2c6cba2d7e15e1fb371e2e2ca558d3f7bf6e22 /binutils
parent5c144731ed7b9ad39c947f8411b1dde4fbdda2e6 (diff)
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.
Diffstat (limited to 'binutils')
-rw-r--r--binutils/ChangeLog6
-rw-r--r--binutils/objcopy.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 8af4719be2..4daa60e37e 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 23a949d1ad..e5df1a9195 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)