Fix elf/tst-tls9-static after libdl cleanups.

Message ID 20210609111951.886083-1-stli@linux.ibm.com
State New
Headers show
Series
  • Fix elf/tst-tls9-static after libdl cleanups.
Related show

Commit Message

Adhemerval Zanella via Libc-alpha June 9, 2021, 11:19 a.m.
The testcase elf/tst-tls9-static sometimes fails with:
cannot open 'tst-tlsmod5.so': tst-tlsmod5.so: cannot open shared object file: No such file or directory
cannot open 'tst-tlsmod6.so': tst-tlsmod6.so: cannot open shared object file: No such file or directory

After recent commit
6f1c701026287f6928d3bdd1aea7359308635abe
"dlfcn: Cleanups after -ldl is no longer required"
the libdl variable is not set anymore and thus the
dependencies were missing.
---
 elf/Makefile | 2 --
 1 file changed, 2 deletions(-)

-- 
2.30.2

Comments

Adhemerval Zanella via Libc-alpha June 9, 2021, 11:24 a.m. | #1
* Stefan Liebler:

> The testcase elf/tst-tls9-static sometimes fails with:

> cannot open 'tst-tlsmod5.so': tst-tlsmod5.so: cannot open shared object file: No such file or directory

> cannot open 'tst-tlsmod6.so': tst-tlsmod6.so: cannot open shared object file: No such file or directory

>

> After recent commit

> 6f1c701026287f6928d3bdd1aea7359308635abe

> "dlfcn: Cleanups after -ldl is no longer required"

> the libdl variable is not set anymore and thus the

> dependencies were missing.

> ---

>  elf/Makefile | 2 --

>  1 file changed, 2 deletions(-)

>

> diff --git a/elf/Makefile b/elf/Makefile

> index e9788d3d4f..6dbb03bbb2 100644

> --- a/elf/Makefile

> +++ b/elf/Makefile

> @@ -1050,10 +1050,8 @@ unload7-ENV = MALLOC_PERTURB_=85

>  

>  $(objpfx)unload8.out: $(objpfx)unload8mod1.so $(objpfx)unload8mod1x.so

>  

> -ifdef libdl

>  $(objpfx)tst-tls9-static: $(common-objpfx)dlfcn/libdl.a

>  $(objpfx)tst-tls9-static.out: $(objpfx)tst-tlsmod5.so $(objpfx)tst-tlsmod6.so

> -endif


Sorry about that.  Patch looks fine.

That libdl.a reference is stale; I'll see if I can post a patch to
remove all them in one go.

Thanks,
Florian
Adhemerval Zanella via Libc-alpha June 9, 2021, 11:40 a.m. | #2
On 09/06/2021 13:24, Florian Weimer wrote:
> * Stefan Liebler:

> 

>> The testcase elf/tst-tls9-static sometimes fails with:

>> cannot open 'tst-tlsmod5.so': tst-tlsmod5.so: cannot open shared object file: No such file or directory

>> cannot open 'tst-tlsmod6.so': tst-tlsmod6.so: cannot open shared object file: No such file or directory

>>

>> After recent commit

>> 6f1c701026287f6928d3bdd1aea7359308635abe

>> "dlfcn: Cleanups after -ldl is no longer required"

>> the libdl variable is not set anymore and thus the

>> dependencies were missing.

>> ---

>>  elf/Makefile | 2 --

>>  1 file changed, 2 deletions(-)

>>

>> diff --git a/elf/Makefile b/elf/Makefile

>> index e9788d3d4f..6dbb03bbb2 100644

>> --- a/elf/Makefile

>> +++ b/elf/Makefile

>> @@ -1050,10 +1050,8 @@ unload7-ENV = MALLOC_PERTURB_=85

>>  

>>  $(objpfx)unload8.out: $(objpfx)unload8mod1.so $(objpfx)unload8mod1x.so

>>  

>> -ifdef libdl

>>  $(objpfx)tst-tls9-static: $(common-objpfx)dlfcn/libdl.a

>>  $(objpfx)tst-tls9-static.out: $(objpfx)tst-tlsmod5.so $(objpfx)tst-tlsmod6.so

>> -endif

> 

> Sorry about that.  Patch looks fine.

> 

> That libdl.a reference is stale; I'll see if I can post a patch to

> remove all them in one go.

> 

> Thanks,

> Florian

> 


Okay. I've just pushed the patch.
Please remove all those libdl.a references in one go.

Thanks,
Stefan

Patch

diff --git a/elf/Makefile b/elf/Makefile
index e9788d3d4f..6dbb03bbb2 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -1050,10 +1050,8 @@  unload7-ENV = MALLOC_PERTURB_=85
 
 $(objpfx)unload8.out: $(objpfx)unload8mod1.so $(objpfx)unload8mod1x.so
 
-ifdef libdl
 $(objpfx)tst-tls9-static: $(common-objpfx)dlfcn/libdl.a
 $(objpfx)tst-tls9-static.out: $(objpfx)tst-tlsmod5.so $(objpfx)tst-tlsmod6.so
-endif
 
 ifeq ($(have-z-execstack),yes)
 $(objpfx)tst-execstack.out: $(objpfx)tst-execstack-mod.so