diff options
| author | Daniel Jacobowitz <dan@debian.org> | 2006-11-29 16:31:58 +0000 |
|---|---|---|
| committer | Daniel Jacobowitz <dan@debian.org> | 2006-11-29 16:31:58 +0000 |
| commit | 367058e7ecb396f28d00bb3674c61cb980b03dc0 (patch) | |
| tree | dae1973738b1c3c16048e56423b717abf06d083d | |
| parent | 6eb5c4ba454f8982ca2f47ed14888f910a9de8d8 (diff) | |
| download | binutils-redhat-367058e7ecb396f28d00bb3674c61cb980b03dc0.tar.gz | |
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.
| -rw-r--r-- | ChangeLog.csl | 7 | ||||
| -rw-r--r-- | gprof/gprof.c | 7 |
2 files changed, 13 insertions, 1 deletions
diff --git a/ChangeLog.csl b/ChangeLog.csl index fa77f3656c..cfd9add6ba 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 90be2fe959..953e050751 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; |