Commit 40249c69 authored by Peter Oberparleiter's avatar Peter Oberparleiter Committed by Linus Torvalds

gcov: add support for GCC 10.1

Using gcov to collect coverage data for kernels compiled with GCC 10.1
causes random malfunctions and kernel crashes.  This is the result of a
changed GCOV_COUNTERS value in GCC 10.1 that causes a mismatch between
the layout of the gcov_info structure created by GCC profiling code and
the related structure used by the kernel.

Fix this by updating the in-kernel GCOV_COUNTERS value.  Also re-enable
config GCOV_KERNEL for use with GCC 10.
Reported-by: default avatarColin Ian King <colin.king@canonical.com>
Reported-by: default avatarLeon Romanovsky <leonro@nvidia.com>
Signed-off-by: default avatarPeter Oberparleiter <oberpar@linux.ibm.com>
Tested-by: default avatarLeon Romanovsky <leonro@nvidia.com>
Tested-and-Acked-by: default avatarColin Ian King <colin.king@canonical.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 581cb3a2
...@@ -4,7 +4,6 @@ menu "GCOV-based kernel profiling" ...@@ -4,7 +4,6 @@ menu "GCOV-based kernel profiling"
config GCOV_KERNEL config GCOV_KERNEL
bool "Enable gcov-based kernel profiling" bool "Enable gcov-based kernel profiling"
depends on DEBUG_FS depends on DEBUG_FS
depends on !CC_IS_GCC || GCC_VERSION < 100000
select CONSTRUCTORS if !UML select CONSTRUCTORS if !UML
default n default n
help help
......
...@@ -19,7 +19,9 @@ ...@@ -19,7 +19,9 @@
#include <linux/vmalloc.h> #include <linux/vmalloc.h>
#include "gcov.h" #include "gcov.h"
#if (__GNUC__ >= 7) #if (__GNUC__ >= 10)
#define GCOV_COUNTERS 8
#elif (__GNUC__ >= 7)
#define GCOV_COUNTERS 9 #define GCOV_COUNTERS 9
#elif (__GNUC__ > 5) || (__GNUC__ == 5 && __GNUC_MINOR__ >= 1) #elif (__GNUC__ > 5) || (__GNUC__ == 5 && __GNUC_MINOR__ >= 1)
#define GCOV_COUNTERS 10 #define GCOV_COUNTERS 10
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment