Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752617AbdHaPtc (ORCPT ); Thu, 31 Aug 2017 11:49:32 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:36752 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752235AbdHaPph (ORCPT ); Thu, 31 Aug 2017 11:45:37 -0400 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Florian Meier , Peter Oberparleiter , Andrew Morton , Linus Torvalds Subject: [PATCH 4.4 05/16] gcov: add support for gcc version >= 6 Date: Thu, 31 Aug 2017 17:43:58 +0200 Message-Id: <20170831154215.323929659@linuxfoundation.org> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170831154215.114706015@linuxfoundation.org> References: <20170831154215.114706015@linuxfoundation.org> User-Agent: quilt/0.65 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1070 Lines: 32 4.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Florian Meier commit d02038f972538b93011d78c068f44514fbde0a8c upstream. Link: http://lkml.kernel.org/r/20160701130914.GA23225@styxhp Signed-off-by: Florian Meier Reviewed-by: Peter Oberparleiter Tested-by: Peter Oberparleiter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman --- 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 #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