| From: Martin Liska <mliska@suse.cz> |
| Date: Fri, 12 May 2017 15:46:35 -0700 |
| Subject: gcov: support GCC 7.1 |
| |
| commit 05384213436ab690c46d9dfec706b80ef8d671ab upstream. |
| |
| Starting from GCC 7.1, __gcov_exit is a new symbol expected to be |
| implemented in a profiling runtime. |
| |
| [akpm@linux-foundation.org: coding-style fixes] |
| [mliska@suse.cz: v2] |
| Link: http://lkml.kernel.org/r/e63a3c59-0149-c97e-4084-20ca8f146b26@suse.cz |
| Link: http://lkml.kernel.org/r/8c4084fa-3885-29fe-5fc4-0d4ca199c785@suse.cz |
| Signed-off-by: Martin Liska <mliska@suse.cz> |
| Acked-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 |
| @@ -97,6 +97,12 @@ void __gcov_merge_icall_topn(gcov_type * |
| } |
| EXPORT_SYMBOL(__gcov_merge_icall_topn); |
| |
| +void __gcov_exit(void) |
| +{ |
| + /* Unused. */ |
| +} |
| +EXPORT_SYMBOL(__gcov_exit); |
| + |
| /** |
| * 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__ > 5) || (__GNUC__ == 5 && __GNUC_MINOR__ >= 1) |
| +#if (__GNUC__ >= 7) |
| +#define GCOV_COUNTERS 9 |
| +#elif (__GNUC__ > 5) || (__GNUC__ == 5 && __GNUC_MINOR__ >= 1) |
| #define GCOV_COUNTERS 10 |
| #elif __GNUC__ == 4 && __GNUC_MINOR__ >= 9 |
| #define GCOV_COUNTERS 9 |
