summaryrefslogtreecommitdiff
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:06:50 +0200
commit2f3e97a814c8f906d3334c85271aacb7a8783490 (patch)
tree65cb162ad5fedea9dd9331e76214f94ead535b28 /kernel
parent41685ae5cd7bc51f8d796135611e7862f772ed19 (diff)
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