| From: Florian Meier <Florian.Meier@informatik.uni-erlangen.de> |
| Date: Thu, 14 Jul 2016 12:07:26 -0700 |
| Subject: 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> |
| Cc: Arnd Bergmann <arnd@arndb.de> |
| Signed-off-by: Ben Hutchings <ben@decadent.org.uk> |
| --- |
| kernel/gcov/gcc_4_7.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- 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 |
