On 14.05.2014 06:27, Yuan Pengfei wrote:
> From: Yuan Pengfei <cool...@qq.com>
>
> This patch handles the gcov-related changes in GCC 4.9:
> A new counter (time profile) is added. The total number is 9 now.
> A new profile merge function __gcov_merge_time_profile is added.
> See gcc/gcov-io.h and libgcc/libgcov-merge.c
> For the first change, the layout of struct gcov_info is affected.
> For the second one, a dummy function is added to kernel/gcov/base.c similarly.
> Signed-off-by: Yuan Pengfei <cool...@qq.com>
Looks good. Tested successfully on s390x with both GCC 4.9 and GCC 4.3.4.
Acked-by: Peter Oberparleiter <ober...@linux.vnet.ibm.com>
> ---
> kernel/gcov/base.c | 6 ++++++
> kernel/gcov/gcc_4_7.c | 5 +++++
> 2 files changed, 11 insertions(+)
>
> diff --git a/kernel/gcov/base.c b/kernel/gcov/base.c
> index f45b75b..b358a80 100644
> --- a/kernel/gcov/base.c
> +++ b/kernel/gcov/base.c
> @@ -85,6 +85,12 @@ void __gcov_merge_ior(gcov_type *counters, unsigned int
> n_counters)
> }
> EXPORT_SYMBOL(__gcov_merge_ior);
>
> +void __gcov_merge_time_profile(gcov_type *counters, unsigned int n_counters)
> +{
> + /* Unused. */
> +}
> +EXPORT_SYMBOL(__gcov_merge_time_profile);
> +
> /**
> * gcov_enable_events - enable event reporting through gcov_event()
> *
> diff --git a/kernel/gcov/gcc_4_7.c b/kernel/gcov/gcc_4_7.c
> index 7465944..7f74b59 100644
> --- a/kernel/gcov/gcc_4_7.c
> +++ b/kernel/gcov/gcc_4_7.c
> @@ -18,7 +18,12 @@
> #include <linux/vmalloc.h>
> #include "gcov.h"
>
> +#if __GNUC__ == 4 && __GNUC_MINOR__ >= 9
> +#define GCOV_COUNTERS 9
> +#else
> #define GCOV_COUNTERS 8
> +#endif
> +
> #define GCOV_TAG_FUNCTION_LENGTH 3
>
> static struct gcov_info *gcov_info_head;
>
--
Peter Oberparleiter
Linux on System z Development - IBM Germany
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
