From: Gary Benson <gbenson@redhat.com>
To: gdb-patches@sourceware.org
Cc: Doug Evans <dje@google.com>
Subject: [PATCH v2] Do not manipulate "target:" filenames as local paths
Date: Wed, 15 Apr 2015 08:03:00 -0000 [thread overview]
Message-ID: <1429085001-25894-1-git-send-email-gbenson@redhat.com> (raw)
In-Reply-To: <20150414114129.GB4660@blade.nx>
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 ("<<anonymous objfile>>");
}
- 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);
--
1.7.1
next prev parent reply other threads:[~2015-04-15 8:03 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-13 19:07 [PATCH] Mark object files with "target:" filenames as OBJF_NONLOCAL_FILENAME Gary Benson
2015-04-13 23:27 ` Doug Evans
2015-04-14 11:41 ` Gary Benson
2015-04-14 16:52 ` Doug Evans
2015-04-14 21:30 ` Gary Benson
2015-04-15 8:03 ` Gary Benson [this message]
2015-04-23 21:22 ` [PING][PATCH v2] Do not manipulate "target:" filenames as local paths Gary Benson
2015-04-24 19:16 ` [PATCH " Doug Evans
2015-04-27 14:42 ` Gary Benson
2015-04-15 8:56 ` [PATCH] Mark object files with "target:" filenames as OBJF_NONLOCAL_FILENAME Pedro Alves
2015-04-15 12:09 ` Gary Benson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1429085001-25894-1-git-send-email-gbenson@redhat.com \
--to=gbenson@redhat.com \
--cc=dje@google.com \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox