From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id ECMwBg4R7mRupw0AWB0awg (envelope-from ) for ; Tue, 29 Aug 2023 11:38:54 -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=UJcJFL1a; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 160171E0C2; Tue, 29 Aug 2023 11:38:54 -0400 (EDT) Received: from server2.sourceware.org (ip-8-43-85-97.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 03D161E092 for ; Tue, 29 Aug 2023 11:38:52 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 623DB385701B for ; Tue, 29 Aug 2023 15:38:51 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 623DB385701B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1693323531; bh=my4sR7+/b0MlzWmqfdhTNYuPFzQlHeMivaE8u4tub6U=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=UJcJFL1a3dvzRSjrUs5Jbc6EBrkXYMwR9Okk8Jew41Kc7UDal6CJHiST0ZHoIEqGJ KA/UPhBwqyxkQsAetciop3tDrBYz+bWYovZktVWsE/vZvddmT5Zd9JladtzJz+7U1a U6+udELAlw6V/yCDBMuK1uNw0lrARVWaDGqrKkfc= Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by sourceware.org (Postfix) with ESMTPS id D02B13858C3A for ; Tue, 29 Aug 2023 15:38:30 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D02B13858C3A 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-out1.suse.de (Postfix) with ESMTPS id 1326621865 for ; Tue, 29 Aug 2023 15:38:30 +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 F1E0313301 for ; Tue, 29 Aug 2023 15:38:29 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id QPfjOfUQ7mRjKAAAMHmgww (envelope-from ) for ; Tue, 29 Aug 2023 15:38:29 +0000 To: gdb-patches@sourceware.org Subject: [PATCH] [gdb/build] Fix C inclusion of nat/x86-cpuid.h Date: Tue, 29 Aug 2023 17:38:57 +0200 Message-Id: <20230829153857.12895-1-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-12.3 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" 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 === gdb Summary === # of untested testcases 1 ... 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. Tested on x86_64-linux. --- gdb/nat/x86-cpuid.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gdb/nat/x86-cpuid.h b/gdb/nat/x86-cpuid.h index 517113d45e8..25a08f4e94e 100644 --- a/gdb/nat/x86-cpuid.h +++ b/gdb/nat/x86-cpuid.h @@ -60,13 +60,13 @@ x86_cpuid_count (unsigned int __level, unsigned int __sublevel, { unsigned int __scratch; - 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; return __get_cpuid_count (__level, __sublevel, __eax, __ebx, __ecx, __edx); base-commit: 8468e03688622f265529699e2efd355a4c122cc6 -- 2.35.3