[PATCH] elf: don't clobber ld.so.conf in tst-glibc-hwcaps-prepend-cache [BZ #34210]

[Andreas K. Huettel]

Am Samstag, 6. Juni 2026, 21:35:36 Mitteleuropäische Sommerzeit schrieb Sam James:
> dbe5065f2166be20e57a24f246a40d50e001a05d and ae589cb84df10825fc545a45c7007a5f79409bf1
> cater for setups where ld.so.conf{,.d} is required to find runtime support
> libraries, but tst-glibc-hwcaps-prepend-cache clobbers the created ld.so.conf
> with its own entry.
> 
> Fix it to instead use the ld.so.conf.d created in ae589cb84df10825fc545a45c7007a5f79409bf1
> to co-exist with existing entries.

Reviewed-by: Andreas K. Hüttel <dilfridge@gentoo.org>

tl;dr: If you create new tests, please only add to ld.so.conf via creating files in
ld.so.conf.d; we need the base settings in ld.so.conf on some architectures so
the binaries find libgcc_d.so ... It might work for *you* but not on arm-eabihf ...

Likely also related to 
Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=31901

> 
> Bug: https://bugs.gentoo.org/976773
> Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=34210
> Tested-by: Andreas K. Hüttel <dilfridge@gentoo.org>
> Reported-by: Eli Schwartz <eschwartz@gentoo.org>
> Signed-off-by: Sam James <sam@gentoo.org>
> ---
>  elf/tst-glibc-hwcaps-prepend-cache.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/elf/tst-glibc-hwcaps-prepend-cache.c b/elf/tst-glibc-hwcaps-prepend-cache.c
> index 8a80ceed3e..98bd1ef99e 100644
> --- a/elf/tst-glibc-hwcaps-prepend-cache.c
> +++ b/elf/tst-glibc-hwcaps-prepend-cache.c
> @@ -46,7 +46,7 @@ do_test (void)
>  
>    {
>      /* Install the default implementation of libmarkermod1.so.  */
> -    char *conf_path = xasprintf ("%s/ld.so.conf", support_sysconfdir_prefix);
> +    char *conf_path = xasprintf ("%s/ld.so.conf.d/hwcaps.conf", support_sysconfdir_prefix);
>      xmkdirp (support_sysconfdir_prefix, 0777);
>      support_write_file_string (conf_path, "/glibc-test/lib\n");
>      free (conf_path);
> 


-- 
Andreas K. Hüttel
dilfridge@gentoo.org
Gentoo Linux developer
(council, toolchain, base-system, perl, libreoffice)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 1018 bytes
Desc: This is a digitally signed message part.
URL: <https://sourceware.org/pipermail/libc-alpha/attachments/20260606/39b2406c/attachment-0001.sig>