diff mbox series

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

Message ID 20210609111951.886083-1-stli@linux.ibm.com
State Committed
Commit 51a3df5e358f3229b9f4e9ad1721fee591d4d29e
Headers show
Series Fix elf/tst-tls9-static after libdl cleanups. | expand

Checks

Context Check Description
dj/TryBot-apply_patch success Patch applied to master at the time it was sent

Commit Message

Stefan Liebler June 9, 2021, 11:19 a.m. UTC
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(-)

Comments

Florian Weimer June 9, 2021, 11:24 a.m. UTC | #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
Stefan Liebler June 9, 2021, 11:40 a.m. UTC | #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
diff mbox series

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