Correct the alpha sorting of the short options in the usage description of the gprof program.
PR 24569
* gprof.c (usage): Restore alphabetical sorting to short options
list. Add -r, -R and -t short options to the list.
(main): Add comment about -g and -G possibly being deprecated.
* gprof.texi: Update usage example in line with changes above.
diff --git a/gprof/ChangeLog b/gprof/ChangeLog
index 614ef45..1acb81a 100644
--- a/gprof/ChangeLog
+++ b/gprof/ChangeLog
@@ -1,5 +1,13 @@
2019-05-20 Nick Clifton <nickc@redhat.com>
+ PR 24569
+ * gprof.c (usage): Restore alphabetical sorting to short options
+ list. Add -r, -R and -t short options to the list.
+ (main): Add comment about -g and -G possibly being deprecated.
+ * gprof.texi: Update usage example in line with changes above.
+
+2019-05-20 Nick Clifton <nickc@redhat.com>
+
* po/de.po: Updated German translation.
2019-05-08 Alan Modra <amodra@gmail.com>
diff --git a/gprof/gprof.c b/gprof/gprof.c
index db425a6..da1411b 100644
--- a/gprof/gprof.c
+++ b/gprof/gprof.c
@@ -160,7 +160,7 @@
usage (FILE *stream, int status)
{
fprintf (stream, _("\
-Usage: %s [-[abcDhilLsTvwxyz]] [-[ACeEfFJnNOpPqSQZ][name]] [-I dirs]\n\
+Usage: %s [-[abcDhilLrsTvwxyz]] [-[ACeEfFJnNOpPqQRStZ][name]] [-I dirs]\n\
[-d[num]] [-k from/to] [-m min-count] [-t table-length]\n\
[--[no-]annotated-source[=name]] [--[no-]exec-counts[=name]]\n\
[--[no-]flat-profile[=name]] [--[no-]graph[=name]]\n\
@@ -269,6 +269,10 @@
case 'f':
sym_id_add (optarg, INCL_GRAPH);
break;
+ /* FIXME: The -g and -G options are not present in the getopt_long
+ invocation above, and they are not documented in gprof.texi.
+ Therefore they appear to be deprecated. Test this theory and
+ delete them if true. */
case 'g':
sym_id_add (optarg, EXCL_FLAT);
break;
diff --git a/gprof/gprof.texi b/gprof/gprof.texi
index 5d9f659..790cd6b 100644
--- a/gprof/gprof.texi
+++ b/gprof/gprof.texi
@@ -110,7 +110,7 @@
@smallexample
@c man begin SYNOPSIS
-gprof [ -[abcDhilLrsTvwxyz] ] [ -[ACeEfFJnNOpPqQZ][@var{name}] ]
+gprof [ -[abcDhilLrsTvwxyz] ] [ -[ACeEfFJnNOpPqQRStZ][@var{name}] ]
[ -I @var{dirs} ] [ -d[@var{num}] ] [ -k @var{from/to} ]
[ -m @var{min-count} ] [ -R @var{map_file} ] [ -t @var{table-length} ]
[ --[no-]annotated-source[=@var{name}] ]
