Commit 3e44c471 authored Jun 30, 2015 by Lorenzo Stoakes Committed by Linus Torvalds Jun 30, 2015

gcov: add support for GCC 5.1



Fix kernel gcov support for GCC 5.1.  Similar to commit a992bf83
("gcov: add support for GCC 4.9"), this patch takes into account the
existence of a new gcov counter (see gcc's gcc/gcov-counter.def.)

Firstly, it increments GCOV_COUNTERS (to 10), which makes the data
structure struct gcov_info compatible with GCC 5.1.

Secondly, a corresponding counter function __gcov_merge_icall_topn (Top N
value tracking for indirect calls) is included in base.c with the other
gcov counters unused for kernel profiling.

Signed-off-by: Lorenzo Stoakes <lstoakes@gmail.com>
Cc: Andrey Ryabinin <a.ryabinin@samsung.com>
Cc: Yuan Pengfei <coolypf@qq.com>
Tested-by: Peter Oberparleiter <oberpar@linux.vnet.ibm.com>
Reviewed-by: Peter Oberparleiter <oberpar@linux.vnet.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 5375b708

kernel/gcov/base.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -92,6 +92,12 @@ void __gcov_merge_time_profile(gcov_type *counters, unsigned int n_counters)
		}
		EXPORT_SYMBOL(__gcov_merge_time_profile);

		void __gcov_merge_icall_topn(gcov_type *counters, unsigned int n_counters)
		{
		/* Unused. */
		}
		EXPORT_SYMBOL(__gcov_merge_icall_topn);

		/**
		* gcov_enable_events - enable event reporting through gcov_event()
		*

kernel/gcov/gcc_4_7.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -18,7 +18,9 @@
		#include <linux/vmalloc.h>
		#include "gcov.h"

		#if __GNUC__ == 4 && __GNUC_MINOR__ >= 9
		#if __GNUC__ == 5 && __GNUC_MINOR__ >= 1
		#define GCOV_COUNTERS 10
		#elif __GNUC__ == 4 && __GNUC_MINOR__ >= 9
		#define GCOV_COUNTERS 9
		#else
		#define GCOV_COUNTERS 8

Admin message