From patchwork Thu Nov 30 09:54:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Rainer Orth X-Patchwork-Id: 81005 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id C75923858C66 for ; Thu, 30 Nov 2023 09:54:31 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp.CeBiTec.Uni-Bielefeld.DE (smtp.CeBiTec.Uni-Bielefeld.DE [129.70.160.84]) by sourceware.org (Postfix) with ESMTPS id E12A13858C66 for ; Thu, 30 Nov 2023 09:54:16 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E12A13858C66 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=CeBiTec.Uni-Bielefeld.DE Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=cebitec.uni-bielefeld.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org E12A13858C66 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=129.70.160.84 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1701338058; cv=none; b=JzOKeJiGdmj6GfcY/68MSNVyfhmBmtHjATYPwgVMrAT2mlAbi/nloY4cOdGx11oIZSCaNC4kcgffrTQDz0a9V5weC8vjHujNHyFt55a4qB+pEpNzaf/HjOpeQHj8pEuehZo5EUCVYzzSPu+1gQcEtKC7wJ7T4p/Ny/DndsKqBnM= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1701338058; c=relaxed/simple; bh=7tdqb/urlvhVXVRLRHbBzOVnkRwcpkc4XC9ml3gaJ3E=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=AS005+pJnyMKA3cxW960whdHXb7boqSSFx0ze5AgwMkt877BIWq1Qnc+XqJlh55VrcY7QaFCugANHMme9KTx9/6+iLyB6VW9dsrw0yd/pj4OROOQ/Yda3NPm/GfpyvyWMnFdfF3792s2fxaGYtOVP4BB+WyqYKeQQPMP8boEbO8= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from localhost (localhost [127.0.0.1]) by smtp.CeBiTec.Uni-Bielefeld.DE (Postfix) with ESMTP id 06090C6224; Thu, 30 Nov 2023 10:54:16 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d= cebitec.uni-bielefeld.de; h=content-type:content-type :mime-version:user-agent:message-id:date:date:subject:subject :from:from:received:received; s=20200306; t=1701338055; bh=7tdqb /urlvhVXVRLRHbBzOVnkRwcpkc4XC9ml3gaJ3E=; b=JcirwQMQgkNCrcabFa48Z jg43OjJtfrN8Bg5X4WekxzoYCvPWh3xvZSnwacUZAnx03hvbTrBZr5o2txJL6JW+ vp3di13A0colhAE6OUm50+Bx+9Ri5myxGO1TtK9mVbnQvHam7FYVYsWsnwjOwx4b 0qhNUjX2ix+ZHhl6ZzRreVCpA0HR0GHpVqfzggWtHv65rsh0XpqoM/9MIiA3BLjg cM/zlsqRlvAm9fvDRBUiqK73lkAt3YTvv8/Vz51TM0k0KY1JL1t5fkQu81wZa2H6 KI02wwZcuMzdXbJx5uRsFcOBEuq+aTYO2bBoZmB4DDmdQ0Ly9jM/d/tAof0Dj+dD Q== X-Virus-Scanned: amavisd-new at cebitec.uni-bielefeld.de Received: from smtp.CeBiTec.Uni-Bielefeld.DE ([127.0.0.1]) by localhost (smtp.cebitec.uni-bielefeld.de [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id Uy5jT3BWd5GU; Thu, 30 Nov 2023 10:54:15 +0100 (CET) Received: from manam.CeBiTec.Uni-Bielefeld.DE (p4fddb508.dip0.t-ipconnect.de [79.221.181.8]) (Authenticated sender: ro) by smtp.CeBiTec.Uni-Bielefeld.DE (Postfix) with ESMTPSA id 42244C5F4E; Thu, 30 Nov 2023 10:54:15 +0100 (CET) From: Rainer Orth To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [COMMITTED PATCH] Fix procfs.c compilation Date: Thu, 30 Nov 2023 10:54:14 +0100 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1.90 (usg-unix-v) MIME-Version: 1.0 X-Spam-Status: No, score=-3791.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, GIT_PATCH_0, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE 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: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org procfs.c doesn't currently compile on Solaris: /vol/src/gnu/gdb/hg/master/dist/gdb/procfs.c: In member function ‘virtual int procfs_target::can_use_hw_breakpoint(bptype, int, int)’: /vol/src/gnu/gdb/hg/master/dist/gdb/procfs.c:3017:9: error: ‘ptr_type’ was not declared in this scope; did you mean ‘var_types’? 3017 | type *ptr_type | ^~~~~~~~ | var_types This was caused by this patch: commit 99d9c3b92ca96a7425cbb6b1bf453ede9477a2ee Author: Simon Marchi Date: Fri Sep 29 14:24:38 2023 -0400 gdb: remove target_gdbarch Partially undoing it restores the build. Tested on amd64-pc-solaris2.11, committed to master. Btw., I'd considered reviving the Solaris buildbots to guard against this kind of issues. However, they'd both (sparcv9 and amd64) would need to be build-only: the make check phase takes 3-5 times as long as the build, there are about 2500 failures and quite a number of those are flakey. I have no idea if the new buildmaster allows for such a compile-only configuration, though (the previous one did). Rainer diff --git a/gdb/procfs.c b/gdb/procfs.c --- a/gdb/procfs.c +++ b/gdb/procfs.c @@ -3014,7 +3014,7 @@ procfs_target::can_use_hw_breakpoint (en procfs_address_to_host_pointer will reveal that an internal error will be generated when the host and target pointer sizes are different. */ - type *ptr_type + struct type *ptr_type = builtin_type (current_inferior ()->arch ())->builtin_data_ptr; if (sizeof (void *) != ptr_type->length ())