aboutsummaryrefslogtreecommitdiff
path: root/binutils
diff options
context:
space:
mode:
authorNick Clifton <nickc@redhat.com>2010-10-29 08:47:02 +0000
committerNick Clifton <nickc@redhat.com>2010-10-29 08:47:02 +0000
commite58bcb8f099ec42b3c905480629d1a49dd38b03f (patch)
tree9a2d7d0bdc54bfc07183836db568c4af1ce2b70b /binutils
parent2e7d562eb6929881e221ea01a0ff3481aa23960d (diff)
downloadfsf-binutils-gdb-e58bcb8f099ec42b3c905480629d1a49dd38b03f.zip
fsf-binutils-gdb-e58bcb8f099ec42b3c905480629d1a49dd38b03f.tar.gz
fsf-binutils-gdb-e58bcb8f099ec42b3c905480629d1a49dd38b03f.tar.bz2
PR binutils/12058
* ar.c (usage): Revert previous change. Describe how 's' can be used as a command letter. * doc/binutils.texi (ar cmdline): Describe how 's' can be used as a command letter.
Diffstat (limited to 'binutils')
-rw-r--r--binutils/ChangeLog8
-rw-r--r--binutils/ar.c5
-rw-r--r--binutils/doc/binutils.texi7
3 files changed, 18 insertions, 2 deletions
diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 7b6db60..13c5fff 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,11 @@
+2010-10-29 Nick Clifton <nickc@redhat.com>
+
+ PR binutils/12058
+ * ar.c (usage): Revert previous change. Describe how 's' can be
+ used as a command letter.
+ * doc/binutils.texi (ar cmdline): Describe how 's' can be used as
+ a command letter.
+
2010-10-29 Bernd Schmidt <bernds@codesourcery.com>
Joseph Myers <joseph@codesourcery.com>
diff --git a/binutils/ar.c b/binutils/ar.c
index c2e6f4c..5fe43bc 100644
--- a/binutils/ar.c
+++ b/binutils/ar.c
@@ -230,9 +230,9 @@ usage (int help)
/* xgettext:c-format */
const char * command_line =
#if BFD_SUPPORTS_PLUGINS
- _("Usage: %s [emulation options] [--plugin <name>] [-]{dmpqrtx}[abcfilNoPsSuvV] [member-name] [count] archive-file file...\n");
+ _("Usage: %s [emulation options] [--plugin <name>] [-]{dmpqrstx}[abcfilNoPsSuvV] [member-name] [count] archive-file file...\n");
#else
- _("Usage: %s [emulation options] [-]{dmpqrtx}[abcfilNoPsSuvV] [member-name] [count] archive-file file...\n");
+ _("Usage: %s [emulation options] [-]{dmpqrstx}[abcfilNoPsSuvV] [member-name] [count] archive-file file...\n");
#endif
fprintf (s, command_line, program_name);
@@ -244,6 +244,7 @@ usage (int help)
fprintf (s, _(" p - print file(s) found in the archive\n"));
fprintf (s, _(" q[f] - quick append file(s) to the archive\n"));
fprintf (s, _(" r[ab][f][u] - replace existing or insert new file(s) into the archive\n"));
+ fprintf (s, _(" s - act as ranlib\n"));
fprintf (s, _(" t - display contents of archive\n"));
fprintf (s, _(" x[o] - extract file(s) from the archive\n"));
fprintf (s, _(" command specific modifiers:\n"));
diff --git a/binutils/doc/binutils.texi b/binutils/doc/binutils.texi
index 82c3a67..26d6907 100644
--- a/binutils/doc/binutils.texi
+++ b/binutils/doc/binutils.texi
@@ -345,6 +345,13 @@ output for each file inserted, along with one of the letters @samp{a} or
@samp{r} to indicate whether the file was appended (no old member
deleted) or replaced.
+@item s
+@cindex ranlib
+Add an index to the archive, or update it if it already exists. Note
+this command is an exception to the rule that there can only be one
+command letter, as it is possible to use it as either a command or a
+modifier. In either case it does the same thing.
+
@item t
@cindex contents of archive
Display a @emph{table} listing the contents of @var{archive}, or those