FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

PR25079, "ar s" stopped working

Browse source 
'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.
This commit is contained in:
Alan Modra 2019-10-09 00:11:28 +10:30
parent 063c511bd7
commit b7d9d3ee59
2 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
binutils/ChangeLog
View file

@ -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> 2019-10-07 Jozef Lawrynowicz <jozef.l@mittosystems.com>
* readelf.c (display_msp430_gnu_attribute): New. * readelf.c (display_msp430_gnu_attribute): New.

3
binutils/ar.c
View file

@ -602,7 +602,8 @@ decode_options (int argc, char **argv)
/* PR 13256: Allow for the possibility that the first command line option /* 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 started with a dash (eg --plugin) but then the following option(s) are
old style, non-dash-prefixed versions. */ 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); argv += (optind - 1);
argc -= (optind - 1); argc -= (optind - 1);