From patchwork Fri Mar 9 02:04:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stewart Smith X-Patchwork-Id: 883429 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zy9gB3Q21z9sfb for ; Fri, 9 Mar 2018 13:04:38 +1100 (AEDT) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=linux.vnet.ibm.com Received: from bilbo.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3zy9g95ckKzF1s3 for ; Fri, 9 Mar 2018 13:04:37 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=linux.vnet.ibm.com X-Original-To: skiboot@lists.ozlabs.org Delivered-To: skiboot@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=none (mailfrom) smtp.mailfrom=linux.vnet.ibm.com (client-ip=148.163.158.5; helo=mx0a-001b2d01.pphosted.com; envelope-from=stewart@linux.vnet.ibm.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=linux.vnet.ibm.com Received: from mx0a-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3zy9g33tLlzF1qf for ; Fri, 9 Mar 2018 13:04:30 +1100 (AEDT) Received: from pps.filterd (m0098421.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w2924RE0023702 for ; Thu, 8 Mar 2018 21:04:28 -0500 Received: from e35.co.us.ibm.com (e35.co.us.ibm.com [32.97.110.153]) by mx0a-001b2d01.pphosted.com with ESMTP id 2gkffbub18-1 (version=TLSv1.2 cipher=AES256-SHA256 bits=256 verify=NOT) for ; Thu, 08 Mar 2018 21:04:28 -0500 Received: from localhost by e35.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 8 Mar 2018 19:04:27 -0700 Received: from b03cxnp08027.gho.boulder.ibm.com (9.17.130.19) by e35.co.us.ibm.com (192.168.1.135) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Thu, 8 Mar 2018 19:04:24 -0700 Received: from b03ledav001.gho.boulder.ibm.com (b03ledav001.gho.boulder.ibm.com [9.17.130.232]) by b03cxnp08027.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id w2924N6C12452308; Thu, 8 Mar 2018 19:04:23 -0700 Received: from b03ledav001.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id A496B6E038; Thu, 8 Mar 2018 19:04:23 -0700 (MST) Received: from birb.localdomain (unknown [9.102.54.67]) by b03ledav001.gho.boulder.ibm.com (Postfix) with SMTP id 0A45B6E03A; Thu, 8 Mar 2018 19:04:22 -0700 (MST) Received: by birb.localdomain (Postfix, from userid 1000) id 9CC014EC63E; Fri, 9 Mar 2018 13:04:18 +1100 (AEDT) From: Stewart Smith To: skiboot@lists.ozlabs.org Date: Fri, 9 Mar 2018 13:04:17 +1100 X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180309020417.1335-1-stewart@linux.vnet.ibm.com> References: <20180309020417.1335-1-stewart@linux.vnet.ibm.com> X-TM-AS-GCONF: 00 x-cbid: 18030902-0012-0000-0000-000015DE5EC9 X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00008638; HX=3.00000241; KW=3.00000007; PH=3.00000004; SC=3.00000254; SDB=6.01000303; UDB=6.00508794; IPR=6.00779633; MB=3.00019924; MTD=3.00000008; XFM=3.00000015; UTC=2018-03-09 02:04:25 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18030902-0013-0000-0000-000051CC5490 Message-Id: <20180309020417.1335-2-stewart@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2018-03-08_14:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=1 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 impostorscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1709140000 definitions=main-1803090024 Subject: [Skiboot] [PATCH 2/2] gcov: Another GCC, another gcov tweak X-BeenThere: skiboot@lists.ozlabs.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: Mailing list for skiboot development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: skiboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Skiboot" Signed-off-by: Stewart Smith --- extract-gcov.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/extract-gcov.c b/extract-gcov.c index 3d31d1b5a1f9..e5bcf165342f 100644 --- a/extract-gcov.c +++ b/extract-gcov.c @@ -33,6 +33,9 @@ typedef u32 gcov_unsigned_int; /* You will need to pass -DTARGET__GNUC__=blah when building */ +#if (__GNUC__ >= 7) +#define GCOV_COUNTERS 9 +#else #if TARGET__GNUC__ >= 6 || (TARGET__GNUC__ >= 5 && TARGET__GNUC_MINOR__ >= 1) #define GCOV_COUNTERS 10 #else @@ -42,6 +45,7 @@ typedef u32 gcov_unsigned_int; #define GCOV_COUNTERS 8 #endif /* GCC 4.9 */ #endif /* GCC 5.1 */ +#endif /* GCC 7 */ typedef u64 gcov_type; struct gcov_info