PR25079, "ar s" stopped working

's' is both a command and a modifier.  If given as a command then we
aren't lacking an operation.  I think the same goes when mri mode is
selected: any following command line used to be ignored.

	PR 25079
	* ar.c (decode_options): Don't try for command options if
	write_armap or mri_mode is selected.

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index b9e2fcf1a46b0245a709cb56f464812705cda2df..1761d80ef5f0f6487b82c97c8b7df3bf13d2ddee 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,9 @@
+2019-10-09  Alan Modra  <amodra@gmail.com>
+
+       PR 25079
+       * ar.c (decode_options): Don't try for command options if
+       write_armap or mri_mode is selected.
+
 2019-10-07  Jozef Lawrynowicz  <jozef.l@mittosystems.com>
 
        * readelf.c (display_msp430_gnu_attribute): New.

diff --git a/binutils/ar.c b/binutils/ar.c
index 6bac862bc73dacba6c321aac9dbeb54ba2efbe72..b99afff1c7e180d1bd63f07d5326c90691b0f48c 100644 (file)
--- a/binutils/ar.c
+++ b/binutils/ar.c
@@ -602,7 +602,8 @@ decode_options (int argc, char **argv)
   /* PR 13256: Allow for the possibility that the first command line option
      started with a dash (eg --plugin) but then the following option(s) are
      old style, non-dash-prefixed versions.  */
-  if (operation == none && optind > 0 && optind < argc)
+  if (operation == none && write_armap != 1 && !mri_mode
+      && optind > 0 && optind < argc)
     {
       argv += (optind - 1);
       argc -= (optind - 1);