From: Florian Weimer <fweimer@redhat.com>
To: Adhemerval Zanella via Libc-alpha <libc-alpha@sourceware.org>
Cc: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Subject: Re: [PATCH] elf: Restore how vDSO dependency is printed with LD_TRACE_LOADED_OBJECTS (BZ #29539)
Date: Wed, 31 Aug 2022 08:42:07 +0200 [thread overview]
Message-ID: <87r10w3oe8.fsf@oldenburg.str.redhat.com> (raw)
In-Reply-To: <20220830163905.2578396-1-adhemerval.zanella@linaro.org> (Adhemerval Zanella via Libc-alpha's message of "Tue, 30 Aug 2022 13:39:05 -0300")
* Adhemerval Zanella via Libc-alpha:
> The d7703d3176d225d5743b21811d888619eba39e82 changed how vDSO like
> dependencies are printed, instead of just the name and address it
> follows other libraries mode and prints 'name => path'.
>
> Unfortunately, this broke some ldd consumer that uses the output to
> filter out the program's dependencies. For instance CMake
> bundleutilities module [1], where GetPrequirite uses the regex to filter
> out 'name => path' [2].
>
> This patch restore the previous way to print just the name and the
> mapping address.
>
> Checked on x86_64-linux-gnu.
>
> [1] https://github.com/Kitware/CMake/tree/master/Tests/BundleUtilities
> [2] https://github.com/Kitware/CMake/blob/master/Modules/GetPrerequisites.cmake#L733
> ---
> elf/rtld.c | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/elf/rtld.c b/elf/rtld.c
> index cbbaf4a331..3e771a93d8 100644
> --- a/elf/rtld.c
> +++ b/elf/rtld.c
> @@ -2122,6 +2122,12 @@ dl_main (const ElfW(Phdr) *phdr,
> if (l->l_faked)
> /* The library was not found. */
> _dl_printf ("\t%s => not found\n", l->l_libname->name);
> + else if (strcmp (l->l_libname->name, l->l_name) == 0)
> + /* Print vDSO like libraries without duplicate name. Some
> + consumers depend of this format. */
> + _dl_printf ("\t%s (0x%0*Zx)\n", l->l_libname->name,
> + (int) sizeof l->l_map_start * 2,
> + (size_t) l->l_map_start);
> else
> _dl_printf ("\t%s => %s (0x%0*Zx)\n",
> DSO_FILENAME (l->l_libname->name),
Looks okay, thanks.
Reviewed-by: Florian Weimer <fweimer@redhat.com>
Florian
WARNING: multiple messages have this Message-ID
From: Florian Weimer <fweimer@redhat.com>
To: Adhemerval Zanella via Libc-alpha <libc-alpha@sourceware.org>
Subject: Re: [PATCH] elf: Restore how vDSO dependency is printed with LD_TRACE_LOADED_OBJECTS (BZ #29539)
Date: Wed, 31 Aug 2022 08:42:07 +0200 [thread overview]
Message-ID: <87r10w3oe8.fsf@oldenburg.str.redhat.com> (raw)
Message-ID: <20220831064207.DMTnqMsih390XX9B5DFS5oe9gJ1veK8Q2Fj32ccuph4@z> (raw)
In-Reply-To: <20220830163905.2578396-1-adhemerval.zanella@linaro.org> (Adhemerval Zanella via Libc-alpha's message of "Tue, 30 Aug 2022 13:39:05 -0300")
* Adhemerval Zanella via Libc-alpha:
> The d7703d3176d225d5743b21811d888619eba39e82 changed how vDSO like
> dependencies are printed, instead of just the name and address it
> follows other libraries mode and prints 'name => path'.
>
> Unfortunately, this broke some ldd consumer that uses the output to
> filter out the program's dependencies. For instance CMake
> bundleutilities module [1], where GetPrequirite uses the regex to filter
> out 'name => path' [2].
>
> This patch restore the previous way to print just the name and the
> mapping address.
>
> Checked on x86_64-linux-gnu.
>
> [1] https://github.com/Kitware/CMake/tree/master/Tests/BundleUtilities
> [2] https://github.com/Kitware/CMake/blob/master/Modules/GetPrerequisites.cmake#L733
> ---
> elf/rtld.c | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/elf/rtld.c b/elf/rtld.c
> index cbbaf4a331..3e771a93d8 100644
> --- a/elf/rtld.c
> +++ b/elf/rtld.c
> @@ -2122,6 +2122,12 @@ dl_main (const ElfW(Phdr) *phdr,
> if (l->l_faked)
> /* The library was not found. */
> _dl_printf ("\t%s => not found\n", l->l_libname->name);
> + else if (strcmp (l->l_libname->name, l->l_name) == 0)
> + /* Print vDSO like libraries without duplicate name. Some
> + consumers depend of this format. */
> + _dl_printf ("\t%s (0x%0*Zx)\n", l->l_libname->name,
> + (int) sizeof l->l_map_start * 2,
> + (size_t) l->l_map_start);
> else
> _dl_printf ("\t%s => %s (0x%0*Zx)\n",
> DSO_FILENAME (l->l_libname->name),
Looks okay, thanks.
Reviewed-by: Florian Weimer <fweimer@redhat.com>
Florian
next prev parent reply other threads:[~2022-08-31 6:42 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-30 16:39 Adhemerval Zanella
2022-08-31 6:42 ` Florian Weimer [this message]
2022-08-31 6:42 ` Florian Weimer
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=87r10w3oe8.fsf@oldenburg.str.redhat.com \
--to=fweimer@redhat.com \
--cc=adhemerval.zanella@linaro.org \
--cc=libc-alpha@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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).