Mirror of the gdb-patches mailing list
 help / color / mirror / Atom feed
From: Aaron Merey via Gdb-patches <gdb-patches@sourceware.org>
To: gdb-patches@sourceware.org
Subject: [PATCH] gdb/elfread.c: Use bfd filename instead of objfile->original_name
Date: Fri,  1 Apr 2022 16:07:51 -0400	[thread overview]
Message-ID: <20220401200751.242370-1-amerey@redhat.com> (raw)

The call to debuginfod_debuginfo_query in elf_symfile_read is given
objfile->original_name as the filename to print when downloading the
objfile's debuginfo.

In some cases original_name is prefixed with gdb's working directory
even though the objfile is not located in the working directory. This
causes debuginfod to display the wrong path of the objfile during a download.

Fix this by using the objfile's bfd filename instead.
---
 gdb/elfread.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gdb/elfread.c b/gdb/elfread.c
index fb40032c505..3554e5d71a2 100644
--- a/gdb/elfread.c
+++ b/gdb/elfread.c
@@ -1286,13 +1286,14 @@ elf_symfile_read (struct objfile *objfile, symfile_add_flags symfile_flags)
 	{
 	  has_dwarf2 = false;
 	  const struct bfd_build_id *build_id = build_id_bfd_get (objfile->obfd);
+	  const char *filename = bfd_get_filename (objfile->obfd);
 
 	  if (build_id != nullptr)
 	    {
 	      gdb::unique_xmalloc_ptr<char> symfile_path;
 	      scoped_fd fd (debuginfod_debuginfo_query (build_id->data,
 							build_id->size,
-							objfile->original_name,
+							filename,
 							&symfile_path));
 
 	      if (fd.get () >= 0)
@@ -1302,7 +1303,7 @@ elf_symfile_read (struct objfile *objfile, symfile_add_flags symfile_flags)
 
 		  if (debug_bfd == nullptr)
 		    warning (_("File \"%s\" from debuginfod cannot be opened as bfd"),
-			     objfile->original_name);
+			     filename);
 		  else if (build_id_verify (debug_bfd.get (), build_id->size, build_id->data))
 		    {
 		      symbol_file_add_separate (debug_bfd.get (), symfile_path.get (),
-- 
2.35.1


             reply	other threads:[~2022-04-01 20:08 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-04-01 20:07 Aaron Merey via Gdb-patches [this message]
2022-07-05 22:43 ` Aaron Merey via Gdb-patches
2022-08-26 21:24   ` [PING][PATCH] " Aaron Merey via Gdb-patches
2022-08-30 18:01     ` Tom Tromey
2022-08-31  0:45       ` Aaron Merey via Gdb-patches

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=20220401200751.242370-1-amerey@redhat.com \
    --to=gdb-patches@sourceware.org \
    --cc=amerey@redhat.com \
    /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