From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id thvMB8m+xGJF2QwAWB0awg (envelope-from ) for ; Tue, 05 Jul 2022 18:44:25 -0400 Received: by simark.ca (Postfix, from userid 112) id 0E2ED1E22D; Tue, 5 Jul 2022 18:44:25 -0400 (EDT) Authentication-Results: simark.ca; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha256 header.s=default header.b=gQ0RDZXy; dkim-atps=neutral X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RDNS_DYNAMIC,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from sourceware.org (ip-8-43-85-97.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id 9A6C11E15C for ; Tue, 5 Jul 2022 18:44:24 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 3C67F385742E for ; Tue, 5 Jul 2022 22:44:24 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3C67F385742E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1657061064; bh=oLYaVdXTYlTaYgx18ZtunYxCe1WvpsWcLzInil2Wrcc=; h=References:In-Reply-To:Date:Subject:To:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=gQ0RDZXyKMCsfz/Ssz+zKNzR6UPLXfTbefrh6ip/T3BdO178GfzxGhNkLRHGz/uyC r0ntCOj4PsqEl4zgsGQvl6E8zv5WDpOzW9/mlnJQ7i71bFoqWyNw+1tpiFcF0O/uU4 348F8QitUyxECNmj38GHTOCYN0TqWv8fgk/zGmsg= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 5223B385841A for ; Tue, 5 Jul 2022 22:44:05 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 5223B385841A Received: from mail-qt1-f199.google.com (mail-qt1-f199.google.com [209.85.160.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-606-06xQAZzZOu-HUdhWjbMklg-1; Tue, 05 Jul 2022 18:43:57 -0400 X-MC-Unique: 06xQAZzZOu-HUdhWjbMklg-1 Received: by mail-qt1-f199.google.com with SMTP id e14-20020ac8010e000000b00316edc1a792so10596781qtg.18 for ; Tue, 05 Jul 2022 15:43:57 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to; bh=oLYaVdXTYlTaYgx18ZtunYxCe1WvpsWcLzInil2Wrcc=; b=65oP7vfkS8kzvpPrwz49uPoGuEqTGxWDW/4rhMrPl6zaEnWUCwTZwb8kZKfpDeqpOl ditb6oEyPcbVtMyfLZOMxcQogwXHPnu+S/Od7HUX+VN2JO7owxodhr7WkoYnhGFGcZ6M SbsG+XyYBD3Z7vqKBTMZVFDzR9UEkoa3efX71dwFSrGnVQ34rbhMqMsCc7myAHb1sytg hcYR+Tu6OEwbIpoYpaXDjLTa+Umg7lEON9AFG3ALXOzxqis4uaq6m6zR95WJMgbOyJFx KRRSvY5oluruAt6SBUVTKuyX3ruJaDgcISBG4UDXMx8f2yBRcE+sx9OUFfWpIPFCnBs0 3AiQ== X-Gm-Message-State: AJIora+fZ2kHBml2BqL/P9GWIrlhri6NxILm3htUkzXVoCP1WOfJS8+T HVxZ5gqwquAY0NH62N2jJphX8Pv2yqzivXcAfBOcd39Hw7pGpDkJatfX2mN7ofqwFXskfcXlgU3 4+6VIrpZqkDJFtwmxp6lgTjg9lJaSsSbmmRyH X-Received: by 2002:ad4:4eaa:0:b0:470:a8f9:c5dd with SMTP id ed10-20020ad44eaa000000b00470a8f9c5ddmr35014051qvb.100.1657061036925; Tue, 05 Jul 2022 15:43:56 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vXFUq/IFc0JpnGw8a4r/khANsgAEIf67btkjf9BQhjrCwbFEfozgRKXf1TruV8klQsbMHYBkhMZu9MDfNmblA= X-Received: by 2002:ad4:4eaa:0:b0:470:a8f9:c5dd with SMTP id ed10-20020ad44eaa000000b00470a8f9c5ddmr35014039qvb.100.1657061036682; Tue, 05 Jul 2022 15:43:56 -0700 (PDT) MIME-Version: 1.0 References: <20220401200751.242370-1-amerey@redhat.com> In-Reply-To: <20220401200751.242370-1-amerey@redhat.com> Date: Tue, 5 Jul 2022 18:43:46 -0400 Message-ID: Subject: Re: [PATCH] gdb/elfread.c: Use bfd filename instead of objfile->original_name To: gdb-patches@sourceware.org X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="UTF-8" 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: , From: Aaron Merey via Gdb-patches Reply-To: Aaron Merey Errors-To: gdb-patches-bounces+public-inbox=simark.ca@sourceware.org Sender: "Gdb-patches" Ping Thanks, Aaron On Fri, Apr 1, 2022 at 4:08 PM Aaron Merey wrote: > > 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 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 >