From: Carlos O'Donell <carlos@redhat.com>
To: Fangrui Song <maskray@google.com>, "H.J. Lu" <hjl.tools@gmail.com>
Cc: libc-alpha@sourceware.org
Subject: Re: [PATCH] elf: Build tst-relr-mod[34]a.so with $(LDFLAGS-rpath-ORIGIN)
Date: Tue, 1 Nov 2022 09:57:05 -0400 [thread overview]
Message-ID: <3962c07f-9dc4-51ad-0741-c6fd9803fef9@redhat.com> (raw)
In-Reply-To: <20221028235744.jl4gqkhox42dyihi@google.com>
On 10/28/22 19:57, Fangrui Song via Libc-alpha wrote:
> On 2022-10-28, H.J. Lu via Libc-alpha wrote:
>> When --enable-hardcoded-path-in-tests is used only with DT_RUNPATH,
>> elf/tst-relr3 and elf/tst-relr4 failed to run. Their dependency
>> libraries, tst-relr-mod3a.so and tst-relr-mod4a.so, are failed to
>> load since DT_RUNPATH on executable doesn't apply to them. Build
>> tst-relr-mod3a.so and tst-relr-mod4a.so with $(LDFLAGS-rpath-ORIGIN)
>> to add DT_RUNPATH for their dependency libraries.
>> ---
>> elf/Makefile | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/elf/Makefile b/elf/Makefile
>> index 86c960cf8a..5f7d222bb1 100644
>> --- a/elf/Makefile
>> +++ b/elf/Makefile
>> @@ -2872,7 +2872,7 @@ $(objpfx)tst-relr-mod3b.so: $(objpfx)tst-relr-mod3b.os
>> $(objpfx)tst-relr-mod3a.so: $(objpfx)tst-relr-mod3a.os \
>> $(objpfx)tst-relr-mod3b.so
>> $(LINK.o) -nostdlib -nostartfiles -Wl,-z,pack-relative-relocs \
>> - $(LDFLAGS-soname-fname) \
>> + $(LDFLAGS-soname-fname) $(LDFLAGS-rpath-ORIGIN) \
>> -shared -o $@.new $(filter-out $(map-file),$^)
>> $(call after-link,$@.new)
>> mv -f $@.new $@
>> @@ -2891,7 +2891,7 @@ $(objpfx)tst-relr-mod4b.so: $(objpfx)tst-relr-mod4b.os
>> $(objpfx)tst-relr-mod4a.so: $(objpfx)tst-relr-mod4a.os \
>> $(objpfx)tst-relr-mod4b.so
>> $(LINK.o) -nostdlib -nostartfiles -Wl,-z,pack-relative-relocs \
>> - $(LDFLAGS-soname-fname) \
>> + $(LDFLAGS-soname-fname) $(LDFLAGS-rpath-ORIGIN) \
>> -shared -o $@.new $(filter-out $(map-file),$^)
>> $(call after-link,$@.new)
>> mv -f $@.new $@
>> --
>> 2.37.3
>
> When --enable-hardcoded-path-in-tests is specified, the test is not run
> with `ld.so --library-path`. elf/tst-relr-mod3a.so's DT_NEEDED
> elf/tst-relr-mod3b.so fails to load. This patch makes
> elf/tst-relr-mod3a.so have `Library runpath: [$ORIGIN]` and allows
> elf/tst-relr-mod3b.so to be loaded.
>
> Tested that the tests pass with or without --enable-hardcoded-path-in-tests.
>
> Reviewed-by: Fangrui Song <maskray@google.com>
>
Thanks to the both of you for a prompt fix!
This returns my Fedora testers back to clean runs and helps me review more patches :-)
--
Cheers,
Carlos.
prev parent reply other threads:[~2022-11-01 13:57 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-28 22:16 H.J. Lu
2022-10-28 23:57 ` Fangrui Song
2022-11-01 13:57 ` Carlos O'Donell [this message]
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=3962c07f-9dc4-51ad-0741-c6fd9803fef9@redhat.com \
--to=carlos@redhat.com \
--cc=hjl.tools@gmail.com \
--cc=libc-alpha@sourceware.org \
--cc=maskray@google.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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).