From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gateway23.websitewelcome.com (gateway23.websitewelcome.com [192.185.48.84]) by sourceware.org (Postfix) with ESMTPS id 6F4FC383E835 for ; Wed, 22 Jul 2020 03:34:57 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 6F4FC383E835 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=fail smtp.mailfrom=tom@tromey.com Received: from cm14.websitewelcome.com (cm14.websitewelcome.com [100.42.49.7]) by gateway23.websitewelcome.com (Postfix) with ESMTP id DA1469EA9 for ; Tue, 21 Jul 2020 22:34:47 -0500 (CDT) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id y5Wpj5BnGSxZVy5WpjkDgR; Tue, 21 Jul 2020 22:34:47 -0500 X-Authority-Reason: nr=8 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Sender:Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=AvL+UyMwAytfmrEBsQRIpU+3DbNED68dojR+CqkZ8k0=; b=xbn3HBnWtK1y8jf5B8VNzJZ6qs Dbw5RvAXmarx68giZwvw5iueA11J3bjkjREhYHwK/7P2XJSybTKGkdXCy1OZrnBfn8ToEF9Dc0qJt G+QxPYjQI9OfRwcWeT9gHi4e4; Received: from 174-16-104-48.hlrn.qwest.net ([174.16.104.48]:44534 helo=bapiya.Home) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1jy5Wp-000kGI-JZ; Tue, 21 Jul 2020 21:34:47 -0600 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 4/9] Remove exec_bfd_mtime define Date: Tue, 21 Jul 2020 21:34:39 -0600 Message-Id: <20200722033444.18522-5-tom@tromey.com> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20200722033444.18522-1-tom@tromey.com> References: <20200722033444.18522-1-tom@tromey.com> 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: 174.16.104.48 X-Source-L: No X-Exim-ID: 1jy5Wp-000kGI-JZ X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 174-16-104-48.hlrn.qwest.net (bapiya.Home) [174.16.104.48]:44534 X-Source-Auth: tom+tromey.com X-Email-Count: 5 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3034.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_ABUSEAT, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, RCVD_IN_SBL_CSS, SPF_HELO_PASS, SPF_NEUTRAL, TXREP, URIBL_CSS, URIBL_CSS_A autolearn=no autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Jul 2020 03:34:58 -0000 This removes the exec_bfd_mtime define, in favor of directly using the appropriate member of the current program space. gdb/ChangeLog 2020-07-21 Tom Tromey * source-cache.c (source_cache::get_plain_source_lines): Use current_program_space. * corefile.c (reopen_exec_file): Use current_program_space. * exec.c (exec_file_attach): Use current_program_space. * exec.h (exec_bfd_mtime): Remove. --- gdb/ChangeLog | 8 ++++++++ gdb/corefile.c | 4 +++- gdb/exec.c | 2 +- gdb/exec.h | 1 - gdb/source-cache.c | 2 +- 5 files changed, 13 insertions(+), 4 deletions(-) diff --git a/gdb/corefile.c b/gdb/corefile.c index c1eec199342..1586e9f175a 100644 --- a/gdb/corefile.c +++ b/gdb/corefile.c @@ -115,7 +115,9 @@ reopen_exec_file (void) std::string filename = bfd_get_filename (exec_bfd); res = stat (filename.c_str (), &st); - if (res == 0 && exec_bfd_mtime && exec_bfd_mtime != st.st_mtime) + if (res == 0 + && current_program_space->ebfd_mtime + && current_program_space->ebfd_mtime != st.st_mtime) exec_file_attach (filename.c_str (), 0); else /* If we accessed the file since last opening it, close it now; diff --git a/gdb/exec.c b/gdb/exec.c index a395b58da82..6ca867ab53e 100644 --- a/gdb/exec.c +++ b/gdb/exec.c @@ -491,7 +491,7 @@ exec_file_attach (const char *filename, int from_tty) bfd_errmsg (bfd_get_error ())); } - exec_bfd_mtime = bfd_get_mtime (exec_bfd); + current_program_space->ebfd_mtime = bfd_get_mtime (exec_bfd); validate_files (); diff --git a/gdb/exec.h b/gdb/exec.h index daaf0d0d4a7..db03f3a24fb 100644 --- a/gdb/exec.h +++ b/gdb/exec.h @@ -31,7 +31,6 @@ struct bfd; struct objfile; #define exec_bfd current_program_space->ebfd -#define exec_bfd_mtime current_program_space->ebfd_mtime /* Builds a section table, given args BFD, SECTABLE_PTR, SECEND_PTR. Returns 0 if OK, 1 on error. */ diff --git a/gdb/source-cache.c b/gdb/source-cache.c index 9196e3a19e3..c67d087c76d 100644 --- a/gdb/source-cache.c +++ b/gdb/source-cache.c @@ -69,7 +69,7 @@ source_cache::get_plain_source_lines (struct symtab *s, if (SYMTAB_OBJFILE (s) != NULL && SYMTAB_OBJFILE (s)->obfd != NULL) mtime = SYMTAB_OBJFILE (s)->mtime; else if (exec_bfd) - mtime = exec_bfd_mtime; + mtime = current_program_space->ebfd_mtime; if (mtime && mtime < st.st_mtime) warning (_("Source file is more recent than executable.")); -- 2.17.2