Skip to content

Commit d255fff

Browse files
marxingregkh
authored andcommitted
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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 2f3e97a commit d255fff

2 files changed

Lines changed: 9 additions & 1 deletion

File tree

kernel/gcov/base.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,12 @@ void __gcov_merge_icall_topn(gcov_type *counters, unsigned int n_counters)
9898
}
9999
EXPORT_SYMBOL(__gcov_merge_icall_topn);
100100

101+
void __gcov_exit(void)
102+
{
103+
/* Unused. */
104+
}
105+
EXPORT_SYMBOL(__gcov_exit);
106+
101107
/**
102108
* gcov_enable_events - enable event reporting through gcov_event()
103109
*

kernel/gcov/gcc_4_7.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@
1818
#include <linux/vmalloc.h>
1919
#include "gcov.h"
2020

21-
#if (__GNUC__ > 5) || (__GNUC__ == 5 && __GNUC_MINOR__ >= 1)
21+
#if (__GNUC__ >= 7)
22+
#define GCOV_COUNTERS 9
23+
#elif (__GNUC__ > 5) || (__GNUC__ == 5 && __GNUC_MINOR__ >= 1)
2224
#define GCOV_COUNTERS 10
2325
#elif __GNUC__ == 4 && __GNUC_MINOR__ >= 9
2426
#define GCOV_COUNTERS 9

0 commit comments

Comments
 (0)