From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id eWbvNR+RammzqgYAWB0awg (envelope-from ) for ; Fri, 16 Jan 2026 14:27:27 -0500 Authentication-Results: simark.ca; dkim=pass (2048-bit key; secure) header.d=adacore.com header.i=@adacore.com header.a=rsa-sha256 header.s=google header.b=WSpdYl18; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id CDDCB1E08D; Fri, 16 Jan 2026 14:27:27 -0500 (EST) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-25) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-2.4 required=5.0 tests=ARC_SIGNED,ARC_VALID,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED,RCVD_IN_VALIDITY_CERTIFIED_BLOCKED, RCVD_IN_VALIDITY_RPBL_BLOCKED,RCVD_IN_VALIDITY_SAFE_BLOCKED autolearn=ham autolearn_force=no version=4.0.1 Received: from vm01.sourceware.org (vm01.sourceware.org [38.145.34.32]) (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 3CB331E08D for ; Fri, 16 Jan 2026 14:27:27 -0500 (EST) Received: from vm01.sourceware.org (localhost [127.0.0.1]) by sourceware.org (Postfix) with ESMTP id 340994BA2E2A for ; Fri, 16 Jan 2026 19:27:26 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 340994BA2E2A Authentication-Results: sourceware.org; dkim=pass (2048-bit key, secure) header.d=adacore.com header.i=@adacore.com header.a=rsa-sha256 header.s=google header.b=WSpdYl18 Received: from mail-ot1-x32c.google.com (mail-ot1-x32c.google.com [IPv6:2607:f8b0:4864:20::32c]) by sourceware.org (Postfix) with ESMTPS id A774D4BA2E2A for ; Fri, 16 Jan 2026 19:11:34 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A774D4BA2E2A Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org A774D4BA2E2A Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::32c ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1768590694; cv=none; b=mPyWYPThA00Rq28pNvoSMAw8BP5EqmNg5B3d6X7gad91b3Iaa7GnVAUX9FX/We47aodAmtfdVUsC3H8GsguslMPbvmH+EOKZFx/GA8u+rhaFATs85PfeUdEs94hfjohE5HW1061VEYXBEjg3RoqbbQGo+TNMZfF8x7Uf2KN5iKg= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1768590694; c=relaxed/simple; bh=//1TIVD/51bQNvF24Xc0ZtB+9J7TnsyaCag1w2v0yCU=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=RzleZok/CjV6sDpGNDQ/jXU70AAYaEnawDJan4guHrHxxtrg0p2R+vGMmXBSSdKH40V02ElCib8rEeHHw/rsrumAL2Hr1mhTh/3r+d+dhTL87GWmY1Z2AYKD9K38XctBj0Z9zfClGR5TYJ+bNDdFhoqKTcdNl2aT96usyMtRgeE= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A774D4BA2E2A Received: by mail-ot1-x32c.google.com with SMTP id 46e09a7af769-7cfd71761b1so1211954a34.1 for ; Fri, 16 Jan 2026 11:11:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1768590694; x=1769195494; darn=sourceware.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=6KAPQaogVU+vo3ncHGOoRler5E9i4cBafz3iV9Chbpw=; b=WSpdYl18pA1PAHWVoeBmqcMqW6La6a4pXHwRcuXblorA8IRePS2FO+vXtL2Ex/Ibiv ArbpUmFhXbXlpVYKyI4tUObgix+Ty+TX9q3BcX4R4qAmCjRbbkBdN0EuA1jhdlAKtTAT WOLfC6Rpl1OFOYuZGMcXSBxsFVyqvZ2zX85gzuFdv8+dbzMShRVB8XGoH0VwaHUHtihG 6Fmgzhm6oY4ZIbkoV1ES8c3+3oIb4cuESrb5Wmv+UxL/KxkVgVUgIlLsRmwowmPOWjTC A2QYkHNtW6pkn3in10jvvzpkq6Yr/B+SvhyUvIEIaQL1G0sMFlfFR28sgbP/7ay+sHEC INKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768590694; x=1769195494; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=6KAPQaogVU+vo3ncHGOoRler5E9i4cBafz3iV9Chbpw=; b=wiX0cOLZgmF0XwzwSJjNvGcTa8eAWPghoKfHUgb+lnToYMiroWX8yJthhEhcgsWaz3 FjKyOMHXXah8Ow2HZNjJlg2ERZQQdvg3VBl4mSWAtARLZobQCiDn74jjuYUGb5nkKtTl TF38wQEiz/4Ej8s8pwEfmmveXtxj/G9HBtJhojm+DpWa8T11jQAWqJaAYCgZCIoaG66u heTaVaspf73YRagKFSzHKJbmJ13cbV/pbnfb4M9YFQEypiuwdD+Fure8rnABC0E+Rmuj 0mx+zsRndnpPDLWoR3aK5k76GYzFp/wNqVFgiumv055cyYhnO9aPkpMle5X30BqFy2k6 2jaw== X-Gm-Message-State: AOJu0YwXJROCc0HskZOSTP09CJQ8eCCP+GUfPIt5QMlrpU9AY0uaumEX GbgZC+oK8qsJW7byH4ANWiz+q8GjenUExkhVuSMjMvmjXUumimaeegkhhIRx/20V7LVW6i+sNE+ oqlU= X-Gm-Gg: AY/fxX56peu9HIuHXEvO7M1f00dGssbUJBjQ5Hw65RodaaSU4fmTmJ8VVH2ZLgk9ByD sXhLIcsVZaUULYDeYdR+pEV0Gbf4bfc/uodsH3j0OFdThjTFHcUVJv/f3jl58FbRPX2Ol9BG8Wy nT0CzKpCGCmTzuKVYfiwIru4MWoLbRc5lDbIBeVIJNl9igBzYFkt/ERLhd6TmMqtJ/DnVff+EtC 575PguACeB9xh0rs6itNUBzDcUWXGkNTcFX7SlgcbBtKVZJzHZNM99y1soE+NABUSJ1Dvw7oYP5 7d1gPbEiliVM7wH9p7y2FpRpTBaKFKS0EUFgRqSdnvUe8jjBPm+3j1xigjrhxRfNHZ3VrAGnlZU e9IAwFwODk7ujGcnm/8mZuJ83tf+Ju6pLB7bdue0b/Zz2Sv0ld2FfWLjpDD4gWSwAbQtCUR8rMd 3leKtulExsxb6yc2oQ/IDprSGY1X79eoueZ81iEJrKoQ== X-Received: by 2002:a05:6830:1351:b0:7c6:d01f:591b with SMTP id 46e09a7af769-7cfd468de4dmr3385404a34.13.1768590693941; Fri, 16 Jan 2026 11:11:33 -0800 (PST) Received: from [192.168.0.26] (97-122-114-32.hlrn.qwest.net. [97.122.114.32]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-7cfdf0db2c1sm2196681a34.5.2026.01.16.11.11.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Jan 2026 11:11:33 -0800 (PST) From: Tom Tromey Date: Fri, 16 Jan 2026 12:11:33 -0700 Subject: [PATCH 05/10] Remove redundant nlist_bfd_global MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260116-coffread-cleanups-v1-5-4d46090fad69@adacore.com> References: <20260116-coffread-cleanups-v1-0-4d46090fad69@adacore.com> In-Reply-To: <20260116-coffread-cleanups-v1-0-4d46090fad69@adacore.com> To: gdb-patches@sourceware.org Cc: Tom Tromey X-Mailer: b4 0.14.3 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~public-inbox=simark.ca@sourceware.org coffread.c has two BFD globals: nlist_bfd_global and symfile_bfd. There's no need for both, and since symfile_bfd is set early (in coff_symfile_read, the entry point), this removes nlist_bfd_global and replaces all the uses. --- gdb/coffread.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/gdb/coffread.c b/gdb/coffread.c index c8c9c6409ea..b75721d2577 100644 --- a/gdb/coffread.c +++ b/gdb/coffread.c @@ -32,10 +32,10 @@ static struct objfile *coffread_objfile; -/* The addresses of the symbol table stream and number of symbols - of the object file we are reading (as copied into core). */ +/* The BFD for this file -- only good while we're actively reading + symbols into a psymtab or a symtab. */ -static bfd *nlist_bfd_global; +static bfd *symfile_bfd; /* Pointers to scratch storage, used for reading raw symbols and auxents. */ @@ -278,11 +278,6 @@ coff_read_minsyms (file_ptr symtab_offset, unsigned int nsyms, } } -/* The BFD for this file -- only good while we're actively reading - symbols into a psymtab or a symtab. */ - -static bfd *symfile_bfd; - /* Read a symbol file, after initialization by coff_symfile_init. */ static void @@ -394,7 +389,6 @@ coff_symtab_read (minimal_symbol_reader &reader, objfile_name (objfile), bfd_errmsg (bfd_get_error ())); coffread_objfile = objfile; - nlist_bfd_global = objfile->obfd.get (); while (symnum < nsyms) { @@ -538,7 +532,7 @@ read_one_sym (struct coff_symbol *cs) bfd_size_type bytes; internal_syment sym; - bytes = bfd_read (temp_sym, local_symesz, nlist_bfd_global); + bytes = bfd_read (temp_sym, local_symesz, symfile_bfd); if (bytes != local_symesz) error (_("%s: error reading symbols"), objfile_name (coffread_objfile)); bfd_coff_swap_sym_in (symfile_bfd, temp_sym, &sym); @@ -548,7 +542,7 @@ read_one_sym (struct coff_symbol *cs) /* We don't need aux entries, read past them. */ for (i = 0; i < cs->c_naux; i++) { - bytes = bfd_read (temp_aux, local_auxesz, nlist_bfd_global); + bytes = bfd_read (temp_aux, local_auxesz, symfile_bfd); if (bytes != local_auxesz) error (_("%s: error reading symbols"), objfile_name (coffread_objfile)); -- 2.52.0