summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorFlorian Meier <Florian.Meier@informatik.uni-erlangen.de>2016-07-14 12:07:26 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-09-02 07:05:45 +0200
commit42b7c430f81431c60b1c88a8ed848d7f14cea8bc (patch)
tree0b5d1c87652f96fda75545aa932cb8b2128a793b /kernel
parent6b1e352de7098a157684aeef341fbafbd45d3372 (diff)
downloadlinux-stable-42b7c430f81431c60b1c88a8ed848d7f14cea8bc.tar.gz
linux-stable-42b7c430f81431c60b1c88a8ed848d7f14cea8bc.tar.bz2
linux-stable-42b7c430f81431c60b1c88a8ed848d7f14cea8bc.zip
gcov: add support for gcc version >= 6
commit d02038f972538b93011d78c068f44514fbde0a8c upstream. Link: http://lkml.kernel.org/r/20160701130914.GA23225@styxhp Signed-off-by: Florian Meier <Florian.Meier@informatik.uni-erlangen.de> Reviewed-by: Peter Oberparleiter <oberpar@linux.vnet.ibm.com> Tested-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>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/gcov/gcc_4_7.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/gcov/gcc_4_7.c b/kernel/gcov/gcc_4_7.c
index e25e92fb44fa..6a5c239c7669 100644
--- a/kernel/gcov/gcc_4_7.c
+++ b/kernel/gcov/gcc_4_7.c
@@ -18,7 +18,7 @@
#include <linux/vmalloc.h>
#include "gcov.h"
-#if __GNUC__ == 5 && __GNUC_MINOR__ >= 1
+#if (__GNUC__ > 5) || (__GNUC__ == 5 && __GNUC_MINOR__ >= 1)
#define GCOV_COUNTERS 10
#elif __GNUC__ == 4 && __GNUC_MINOR__ >= 9
#define GCOV_COUNTERS 9