| Message ID | 877cbut6lr.fsf@oldenburg3.str.redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | elf: Fix tst-dlopen-tlsreinit1.out test dependency | expand |
On Mon, Sep 2, 2024 at 11:32 AM Florian Weimer <fweimer@redhat.com> wrote: > > Fixes commit 5097cd344fd243fb8deb6dec96e8073753f962f9 > ("elf: Avoid re-initializing already allocated TLS in dlopen > (bug 31717)"). > > Reported-by: Patsy Franklin <patsy@redhat.com> > LGTM. Reviewed by: Patsy Franklin <patsy@redhat.com> > --- > elf/Makefile | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/elf/Makefile b/elf/Makefile > index 00622ace9d..9ea4baf323 100644 > --- a/elf/Makefile > +++ b/elf/Makefile > @@ -3145,7 +3145,7 @@ $(objpfx)tst-dlopen-tlsreinit4: \ > # tst-dlopen-tlsreinitmod3.so. The dependency is provided via > # $(objpfx)tst-dlopen-tlsreinitmod1.so. > tst-dlopen-tlsreinitmod2.so-no-z-defs = yes > -$(objpfx)tst-dlopen-tlsreinit.out: $(objpfx)tst-dlopen-tlsreinitmod1.so \ > +$(objpfx)tst-dlopen-tlsreinit1.out: $(objpfx)tst-dlopen-tlsreinitmod1.so \ OK. Matches the downstream patch I made for this issue. > $(objpfx)tst-dlopen-tlsreinitmod2.so $(objpfx)tst-dlopen-tlsreinitmod3.so > # Reuse an audit module which provides ample debug logging. > $(objpfx)tst-dlopen-tlsreinit3.out: $(objpfx)tst-auditmod1.so > > base-commit: 3844cdc33093dbe1e33ddb831eada9bdb4a482b9 >
diff --git a/elf/Makefile b/elf/Makefile index 00622ace9d..9ea4baf323 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -3145,7 +3145,7 @@ $(objpfx)tst-dlopen-tlsreinit4: \ # tst-dlopen-tlsreinitmod3.so. The dependency is provided via # $(objpfx)tst-dlopen-tlsreinitmod1.so. tst-dlopen-tlsreinitmod2.so-no-z-defs = yes -$(objpfx)tst-dlopen-tlsreinit.out: $(objpfx)tst-dlopen-tlsreinitmod1.so \ +$(objpfx)tst-dlopen-tlsreinit1.out: $(objpfx)tst-dlopen-tlsreinitmod1.so \ $(objpfx)tst-dlopen-tlsreinitmod2.so $(objpfx)tst-dlopen-tlsreinitmod3.so # Reuse an audit module which provides ample debug logging. $(objpfx)tst-dlopen-tlsreinit3.out: $(objpfx)tst-auditmod1.so
Fixes commit 5097cd344fd243fb8deb6dec96e8073753f962f9 ("elf: Avoid re-initializing already allocated TLS in dlopen (bug 31717)"). Reported-by: Patsy Franklin <patsy@redhat.com> --- elf/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) base-commit: 3844cdc33093dbe1e33ddb831eada9bdb4a482b9