From: Daniel Jacobowitz <drow@false.org>
Date: Wed, 29 Nov 2006 16:31:58 +0000 (+0000)
Subject: 	Backport:
X-Git-Tag: binutils-csl-sourcerygxx-4_1-29~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=89c42db30540dd14a13e4d751796c729769c1a92;p=thirdparty%2Fbinutils-gdb.git

	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 fa77f3656ce..cfd9add6ba5 100644
--- 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 90be2fe9591..953e0507517 100644
--- 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;