Handle multiple target events before commit resume

[deliverable/binutils-gdb.git] / gprof / gprof.c

diff --git a/gprof/gprof.c b/gprof/gprof.c
index 6415c30d6a1f2ddfcefb76a815db445c422884a3..da1411b30a6e20d964cedd287ce77020a854af88 100644 (file)
--- a/gprof/gprof.c
+++ b/gprof/gprof.c
@@ -160,7 +160,7 @@ static void
 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\
@@ -259,14 +259,20 @@ main (int argc, char **argv)
          break;
        case 'E':
          sym_id_add (optarg, EXCL_TIME);
+         /* Fall through.  */
        case 'e':
          sym_id_add (optarg, EXCL_GRAPH);
          break;
        case 'F':
          sym_id_add (optarg, INCL_TIME);
+         /* Fall through.  */
        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;
@@ -450,7 +456,7 @@ This program is free software.  This program has absolutely no warranty.\n"));
            {
              output_style &= ~STYLE_EXEC_COUNTS;
            }
-         user_specified |= STYLE_ANNOTATED_SOURCE;
+         user_specified |= STYLE_EXEC_COUNTS;
          break;
        case OPTION_DEMANGLE:
          demangle = TRUE;
@@ -612,7 +618,7 @@ This program is free software.  This program has absolutely no warranty.\n"));
   if (output_style & STYLE_FLAT_PROFILE)
     {
       /* Print the flat profile.  */
-      hist_print ();           
+      hist_print ();
     }
 
   if (cg && (output_style & STYLE_CALL_GRAPH))
@@ -620,20 +626,20 @@ This program is free software.  This program has absolutely no warranty.\n"));
       if (!bsd_style_output)
        {
          /* Print the dynamic profile.  */
-         cg_print (cg);        
+         cg_print (cg);
        }
       cg_print_index ();
     }
 
   if (output_style & STYLE_EXEC_COUNTS)
     print_exec_counts ();
-  
+
   if (output_style & STYLE_ANNOTATED_SOURCE)
     print_annotated_source ();
-  
+
   if (output_style & STYLE_FUNCTION_ORDER)
     cg_print_function_ordering ();
-  
+
   if (output_style & STYLE_FILE_ORDER)
     cg_print_file_ordering ();