Backport:

	2006-05-02  James E Wilson  <wilson@specifix.com>
	* gprof.c (main): When setting default output_style, add separate
	checks for INPUT_HISTOGRAM and INPUT_CALL_GRAPH.

diff --git a/ChangeLog.csl b/ChangeLog.csl
index fa77f3656ce5a28bd6d8cf567cb03cce96a8b52c..cfd9add6ba553c730bf10c475fd664931d7d3f65 100644 (file)
--- a/ChangeLog.csl
+++ b/ChangeLog.csl
@@ -1,3 +1,10 @@
+2006-11-29  Daniel Jacobowitz  <dan@codesourcery.com>
+
+       Backport:
+       2006-05-02  James E Wilson  <wilson@specifix.com>
+       * gprof.c (main): When setting default output_style, add separate
+       checks for INPUT_HISTOGRAM and INPUT_CALL_GRAPH.
+
 2006-11-29  Mark Shinwell  <shinwell@codesourcery.com>
 
        Backport from mainline:

diff --git a/gprof/gprof.c b/gprof/gprof.c
index 90be2fe9591808f0dcde747efa07d6582401c539..953e0507517f6779e2abe97098c39536a06112b0 100644 (file)
--- a/gprof/gprof.c
+++ b/gprof/gprof.c
@@ -545,7 +545,12 @@ This program is free software.  This program has absolutely no warranty.\n"));
   if (output_style == 0)
     {
       if (gmon_input & (INPUT_HISTOGRAM | INPUT_CALL_GRAPH))
-       output_style = STYLE_FLAT_PROFILE | STYLE_CALL_GRAPH;
+       {
+         if (gmon_input & INPUT_HISTOGRAM)
+           output_style |= STYLE_FLAT_PROFILE;
+         if (gmon_input & INPUT_CALL_GRAPH)
+           output_style |= STYLE_CALL_GRAPH;
+       }
       else
        output_style = STYLE_EXEC_COUNTS;