aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--binutils/ChangeLog6
-rw-r--r--binutils/ar.c9
2 files changed, 12 insertions, 3 deletions
diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 19de4a0..f1400dc 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,9 @@
+2017-07-17 Nick Clifton <nickc@redhat.com>
+
+ PR 21433
+ * ar.c (main): Skip check for no files on the command line when
+ running in MRI mode.
+
2017-07-13 H.J. Lu <hongjiu.lu@intel.com>
* testsuite/binutils-all/objdump.exp: Always delete $testarchive
diff --git a/binutils/ar.c b/binutils/ar.c
index ef8b5bd..25f3b3d 100644
--- a/binutils/ar.c
+++ b/binutils/ar.c
@@ -738,9 +738,6 @@ main (int argc, char **argv)
arg_index = 0;
- if (argv[arg_index] == NULL)
- usage (0);
-
if (mri_mode)
{
default_deterministic ();
@@ -750,6 +747,12 @@ main (int argc, char **argv)
{
bfd *arch;
+ /* Fail if no files are specified on the command line.
+ (But not for MRI mode which allows for reading arguments
+ and filenames from stdin). */
+ if (argv[arg_index] == NULL)
+ usage (0);
+
/* We don't use do_quick_append any more. Too many systems
expect ar to always rebuild the symbol table even when q is
used. */