From patchwork Wed Apr 15 08:03:21 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gary Benson X-Patchwork-Id: 6224 Received: (qmail 43203 invoked by alias); 15 Apr 2015 08:03:28 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 43189 invoked by uid 89); 15 Apr 2015 08:03:27 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.1 required=5.0 tests=AWL, BAYES_00, SPF_HELO_PASS, SPF_PASS, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Wed, 15 Apr 2015 08:03:26 +0000 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id 0CDE88E69A; Wed, 15 Apr 2015 08:03:25 +0000 (UTC) Received: from blade.nx (ovpn-116-95.ams2.redhat.com [10.36.116.95]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t3F83Nj9000349; Wed, 15 Apr 2015 04:03:24 -0400 Received: from blade.nx (localhost [127.0.0.1]) by blade.nx (Postfix) with ESMTP id 7626F263FB7; Wed, 15 Apr 2015 09:03:22 +0100 (BST) From: Gary Benson To: gdb-patches@sourceware.org Cc: Doug Evans Subject: [PATCH v2] Do not manipulate "target:" filenames as local paths Date: Wed, 15 Apr 2015 09:03:21 +0100 Message-Id: <1429085001-25894-1-git-send-email-gbenson@redhat.com> In-Reply-To: <20150414114129.GB4660@blade.nx> References: <20150414114129.GB4660@blade.nx> X-IsSubscribed: yes Hi all, This patch alters two places that manipulate object file filenames to detect "target:" filenames and to not attempt to manipulate them as paths on the local filesystem: - allocate_objfile is updated to not attempt to expand "target:" filenames with gdb_abspath. - load_auto_scripts_for_objfile is updated to not attempt to load auto-load scripts for object files with "target:" filenames. Built and regtested on RHEL6.6 x86_64. Ok to commit? Cheers, Gary gdb/ChangeLog: * objfiles.c (allocate_objfile): Do not attempt to expand name if name is a "target:" filename. * auto-load.c (load_auto_scripts_for_objfile): Do not attempt to load auto-load scripts for objfiles with "target:" filenames. --- gdb/ChangeLog | 7 +++++++ gdb/auto-load.c | 7 +++++-- gdb/objfiles.c | 3 ++- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/gdb/auto-load.c b/gdb/auto-load.c index 778eeb6..7da288f 100644 --- a/gdb/auto-load.c +++ b/gdb/auto-load.c @@ -1195,8 +1195,11 @@ load_auto_scripts_for_objfile (struct objfile *objfile) { /* Return immediately if auto-loading has been globally disabled. This is to handle sequencing of operations during gdb startup. - Also return immediately if OBJFILE is not actually a file. */ - if (!global_auto_load || (objfile->flags & OBJF_NOT_FILENAME) != 0) + Also return immediately if OBJFILE was not created from a file + on the local filesystem. */ + if (!global_auto_load + || (objfile->flags & OBJF_NOT_FILENAME) != 0 + || is_target_filename (objfile->original_name)) return; /* Load any extension language scripts for this objfile. diff --git a/gdb/objfiles.c b/gdb/objfiles.c index ff20bc8..c6f9f00 100644 --- a/gdb/objfiles.c +++ b/gdb/objfiles.c @@ -301,7 +301,8 @@ allocate_objfile (bfd *abfd, const char *name, int flags) gdb_assert ((flags & OBJF_NOT_FILENAME) != 0); expanded_name = xstrdup ("<>"); } - else if ((flags & OBJF_NOT_FILENAME) != 0) + else if ((flags & OBJF_NOT_FILENAME) != 0 + || is_target_filename (name)) expanded_name = xstrdup (name); else expanded_name = gdb_abspath (name);