From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id 1I5oE/4x7mR8tw0AWB0awg (envelope-from ) for ; Tue, 29 Aug 2023 13:59:26 -0400 Authentication-Results: simark.ca; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha256 header.s=default header.b=GEXX2LkU; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 425311E0C2; Tue, 29 Aug 2023 13:59:26 -0400 (EDT) Received: from server2.sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id 32E991E092 for ; Tue, 29 Aug 2023 13:59:24 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 53ADE3858416 for ; Tue, 29 Aug 2023 17:59:23 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 53ADE3858416 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1693331963; bh=G3YKt7uZyjWaRt4WT/K0SoN8otc3Xahay/lv81tFrZY=; h=Date:Subject:To:References:In-Reply-To:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=GEXX2LkURl/DqUXSsU33BTjoo/crQJlaf68XaQBVY6Da/GiXhDSObD0bV/4bhsllx UilTfEz4y9Qysd/7Ukql1EljJhsGSal0N76l3GlTNh/fUxyAjUnjowHRzfxyWVGrHC VyBIhawgU961Uo+3b9fYWyjkHa9z24sqlwCToTco= Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2001:67c:2178:6::1d]) by sourceware.org (Postfix) with ESMTPS id 885B13858D20 for ; Tue, 29 Aug 2023 17:59:01 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 885B13858D20 Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id C34071F45F; Tue, 29 Aug 2023 17:59:00 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id AE05113301; Tue, 29 Aug 2023 17:59:00 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id qgYaKeQx7mSTbgAAMHmgww (envelope-from ); Tue, 29 Aug 2023 17:59:00 +0000 Content-Type: multipart/mixed; boundary="------------cTEMwReNfMvDcC0nxBFoau5r" Message-ID: <3f6919bb-113c-7e75-79ee-24577582e73e@suse.de> Date: Tue, 29 Aug 2023 19:59:28 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH] [gdb/build] Fix C inclusion of nat/x86-cpuid.h Content-Language: en-US To: Kevin Buettner , Tom de Vries via Gdb-patches References: <20230829153857.12895-1-tdevries@suse.de> <20230829090325.3173bf72@f37-zws-nv> In-Reply-To: <20230829090325.3173bf72@f37-zws-nv> X-Spam-Status: No, score=-11.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Tom de Vries via Gdb-patches Reply-To: Tom de Vries Errors-To: gdb-patches-bounces+public-inbox=simark.ca@sourceware.org Sender: "Gdb-patches" This is a multi-part message in MIME format. --------------cTEMwReNfMvDcC0nxBFoau5r Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 8/29/23 18:03, Kevin Buettner wrote: > On Tue, 29 Aug 2023 17:38:57 +0200 > Tom de Vries via Gdb-patches wrote: > >> When running test-case gdb.arch/i386-avx512.exp, I run into: >> ... >> gdb compile failed, In file included from gdb.arch/i386-avx512.c:20:0: >> src/gdb/nat/x86-cpuid.h: In function 'x86_cpuid_count': >> src/gdb/nat/x86-cpuid.h:63:16: error: \ >> 'nullptr' undeclared (first use in this function) >> if (__eax == nullptr) >> ^~~~~~~ >> src/gdb/nat/x86-cpuid.h:63:16: note: each \ >> undeclared identifier is reported only once for each function it appears in > [...] >> This is due to commit e85aad4ae76 ("nat/x86-cpuid.h: Add x86_cpuid_count >> wrapper around __get_cpuid_count"), which introduced the nullptr check. >> >> The header file gdb/nat/x86-cpuid.h is a file that is included in the build >> and compiled as a C++ file, but also in the testsuite and compiled as a C >> file. >> >> Fix this by replacing nullptr with (void *)0. > [...] > >> - if (__eax == nullptr) >> + if (__eax == (void *)0) >> __eax = &__scratch; >> - if (__ebx == nullptr) >> + if (__ebx == (void *)0) >> __ebx = &__scratch; >> - if (__ecx == nullptr) >> + if (__ecx == (void *)0) >> __ecx = &__scratch; >> - if (__edx == nullptr) >> + if (__edx == (void *)0) >> __edx = &__scratch; > > Maybe leave nullptr in place and instead do something like this... > > /* This header file is also used in C code for the gdb.arch/i386-avx512.exp > test, so define nullptr to avoid a compile error during testing. */ > #ifndef __cplusplus > #define nullptr (void *) 0) > #endif > Hi Kevin, thanks for the review. I'll commit this v2 tomorrow, unless there are further comments. Thanks, - Tom --------------cTEMwReNfMvDcC0nxBFoau5r Content-Type: text/x-patch; charset=UTF-8; name="0001-gdb-build-Fix-C-inclusion-of-nat-x86-cpuid.h.patch" Content-Disposition: attachment; filename="0001-gdb-build-Fix-C-inclusion-of-nat-x86-cpuid.h.patch" Content-Transfer-Encoding: base64 RnJvbSBhYmQ5ZWIzMjQ4ZmE1MDY5NjVkNzVmZDNjYWE2MGZjYzYzZThiOGYwIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBUb20gZGUgVnJpZXMgPHRkZXZyaWVzQHN1c2UuZGU+ CkRhdGU6IFR1ZSwgMjkgQXVnIDIwMjMgMTc6Mjk6MTcgKzAyMDAKU3ViamVjdDogW1BBVENI XSBbZ2RiL2J1aWxkXSBGaXggQyBpbmNsdXNpb24gb2YgbmF0L3g4Ni1jcHVpZC5oCgpXaGVu IHJ1bm5pbmcgdGVzdC1jYXNlIGdkYi5hcmNoL2kzODYtYXZ4NTEyLmV4cCwgSSBydW4gaW50 bzoKLi4uCiBnZGIgY29tcGlsZSBmYWlsZWQsIEluIGZpbGUgaW5jbHVkZWQgZnJvbSBnZGIu YXJjaC9pMzg2LWF2eDUxMi5jOjIwOjA6CiBzcmMvZ2RiL25hdC94ODYtY3B1aWQuaDogSW4g ZnVuY3Rpb24gJ3g4Nl9jcHVpZF9jb3VudCc6CiBzcmMvZ2RiL25hdC94ODYtY3B1aWQuaDo2 MzoxNjogZXJyb3I6IFwKICAgJ251bGxwdHInIHVuZGVjbGFyZWQgKGZpcnN0IHVzZSBpbiB0 aGlzIGZ1bmN0aW9uKQogICAgaWYgKF9fZWF4ID09IG51bGxwdHIpCiAgICAgICAgICAgICAg ICAgXn5+fn5+fgogc3JjL2dkYi9uYXQveDg2LWNwdWlkLmg6NjM6MTY6IG5vdGU6IGVhY2gg XAogICB1bmRlY2xhcmVkIGlkZW50aWZpZXIgaXMgcmVwb3J0ZWQgb25seSBvbmNlIGZvciBl YWNoIGZ1bmN0aW9uIGl0IGFwcGVhcnMgaW4KCiAgICAgICAgICAgICAgICAgID09PSBnZGIg U3VtbWFyeSA9PT0KCiAjIG9mIHVudGVzdGVkIHRlc3RjYXNlcyAgICAgICAgIDEKLi4uCgpU aGlzIGlzIGR1ZSB0byBjb21taXQgZTg1YWFkNGFlNzYgKCJuYXQveDg2LWNwdWlkLmg6IEFk ZCB4ODZfY3B1aWRfY291bnQKd3JhcHBlciBhcm91bmQgX19nZXRfY3B1aWRfY291bnQiKSwg d2hpY2ggaW50cm9kdWNlZCB0aGUgbnVsbHB0ciBjaGVjay4KClRoZSBoZWFkZXIgZmlsZSBn ZGIvbmF0L3g4Ni1jcHVpZC5oIGlzIGEgZmlsZSB0aGF0IGlzIGluY2x1ZGVkIGluIHRoZSBi dWlsZAphbmQgY29tcGlsZWQgYXMgYSBDKysgZmlsZSwgYnV0IGFsc28gaW4gdGhlIHRlc3Rz dWl0ZSBhbmQgY29tcGlsZWQgYXMgYSBDCmZpbGUuCgpGaXggdGhpcyBieSByZXBsYWNpbmcg bnVsbHB0ciB3aXRoICh2b2lkICopMC4KClRlc3RlZCBvbiB4ODZfNjQtbGludXguCgpDby1B dXRob3JlZC1CeTogS2V2aW4gQnVldHRuZXIgPGtldmluYkByZWRoYXQuY29tPgotLS0KIGdk Yi9uYXQveDg2LWNwdWlkLmggfCAxMiArKysrKysrKysrKysKIDEgZmlsZSBjaGFuZ2VkLCAx MiBpbnNlcnRpb25zKCspCgpkaWZmIC0tZ2l0IGEvZ2RiL25hdC94ODYtY3B1aWQuaCBiL2dk Yi9uYXQveDg2LWNwdWlkLmgKaW5kZXggNTE3MTEzZDQ1ZTguLmUxYjAzMjFkNTkzIDEwMDY0 NAotLS0gYS9nZGIvbmF0L3g4Ni1jcHVpZC5oCisrKyBiL2dkYi9uYXQveDg2LWNwdWlkLmgK QEAgLTIyLDYgKzIyLDEyIEBACiAvKiBBbHdheXMgaW5jbHVkZSB0aGUgaGVhZGVyIGZvciB0 aGUgY3B1IGJpdCBkZWZpbmVzLiAgKi8KICNpbmNsdWRlICJ4ODYtZ2NjLWNwdWlkLmgiCiAK KyNpZm5kZWYgX19jcGx1c3BsdXMKKy8qIFRoaXMgaGVhZGVyIGZpbGUgaXMgYWxzbyB1c2Vk IGluIEMgY29kZSBmb3Igc29tZSB0ZXN0LWNhc2VzLCBzbyBkZWZpbmUKKyAgIG51bGxwdHIg aW4gQyB0ZXJtcyB0byBhdm9pZCBhIGNvbXBpbGF0aW9uIGVycm9yLiAgKi8KKyNkZWZpbmUg bnVsbHB0ciAoKHZvaWQgKikgMCkKKyNlbmRpZgorCiAjaWYgZGVmaW5lZChfX2kzODZfXykg fHwgZGVmaW5lZChfX3g4Nl82NF9fKQogCiAvKiBSZXR1cm4gY3B1aWQgZGF0YSBmb3IgcmVx dWVzdGVkIGNwdWlkIGxldmVsLCBhcyBmb3VuZCBpbiByZXR1cm5lZApAQCAtOTIsNCArOTgs MTAgQEAgeDg2X2NwdWlkX2NvdW50ICh1bnNpZ25lZCBpbnQgX19sZXZlbCwgdW5zaWduZWQg aW50IF9fc3VibGV2ZWwsCiAKICNlbmRpZiAvKiBpMzg2ICYmIHg4Nl82NCAqLwogCisjaWZu ZGVmIF9fY3BsdXNwbHVzCisvKiBBdm9pZCBsZWFraW5nIHRoaXMgbG9jYWwgZGVmaW5pdGlv biBiZXlvbmQgdGhlIHNjb3BlIG9mIHRoaXMgaGVhZGVyCisgICBmaWxlLiAgKi8KKyN1bmRl ZiBudWxscHRyCisjZW5kaWYKKwogI2VuZGlmIC8qIE5BVF9YODZfQ1BVSURfSCAqLwoKYmFz ZS1jb21taXQ6IDg0NjhlMDM2ODg2MjJmMjY1NTI5Njk5ZTJlZmQzNTVhNGMxMjJjYzYKLS0g CjIuMzUuMwoK --------------cTEMwReNfMvDcC0nxBFoau5r--