| From: Lorenzo Stoakes <lstoakes@gmail.com> |
| Date: Tue, 30 Jun 2015 14:57:49 -0700 |
| Subject: gcov: add support for GCC 5.1 |
| |
| commit 3e44c471a2dab210f7e9b1e5f7d4d54d52df59eb upstream. |
| |
| Fix kernel gcov support for GCC 5.1. Similar to commit a992bf836f9 |
| ("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> |
| Cc: Arnd Bergmann <arnd@arndb.de> |
| Signed-off-by: Ben Hutchings <ben@decadent.org.uk> |
| --- |
| kernel/gcov/base.c | 6 ++++++ |
| kernel/gcov/gcc_4_7.c | 4 +++- |
| 2 files changed, 9 insertions(+), 1 deletion(-) |
| |
| --- a/kernel/gcov/base.c |
| +++ b/kernel/gcov/base.c |
| @@ -91,6 +91,12 @@ void __gcov_merge_time_profile(gcov_type |
| } |
| 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() |
| * |
| --- a/kernel/gcov/gcc_4_7.c |
| +++ b/kernel/gcov/gcc_4_7.c |
| @@ -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 |