From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from omta040.useast.a.cloudfilter.net (omta040.useast.a.cloudfilter.net [44.202.169.39]) by sourceware.org (Postfix) with ESMTPS id 2D0AC385840F for ; Tue, 9 Jan 2024 20:24:01 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 2D0AC385840F Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tromey.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 2D0AC385840F Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=44.202.169.39 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704831844; cv=none; b=c5F9Yx8DeSyhdTZTGaTiiGXUbCAaWwN+Vtt5GlROZ0JdgD0rSFqumUl4h4e9OTBthrDzHCJshsaDcXSppnOULFqUtea9rcpK/wBgP0uePlvELdJ5cZu+NtqYFdt1vPXlWPJ0WG137306X5mUf+0gAH55hVcBFd+czCvvIFzHmPo= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704831844; c=relaxed/simple; bh=8b4rqmFyk2qTFaWNnkssZNRQeXNQGzcEYH+stVS47ik=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=CtwI4A/Ii82DBTDNygAIA8+wkSLxiCPiBzWl/AXvO31Kn567t9+vofR3U54OZ3G+K0toA3/BfYNzUp1wl76a2EmHbgJ2Y0FfPwZCoqhq4h6zFGBybLUYM9rhvhQvS2hDt+/odOm6aVEn1gpyeI3TJ4UoAVZD/TgAwrBODPxr2KI= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from eig-obgw-5010a.ext.cloudfilter.net ([10.0.29.199]) by cmsmtp with ESMTPS id NFvErenr2THHuNIdkrnZML; Tue, 09 Jan 2024 20:24:00 +0000 Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTPS id NIdjrzrGEbhW6NIdkr91pW; Tue, 09 Jan 2024 20:24:00 +0000 X-Authority-Analysis: v=2.4 cv=aLPjFJxm c=1 sm=1 tr=0 ts=659dab60 a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=OWjo9vPv0XrRhIrVQ50Ab3nP57M=:19 a=dLZJa+xiwSxG16/P+YVxDGlgEgI=:19 a=dEuoMetlWLkA:10 a=Qbun_eYptAEA:10 a=CCpqsmhAAAAA:8 a=vbVb4Nt8BksE34w2FnUA:9 a=ul9cdbp4aOFLsgKbc677:22 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Content-Transfer-Encoding:MIME-Version:Message-ID:Date:Subject: Cc:To:From:Sender:Reply-To:Content-Type:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=YwVpGqJvcHfrrDLX/YdUClfB12vra44knq9snv788bE=; b=P7AkrxFXfTshvOXFKDV3Jy+bwJ Nqe5GwzGuxeQd0vV5L21JSVn+GnuhQXUiDJ+O5lTvwJ7POqDZul/XMUqgv+e09XXNT56x32gHCopE CEzMEogZuSUIwpHrk6w0GAtke; Received: from 97-122-68-157.hlrn.qwest.net ([97.122.68.157]:38544 helo=localhost.localdomain) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96.2) (envelope-from ) id 1rNIdj-0030yL-15; Tue, 09 Jan 2024 13:23:59 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [pushed] Fix thread-less build Date: Tue, 9 Jan 2024 13:23:47 -0700 Message-ID: <20240109202347.339446-1-tom@tromey.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - box5379.bluehost.com X-AntiAbuse: Original Domain - sourceware.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tromey.com X-BWhitelist: no X-Source-IP: 97.122.68.157 X-Source-L: No X-Exim-ID: 1rNIdj-0030yL-15 X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-68-157.hlrn.qwest.net (localhost.localdomain) [97.122.68.157]:38544 X-Source-Auth: tom+tromey.com X-Email-Count: 5 X-Org: HG=bhshared;ORG=bluehost; X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfHf5+/n8ZK/NNmOXZtQboy8nYHFCIqwpHqHFvtMfuxqecz5v0TNKR6Edx8W73UglnroRlQQU/TnESFrnAz4bHL+4hTQimPgM9rQmDNr4JFeA38s+B4WY QQO5TMawnJ/Kdg9JMfNTcW1emZsm9ScCPRuvdCK3Pk8JW4esAM43aEug1y0VT5jFrSz3CBKjjsBN2lrjQjfeSQX9zkEo+IkXRhY= X-Spam-Status: No, score=-3022.4 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,GIT_PATCH_0,JMQ_SPF_NEUTRAL,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,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 List-Id: A user pointed out that the recent background DWARF reader series broke the build when --disable-threading is in use. This patch fixes the problem. I am checking it in. Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=31223 --- gdb/dwarf2/cooked-index.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gdb/dwarf2/cooked-index.h b/gdb/dwarf2/cooked-index.h index b14930d558f..a26163f1c41 100644 --- a/gdb/dwarf2/cooked-index.h +++ b/gdb/dwarf2/cooked-index.h @@ -517,18 +517,18 @@ class cooked_index_worker #if CXX_STD_THREAD /* Current state of this object. */ cooked_state m_state = cooked_state::INITIAL; + /* Mutex and condition variable used to synchronize. */ + std::mutex m_mutex; + std::condition_variable m_cond; +#endif /* CXX_STD_THREAD */ /* This flag indicates whether any complaints or exceptions that arose during scanning have been reported by 'wait'. This may only be modified on the main thread. */ bool m_reported = false; - /* Mutex and condition variable used to synchronize. */ - std::mutex m_mutex; - std::condition_variable m_cond; /* If set, an exception occurred during start_reading; in this case the scanning is stopped and this exception will later be reported by the 'wait' method. */ std::optional m_failed; -#endif /* CXX_STD_THREAD */ }; /* The main index of DIEs. -- 2.43.0