From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dedi548.your-server.de (dedi548.your-server.de [85.10.215.148]) by sourceware.org (Postfix) with ESMTPS id 4E88239A0044 for ; Fri, 6 Aug 2021 08:05:05 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 4E88239A0044 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=embedded-brains.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=embedded-brains.de Received: from sslproxy01.your-server.de ([78.46.139.224]) by dedi548.your-server.de with esmtpsa (TLSv1.3:TLS_AES_256_GCM_SHA384:256) (Exim 4.92.3) (envelope-from ) id 1mBuql-000Gw1-8L; Fri, 06 Aug 2021 10:05:03 +0200 Received: from [82.100.198.138] (helo=mail.embedded-brains.de) by sslproxy01.your-server.de with esmtpsa (TLSv1.3:TLS_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mBuql-000P0o-4X; Fri, 06 Aug 2021 10:05:03 +0200 Received: from localhost (localhost.localhost [127.0.0.1]) by mail.embedded-brains.de (Postfix) with ESMTP id C4F9A2A1610; Fri, 6 Aug 2021 10:05:02 +0200 (CEST) Received: from mail.embedded-brains.de ([127.0.0.1]) by localhost (zimbra.eb.localhost [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id IbpxQDJmYL8Z; Fri, 6 Aug 2021 10:05:02 +0200 (CEST) Received: from localhost (localhost.localhost [127.0.0.1]) by mail.embedded-brains.de (Postfix) with ESMTP id 402142A165B; Fri, 6 Aug 2021 10:05:02 +0200 (CEST) X-Virus-Scanned: amavisd-new at zimbra.eb.localhost Received: from mail.embedded-brains.de ([127.0.0.1]) by localhost (zimbra.eb.localhost [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id jmcBCsBkz1pt; Fri, 6 Aug 2021 10:05:02 +0200 (CEST) Received: from shuber-nb-linux.eb.localhost (unknown [10.10.171.10]) by mail.embedded-brains.de (Postfix) with ESMTPSA id EEBE82A1610; Fri, 6 Aug 2021 10:05:01 +0200 (CEST) Subject: Re: [PATCH v3] gcov: Add __gcov_info_to_gdca() To: Christophe Lyon Cc: =?UTF-8?Q?Martin_Li=c5=a1ka?= , GCC Patches References: <20210723093911.81759-1-sebastian.huber@embedded-brains.de> <501a8c1b-d5ae-e274-f8f9-6f6ceec4d20c@embedded-brains.de> From: Sebastian Huber Message-ID: <535407c0-435a-87d2-3ca9-825bba0376b8@embedded-brains.de> Date: Fri, 6 Aug 2021 10:05:01 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.7.0 MIME-Version: 1.0 In-Reply-To: Content-Type: multipart/mixed; boundary="------------0719756C945B066F810B74D6" Content-Language: en-US X-Authenticated-Sender: smtp-embedded@poldinet.de X-Virus-Scanned: Clear (ClamAV 0.103.2/26254/Thu Aug 5 10:25:12 2021) X-Spam-Status: No, score=-12.5 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, NICE_REPLY_A, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Aug 2021 08:05:08 -0000 This is a multi-part message in MIME format. --------------0719756C945B066F810B74D6 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: base64 SGVsbG8gQ2hyaXN0b3BoZSwNCg0KT24gMDYvMDgvMjAyMSAwOTo1MCwgQ2hyaXN0b3BoZSBM eW9uIHdyb3RlOg0KPiBMb29rcyBsaWtlIHRoZXJlJ3MgYSBwcm9ibGVtIHdpdGggeW91ciBw YXRjaDoNCj4gIMKgL3RtcC8xNzg0NDQyXzcudG1wZGlyL2FjaS1nY2MtZnNmL2J1aWxkcy9n Y2MtZnNmLWdjY3NyYy9vYmotYXJtLW5vbmUtZWFiaS9nY2MxLy4vZ2NjL3hnY2MgLUIvdG1w LzE3ODQ0NDJfNy50bXBkaXIvYWNpLWdjYy1mc2YvYnVpbGRzL2djYy1mc2YtZ2Njc3JjL29i ai1hcm0tbm9uZS1lYWJpL2djYzEvLi9nY2MvIC1CL3RtcC8xNzg0NDQyXzcudG1wZGlyL2Fj aS1nY2MtZnNmL2J1aWxkcy9nY2MtZnNmLWdjY3NyYy90b29scy9hcm0tbm9uZS1lYWJpL2Jp bi8gLUIvdG1wLzE3ODQ0NDJfNy50bXBkaXIvYWNpLWdjYy1mc2YvYnVpbGRzL2djYy1mc2Yt Z2Njc3JjL3Rvb2xzL2FybS1ub25lLWVhYmkvbGliLyAtaXN5c3RlbSAvdG1wLzE3ODQ0NDJf Ny50bXBkaXIvYWNpLWdjYy1mc2YvYnVpbGRzL2djYy1mc2YtZ2Njc3JjL3Rvb2xzL2FybS1u b25lLWVhYmkvaW5jbHVkZSAtaXN5c3RlbSAvdG1wLzE3ODQ0NDJfNy50bXBkaXIvYWNpLWdj Yy1mc2YvYnVpbGRzL2djYy1mc2YtZ2Njc3JjL3Rvb2xzL2FybS1ub25lLWVhYmkvc3lzLWlu Y2x1ZGUgwqAgwqAtZyAtTzIgLU8yIMKgLWcgLU8yIC1ESU5fR0NDIMKgLURDUk9TU19ESVJF Q1RPUllfU1RSVUNUVVJFIMKgLVcgLVdhbGwgLVduby1uYXJyb3dpbmcgLVd3cml0ZS1zdHJp bmdzIC1XY2FzdC1xdWFsIC1Xc3RyaWN0LXByb3RvdHlwZXMgLVdtaXNzaW5nLXByb3RvdHlw ZXMgLVdvbGQtc3R5bGUtZGVmaW5pdGlvbiDCoC1pc3lzdGVtIC4vaW5jbHVkZSAtZm5vLWlu bGluZSAtZyAtRElOX0xJQkdDQzIgLWZidWlsZGluZy1saWJnY2MgLWZuby1zdGFjay1wcm90 ZWN0b3IgLURpbmhpYml0X2xpYmMgwqAtZm5vLWlubGluZSAtSS4gLUkuIC1JLi4vLi4vLi9n Y2MgLUkvdG1wLzE3ODQ0NDJfNy50bXBkaXIvYWNpLWdjYy1mc2Yvc291cmNlcy9nY2MtZnNm L2djY3NyYy9saWJnY2MgLUkvdG1wLzE3ODQ0NDJfNy50bXBkaXIvYWNpLWdjYy1mc2Yvc291 cmNlcy9nY2MtZnNmL2djY3NyYy9saWJnY2MvLiAtSS90bXAvMTc4NDQ0Ml83LnRtcGRpci9h Y2ktZ2NjLWZzZi9zb3VyY2VzL2djYy1mc2YvZ2Njc3JjL2xpYmdjYy8uLi9nY2MgLUkvdG1w LzE3ODQ0NDJfNy50bXBkaXIvYWNpLWdjYy1mc2Yvc291cmNlcy9nY2MtZnNmL2djY3NyYy9s aWJnY2MvLi4vaW5jbHVkZSDCoCDCoC1vIF9nY292Lm8gLU1UIF9nY292Lm8gLU1EIC1NUCAt TUYgX2djb3YuZGVwIC1ETF9nY292IC1jIC90bXAvMTc4NDQ0Ml83LnRtcGRpci9hY2ktZ2Nj LWZzZi9zb3VyY2VzL2djYy1mc2YvZ2Njc3JjL2xpYmdjYy9saWJnY292LWRyaXZlci5jDQo+ IA0KPiBJbiBmaWxlIGluY2x1ZGVkIGZyb20gDQo+IC90bXAvMTc4NDQ0Ml83LnRtcGRpci9h Y2ktZ2NjLWZzZi9zb3VyY2VzL2djYy1mc2YvZ2Njc3JjL2xpYmdjYy9saWJnY292LWRyaXZl ci5jOjI5Og0KPiAvdG1wLzE3ODQ0NDJfNy50bXBkaXIvYWNpLWdjYy1mc2YvYnVpbGRzL2dj Yy1mc2YtZ2Njc3JjL29iai1hcm0tbm9uZS1lYWJpL2djYzEvZ2NjL2luY2x1ZGUvc3RkaW50 Lmg6OToxNjogDQo+IGZhdGFsIGVycm9yOiBzdGRpbnQuaDogTm8gc3VjaCBmaWxlIG9yIGRp cmVjdG9yeQ0KPiAgwqAgwqAgOSB8ICMgaW5jbHVkZV9uZXh0IDxzdGRpbnQuaD4NCj4gIMKg IMKgIMKgIHwgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqBefn5+fn5+fn5+DQo+IGNvbXBpbGF0 aW9uIHRlcm1pbmF0ZWQuDQo+IG1ha2VbMl06ICoqKiBbTWFrZWZpbGU6OTI4OiBfZ2Nvdi5v XSBFcnJvciAxDQo+IG1ha2VbMl06ICoqKiBXYWl0aW5nIGZvciB1bmZpbmlzaGVkIGpvYnMu Li4uDQo+IA0KPiBDYW4geW91IGNoZWNrPw0KDQpJIGFscmVhZHkgZmVhcmVkIHRoYXQgdGhl IDxzdGRpbnQuaD4gaW5jbHVkZSBtYXkgY2F1c2UgcHJvYmxlbXMsIGZyb20gDQp0aGUgY29t bWl0IG1lc3NhZ2U6DQoNCiJXaXRoIHRoaXMgcGF0Y2gsIDxzdGRpbnQuaD4gaXMgaW5jbHVk ZWQgaW4gbGliZ2Nvdi1kcml2ZXIuYyBldmVuIGlmIA0KaW5oaWJpdF9saWJjIGlzIGRlZmlu ZWQuICBUaGlzIGhlYWRlciBmaWxlIHNob3VsZCBiZSBhbHNvIGF2YWlsYWJsZSBmb3IgDQpm cmVlc3RhbmRpbmcgZW52aXJvbm1lbnRzLiAgSWYgdGhpcyBpcyBub3QgdGhlIGNhc2UsIHRo ZW4gd2UgaGF2ZSB0byANCmRlZmluZSBpbnRwdHJfdCBzb21laG93LiINCg0KV2hhdCBhYm91 dCB0aGUgYXR0YWNoZWQgcGF0Y2g/DQoNCi0tIA0KZW1iZWRkZWQgYnJhaW5zIEdtYkgNCkhl cnIgU2ViYXN0aWFuIEhVQkVSDQpEb3JuaWVyc3RyLiA0DQo4MjE3OCBQdWNoaGVpbQ0KR2Vy bWFueQ0KZW1haWw6IHNlYmFzdGlhbi5odWJlckBlbWJlZGRlZC1icmFpbnMuZGUNCnBob25l OiArNDktODktMTggOTQgNzQxIC0gMTYNCmZheDogICArNDktODktMTggOTQgNzQxIC0gMDgN Cg0KUmVnaXN0ZXJnZXJpY2h0OiBBbXRzZ2VyaWNodCBNw7xuY2hlbg0KUmVnaXN0ZXJudW1t ZXI6IEhSQiAxNTc4OTkNClZlcnRyZXR1bmdzYmVyZWNodGlndGUgR2VzY2jDpGZ0c2bDvGhy ZXI6IFBldGVyIFJhc211c3NlbiwgVGhvbWFzIETDtnJmbGVyDQpVbnNlcmUgRGF0ZW5zY2h1 dHplcmtsw6RydW5nIGZpbmRlbiBTaWUgaGllcjoNCmh0dHBzOi8vZW1iZWRkZWQtYnJhaW5z LmRlL2RhdGVuc2NodXR6ZXJrbGFlcnVuZy8NCg== --------------0719756C945B066F810B74D6 Content-Type: text/x-patch; charset=UTF-8; name="0001-gcov-Remove-stdint.h-from-libgcov-driver.c.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0001-gcov-Remove-stdint.h-from-libgcov-driver.c.patch" >From 9e91c623116313312408a8809f32eac1f7ef6b16 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Fri, 6 Aug 2021 09:57:43 +0200 Subject: [PATCH] gcov: Remove from libgcov-driver.c In the patch to add __gcov_info_to_gcda(), the include of was added to libgcov-driver.c even if inhibit_libc is defined. It turned out that this header file is not always available. Remove the include of and replace the intptr_t with the compiler provided __INTPTR_TYPE__. libgcc/ * libgcov-driver.c (#include ): Remove. (write_topn_counters): Use __INTPTR_TYPE__ instead of intptr_t. --- libgcc/libgcov-driver.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libgcc/libgcov-driver.c b/libgcc/libgcov-driver.c index 9d7bc9c79950..087f71e01077 100644 --- a/libgcc/libgcov-driver.c +++ b/libgcc/libgcov-driver.c @@ -26,8 +26,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see #include "libgcov.h" #include "gcov-io.h" -#include - /* Return 1, if all counter values are zero, otherwise 0. */ static inline int @@ -453,7 +451,7 @@ write_topn_counters (const struct gcov_ctr_info *ci_ptr, gcov_type start = ci_ptr->values[GCOV_TOPN_MEM_COUNTERS * i + 2]; unsigned sizes = 0; - for (struct gcov_kvp *node = (struct gcov_kvp *)(intptr_t)start; + for (struct gcov_kvp *node = (struct gcov_kvp *)(__INTPTR_TYPE__)start; node != NULL; node = node->next) ++sizes; @@ -472,7 +470,7 @@ write_topn_counters (const struct gcov_ctr_info *ci_ptr, gcov_type start = ci_ptr->values[GCOV_TOPN_MEM_COUNTERS * i + 2]; unsigned j = 0; - for (struct gcov_kvp *node = (struct gcov_kvp *)(intptr_t)start; + for (struct gcov_kvp *node = (struct gcov_kvp *)(__INTPTR_TYPE__)start; j < list_sizes[i]; node = node->next, j++) { dump_counter (node->value, dump_fn, arg); -- 2.26.2 --------------0719756C945B066F810B74D6--