This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
Re: [PATCH] dlfcn: Add dlinfo_soname to obtain the soname for a handle (was: Re: [PATCH] dlfcn: Add dlinfo_sname to obtain the soname for a handle)
- From: Adhemerval Zanella <adhemerval dot zanella at linaro dot org>
- To: libc-alpha at sourceware dot org
- Date: Mon, 16 Dec 2019 17:17:01 -0300
- Subject: Re: [PATCH] dlfcn: Add dlinfo_soname to obtain the soname for a handle (was: Re: [PATCH] dlfcn: Add dlinfo_sname to obtain the soname for a handle)
- References: <87tv8klnpq.fsf@oldenburg2.str.redhat.com> <29b364d314abfdd90a0bcdca191bec18f6ff3f05.camel@opteya.com> <87d0f8lmcu.fsf_-_@oldenburg2.str.redhat.com>
On 07/10/2019 10:24, Florian Weimer wrote:
> * Yann Droneaud:
>
>> commit title contains a typo.
>
> Thanks, fixed.
>
>>> +* The dlinfo_soname function has been added to the <dlfcn.h> header file.
>>> +
>>
>> What about using name dlfname() to match Dl_info::dli_fname field ?
>
> dli_fname corresponds to l_name in the link map, which is *not* the
> soname, so this would be misleading.
>
>>> +/* Return a string with the soname for the object identified by HANDLE
>>> + (which must have been obtained from dlopen or dlmopen). The result
>>> + is NULL if the object does not have a soname (either an explicit or
>>> + an implied one). */
>>> +extern const char *dlinfo_soname (void *handle) __THROW __nonnull ((1));
>>> +
>>>
>>
>> How will it behave with pseudo handle RTLD_DEFAULT and RTLD_NEXT ?
>
> These handles are not allowed because they have not been returned from
> dlopen or dlmopen. I do not want to make this function
> caller-sensitive.
>
>> It should also be noted the returned string is only valid during the
>> lifetime of the handle.
>
> That seems reasonable. New patch below.
>
> Thanks,
> Florian
>
> 8<-------------------------------------------------------------------->8
> From: Florian Weimer <fweimer@redhat.com>
> Date: Mon, 7 Oct 2019 15:22:08 +0200
> Subject: [PATCH] dlfcn: Add dlinfo_soname to obtain the soname for a handle
>
> A separate function (as opposed to enhancing dlinfo) provides type
> safety.
Look ok, with a suggestion below. You may need to rerun update-abi for some
architectures. And this patch also does not fully explain the need to add
RTLD_DL_HANDLE.
> ---
> NEWS | 2 +
> dlfcn/Makefile | 24 +++++--
> dlfcn/Versions | 6 ++
> dlfcn/dlfcn.h | 9 +++
> dlfcn/dlinfo_soname.c | 35 +++++++++
> dlfcn/tst-dlinfo_soname-static.c | 57 +++++++++++++++
> dlfcn/tst-dlinfo_soname.c | 72 +++++++++++++++++++
> sysdeps/mach/hurd/i386/libc.abilist | 1 +
> sysdeps/unix/sysv/linux/aarch64/libc.abilist | 1 +
> sysdeps/unix/sysv/linux/alpha/libc.abilist | 1 +
> sysdeps/unix/sysv/linux/arm/be/libc.abilist | 1 +
> sysdeps/unix/sysv/linux/arm/le/libc.abilist | 1 +
> sysdeps/unix/sysv/linux/csky/libc.abilist | 1 +
> sysdeps/unix/sysv/linux/hppa/libc.abilist | 1 +
> sysdeps/unix/sysv/linux/i386/libc.abilist | 1 +
> sysdeps/unix/sysv/linux/ia64/libc.abilist | 1 +
> .../sysv/linux/m68k/coldfire/libc.abilist | 1 +
> .../unix/sysv/linux/m68k/m680x0/libc.abilist | 1 +
> .../sysv/linux/microblaze/be/libc.abilist | 1 +
> .../sysv/linux/microblaze/le/libc.abilist | 1 +
> .../sysv/linux/mips/mips32/fpu/libc.abilist | 1 +
> .../sysv/linux/mips/mips32/nofpu/libc.abilist | 1 +
> .../sysv/linux/mips/mips64/n32/libc.abilist | 1 +
> .../sysv/linux/mips/mips64/n64/libc.abilist | 1 +
> sysdeps/unix/sysv/linux/nios2/libc.abilist | 1 +
> .../linux/powerpc/powerpc32/fpu/libc.abilist | 1 +
> .../powerpc/powerpc32/nofpu/libc.abilist | 1 +
> .../linux/powerpc/powerpc64/be/libc.abilist | 1 +
> .../linux/powerpc/powerpc64/le/libc.abilist | 1 +
> .../unix/sysv/linux/riscv/rv64/libc.abilist | 1 +
> .../unix/sysv/linux/s390/s390-32/libc.abilist | 1 +
> .../unix/sysv/linux/s390/s390-64/libc.abilist | 1 +
> sysdeps/unix/sysv/linux/sh/be/libc.abilist | 1 +
> sysdeps/unix/sysv/linux/sh/le/libc.abilist | 1 +
> .../sysv/linux/sparc/sparc32/libc.abilist | 1 +
> .../sysv/linux/sparc/sparc64/libc.abilist | 1 +
> .../unix/sysv/linux/x86_64/64/libc.abilist | 1 +
> .../unix/sysv/linux/x86_64/x32/libc.abilist | 1 +
> 38 files changed, 231 insertions(+), 5 deletions(-)
> create mode 100644 dlfcn/dlinfo_soname.c
> create mode 100644 dlfcn/tst-dlinfo_soname-static.c
> create mode 100644 dlfcn/tst-dlinfo_soname.c
>
> diff --git a/NEWS b/NEWS
> index 2ea7378d10..543791b6ab 100644
> --- a/NEWS
> +++ b/NEWS
> @@ -24,6 +24,8 @@ Major new features:
> * The dladdr1 function accepts a new flag, RTLD_DL_HANDLE, to obtain a
> handle (as used with dlsym and other functions) based on an address.
>
> +* The dlinfo_soname function has been added to the <dlfcn.h> header file.
> +
> Deprecated and removed features, and other changes affecting compatibility:
>
> * The totalorder and totalordermag functions, and the corresponding
Ok.
> diff --git a/dlfcn/Makefile b/dlfcn/Makefile
> index 2169a77f83..1c4becfe03 100644
> --- a/dlfcn/Makefile
> +++ b/dlfcn/Makefile
> @@ -23,8 +23,11 @@ headers := bits/dlfcn.h dlfcn.h
> extra-libs := libdl
> libdl-routines := dlopen dlclose dlsym dlvsym dlerror dladdr dladdr1 dlinfo \
> dlmopen dlfcn dlfreeres
> -routines := $(patsubst %,s%,$(filter-out dlfcn,$(libdl-routines)))
> -elide-routines.os := $(routines)
> +
> +# Most routines currently end up in libdl only (for shared builds).
> +routines-for-libdl := $(patsubst %,s%,$(filter-out dlfcn,$(libdl-routines)))
> +routines := $(routines-for-libdl) dlinfo_soname
> +elide-routines.os := $(routines-for-libdl)
>
> extra-libs-others := libdl
>
Ok.
> @@ -36,7 +39,9 @@ endif
> ifeq (yes,$(build-shared))
> tests = glrefmain failtest tst-dladdr default errmsg1 tstcxaatexit \
> bug-dlopen1 bug-dlsym1 tst-dlinfo bug-atexit1 bug-atexit2 \
> - bug-atexit3 tstatexit bug-dl-leaf tst-rec-dlopen tst-dladdr1-handle
> + bug-atexit3 tstatexit bug-dl-leaf tst-rec-dlopen tst-dladdr1-handle \
> + tst-dlinfo_soname
> +tests-static = tst-dlinfo_soname-static
> endif
> modules-names = glreflib1 glreflib2 glreflib3 failtestmod defaultmod1 \
> defaultmod2 errmsg1mod modatexit modcxaatexit \
Ok.
> @@ -49,14 +54,17 @@ glreflib2.so-no-z-defs = yes
> errmsg1mod.so-no-z-defs = yes
>
> ifeq (yes,$(build-shared))
> -tests += tststatic tststatic2 tststatic3 tststatic4 tststatic5
> -tests-static += tststatic tststatic2 tststatic3 tststatic4 tststatic5
> +tests += tststatic tststatic2 tststatic3 tststatic4 tststatic5 \
> + tst-dlinfo_soname-static
> +tests-static += tststatic tststatic2 tststatic3 tststatic4 tststatic5 \
> + tst-dlinfo_soname-static
> modules-names += modstatic modstatic2 modstatic3 modstatic5
> tststatic-ENV = LD_LIBRARY_PATH=$(objpfx):$(common-objpfx):$(common-objpfx)elf
> tststatic2-ENV = $(tststatic-ENV)
> tststatic3-ENV = $(tststatic-ENV)
> tststatic4-ENV = $(tststatic-ENV)
> tststatic5-ENV = $(tststatic-ENV)
> +tst-dlinfo_soname-static-ENV = $(tststatic-ENV)
>
> ifneq (,$(CXX))
> modules-names += bug-atexit3-lib
Ok.
> @@ -154,3 +162,9 @@ $(objpfx)tst-rec-dlopen.out: $(objpfx)moddummy1.so $(objpfx)moddummy2.so
>
> $(objpfx)tst-dladdr1-handle: $(libdl)
> $(objpfx)tst-dladdr1-handle.out: $(objpfx)moddummy1.so $(objpfx)moddummy2.so
> +
> +$(objpfx)tst-dlinfo_soname: $(libdl)
> +$(objpfx)tst-dlinfo_soname.out: $(objpfx)moddummy1.so $(objpfx)moddummy2.so
> +$(objpfx)tst-dlinfo_soname-static: $(objpfx)libdl.a
> +$(objpfx)tst-dlinfo_soname-static.out: \
> + $(objpfx)moddummy1.so $(objpfx)moddummy2.so
Ok.
> diff --git a/dlfcn/Versions b/dlfcn/Versions
> index 1df6925a92..20146054d1 100644
> --- a/dlfcn/Versions
> +++ b/dlfcn/Versions
> @@ -1,3 +1,9 @@
> +libc {
> + GLIBC_2.31 {
> + dlinfo_soname;
> + }
> +}
> +
> libdl {
> GLIBC_2.0 {
> dladdr; dlclose; dlerror; dlopen; dlsym;
OK.
> diff --git a/dlfcn/dlfcn.h b/dlfcn/dlfcn.h
> index b657f2762f..b1ac4c9653 100644
> --- a/dlfcn/dlfcn.h
> +++ b/dlfcn/dlfcn.h
> @@ -199,6 +199,15 @@ typedef struct
> Dl_serpath dls_serpath[1]; /* Actually longer, dls_cnt elements. */
> # endif
> } Dl_serinfo;
> +
> +/* Return a string with the soname for the object identified by HANDLE
> + (which must have been obtained from dlopen, dlmopen, or dladdr1
> + with RTLD_DL_HANDLE). The result is NULL if the object does not
> + have a soname (either an explicit or an implied one). The returned
> + pointer is only valid as long as handle is valid (i.e., until
> + dlclose is called on it). */
> +extern const char *dlinfo_soname (void *handle) __THROW __nonnull ((1));
> +
> #endif /* __USE_GNU */
>
>
Ok.
> diff --git a/dlfcn/dlinfo_soname.c b/dlfcn/dlinfo_soname.c
> new file mode 100644
> index 0000000000..75a6833a28
> --- /dev/null
> +++ b/dlfcn/dlinfo_soname.c
> @@ -0,0 +1,35 @@
> +/* Obtain the soname of an object identified by its handle.
> + Copyright (C) 2019 Free Software Foundation, Inc.
> + This file is part of the GNU C Library.
> +
> + The GNU C Library is free software; you can redistribute it and/or
> + modify it under the terms of the GNU Lesser General Public
> + License as published by the Free Software Foundation; either
> + version 2.1 of the License, or (at your option) any later version.
> +
> + The GNU C Library is distributed in the hope that it will be useful,
> + but WITHOUT ANY WARRANTY; without even the implied warranty of
> + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> + Lesser General Public License for more details.
> +
> + You should have received a copy of the GNU Lesser General Public
> + License along with the GNU C Library; if not, see
> + <https://www.gnu.org/licenses/>. */
> +
> +#include <dlfcn.h>
> +#include <ldsodefs.h>
> +#include <link.h>
> +#include <string.h>
> +
> +const char *
> +dlinfo_soname (void *handle)
> +{
> + struct link_map *l = handle;
> + if (l->l_info[DT_SONAME] != NULL)
> + return ((const char *) D_PTR (l, l_info[DT_STRTAB])
> + + l->l_info[DT_SONAME]->d_un.d_val);> + else if (l->l_name != NULL && l->l_name[0] != '\0')
> + return __basename (l->l_name);
> + else
> + return NULL;
> +}
AFAIK the soname is already set it by either static initilization
for the tld_main_map, add_name_to_object for any other file loaded
object, or by setup_vdso for the vdso. So I think we can just use
the information already set in l_libname (as pldd does for instance):
return l->l_libname->name[0] != '\0' ? __basename (l->l_libname->name)
: NULL;
> diff --git a/dlfcn/tst-dlinfo_soname-static.c b/dlfcn/tst-dlinfo_soname-static.c
> new file mode 100644
> index 0000000000..e79125586a
> --- /dev/null
> +++ b/dlfcn/tst-dlinfo_soname-static.c
> @@ -0,0 +1,57 @@
> +/* Test for the dlinfo_soname function. Static version.
> + Copyright (C) 2019 Free Software Foundation, Inc.
> + This file is part of the GNU C Library.
> +
> + The GNU C Library is free software; you can redistribute it and/or
> + modify it under the terms of the GNU Lesser General Public
> + License as published by the Free Software Foundation; either
> + version 2.1 of the License, or (at your option) any later version.
> +
> + The GNU C Library is distributed in the hope that it will be useful,
> + but WITHOUT ANY WARRANTY; without even the implied warranty of
> + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> + Lesser General Public License for more details.
> +
> + You should have received a copy of the GNU Lesser General Public
> + License along with the GNU C Library; if not, see
> + <https://www.gnu.org/licenses/>. */
> +
> +#include <dlfcn.h>
> +#include <gnu/lib-names.h>
> +#include <link.h>
> +#include <stddef.h>
> +#include <stdlib.h>
> +#include <support/check.h>
> +#include <support/support.h>
> +#include <support/xdlfcn.h>
> +
> +static int
> +do_test (void)
> +{
> + Dl_info info;
> + void *handle;
> +
> + /* Check the soname of a library loaded by soname. */
> + void *moddummy1_handle = xdlopen ("moddummy1.so", RTLD_NOW);
> + TEST_COMPARE_STRING (dlinfo_soname (moddummy1_handle), "moddummy1.so");
> +
Ok.
> + /* This is an arbitrary symbol in libc.so. It is used to locate a
> + handle for libc.so only. */
> + void *ptr = xdlsym (moddummy1_handle, "grantpt");
> + if (dladdr1 (ptr, &info, &handle, RTLD_DL_HANDLE) == 0)
> + FAIL_EXIT1 ("dladdr1 for grantpt in namespace failed");
> + TEST_COMPARE_STRING (dlinfo_soname (handle), LIBC_SO);
> +
Ok.
> + /* Check the soname of a library loaded by full path. */
> + char *full_path = xasprintf ("%s/dlfcn/moddummy2.so", support_objdir_root);
> + void *moddummy2_handle = xdlopen (full_path, RTLD_NOW);
> + TEST_COMPARE_STRING (dlinfo_soname (moddummy2_handle), "moddummy2.so");
> +
> + xdlclose (moddummy2_handle);
> + free (full_path);
> + xdlclose (moddummy1_handle);
> +
> + return 0;
> +}
> +
> +#include <support/test-driver.c>
Ok.
> diff --git a/dlfcn/tst-dlinfo_soname.c b/dlfcn/tst-dlinfo_soname.c
> new file mode 100644
> index 0000000000..f9c635722b
> --- /dev/null
> +++ b/dlfcn/tst-dlinfo_soname.c
> @@ -0,0 +1,72 @@
> +/* Test for the dlinfo_soname function. Shared version.
> + Copyright (C) 2019 Free Software Foundation, Inc.
> + This file is part of the GNU C Library.
> +
> + The GNU C Library is free software; you can redistribute it and/or
> + modify it under the terms of the GNU Lesser General Public
> + License as published by the Free Software Foundation; either
> + version 2.1 of the License, or (at your option) any later version.
> +
> + The GNU C Library is distributed in the hope that it will be useful,
> + but WITHOUT ANY WARRANTY; without even the implied warranty of
> + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> + Lesser General Public License for more details.
> +
> + You should have received a copy of the GNU Lesser General Public
> + License along with the GNU C Library; if not, see
> + <https://www.gnu.org/licenses/>. */
> +
> +#include <dlfcn.h>
> +#include <gnu/lib-names.h>
> +#include <link.h>
> +#include <stddef.h>
> +#include <stdlib.h>
> +#include <support/check.h>
> +#include <support/support.h>
> +#include <support/xdlfcn.h>
> +
> +static void
> +local_function (void)
> +{
> +}
> +
> +static int
> +do_test (void)
> +{
> + Dl_info info;
> + void *handle;
> +
> + if (dladdr1 (&local_function, &info, &handle, RTLD_DL_HANDLE) == 0)
> + FAIL_EXIT1 ("dladdr1 for local_function failed");
> + /* The main program does not have a soname. */
> + TEST_VERIFY (dlinfo_soname (handle) == NULL);
Ok.
> +
> + /* Check the soname of libc. Use an obscure libc function as
> + reference, to avoid PLT stubs and similar constructs moving the
> + active definition to another object. */
> + void *ptr = xdlsym (NULL, "grantpt");
> + if (dladdr1 (ptr, &info, &handle, RTLD_DL_HANDLE) == 0)
> + FAIL_EXIT1 ("dladdr1 for grantpt failed");
> + TEST_COMPARE_STRING (dlinfo_soname (handle), LIBC_SO);
> +
> + /* Check the soname of a library loaded by soname. */
> + void *moddummy1_handle = xdlopen ("moddummy1.so", RTLD_NOW);
> + TEST_COMPARE_STRING (dlinfo_soname (moddummy1_handle), "moddummy1.so");
> +
Ok.
> + /* Check the soname of a library loaded by full path. */
> + char *full_path = xasprintf ("%s/dlfcn/moddummy2.so", support_objdir_root);
> + void *moddummy2_handle = xdlopen (full_path, RTLD_NOW);
> + TEST_COMPARE_STRING (dlinfo_soname (moddummy2_handle), "moddummy2.so");
> + ptr = xdlsym (moddummy2_handle, "grantpt");
> + if (dladdr1 (ptr, &info, &handle, RTLD_DL_HANDLE) == 0)
> + FAIL_EXIT1 ("dladdr1 for grantpt in namespace failed");
> + TEST_COMPARE_STRING (dlinfo_soname (handle), LIBC_SO);
> +
> + xdlclose (moddummy2_handle);
> + free (full_path);
> + xdlclose (moddummy1_handle);
> +
> + return 0;
> +}
> +
> +#include <support/test-driver.c>
Ok.
> diff --git a/sysdeps/mach/hurd/i386/libc.abilist b/sysdeps/mach/hurd/i386/libc.abilist
> index 7c2cb2b05a..dc3d706d7e 100644
> --- a/sysdeps/mach/hurd/i386/libc.abilist
> +++ b/sysdeps/mach/hurd/i386/libc.abilist
> @@ -2181,6 +2181,7 @@ GLIBC_2.3.4 setsourcefilter F
> GLIBC_2.3.4 xdr_quad_t F
> GLIBC_2.3.4 xdr_u_quad_t F
> GLIBC_2.30 twalk_r F
> +GLIBC_2.31 dlinfo_soname F
> GLIBC_2.4 __confstr_chk F
> GLIBC_2.4 __fgets_chk F
> GLIBC_2.4 __fgets_unlocked_chk F
> diff --git a/sysdeps/unix/sysv/linux/aarch64/libc.abilist b/sysdeps/unix/sysv/linux/aarch64/libc.abilist
> index a4c31932cb..2aa60a3835 100644
> --- a/sysdeps/unix/sysv/linux/aarch64/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/aarch64/libc.abilist
> @@ -2145,3 +2145,4 @@ GLIBC_2.30 getdents64 F
> GLIBC_2.30 gettid F
> GLIBC_2.30 tgkill F
> GLIBC_2.30 twalk_r F
> +GLIBC_2.31 dlinfo_soname F
> diff --git a/sysdeps/unix/sysv/linux/alpha/libc.abilist b/sysdeps/unix/sysv/linux/alpha/libc.abilist
> index e7f2174ac2..c77fba18d5 100644
> --- a/sysdeps/unix/sysv/linux/alpha/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/alpha/libc.abilist
> @@ -2225,6 +2225,7 @@ GLIBC_2.30 getdents64 F
> GLIBC_2.30 gettid F
> GLIBC_2.30 tgkill F
> GLIBC_2.30 twalk_r F
> +GLIBC_2.31 dlinfo_soname F
> GLIBC_2.4 _IO_fprintf F
> GLIBC_2.4 _IO_printf F
> GLIBC_2.4 _IO_sprintf F
> diff --git a/sysdeps/unix/sysv/linux/arm/be/libc.abilist b/sysdeps/unix/sysv/linux/arm/be/libc.abilist
> index 9371927927..efcdfc72bf 100644
> --- a/sysdeps/unix/sysv/linux/arm/be/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/arm/be/libc.abilist
> @@ -130,6 +130,7 @@ GLIBC_2.30 getdents64 F
> GLIBC_2.30 gettid F
> GLIBC_2.30 tgkill F
> GLIBC_2.30 twalk_r F
> +GLIBC_2.31 dlinfo_soname F
> GLIBC_2.4 _Exit F
> GLIBC_2.4 _IO_2_1_stderr_ D 0xa0
> GLIBC_2.4 _IO_2_1_stdin_ D 0xa0
> diff --git a/sysdeps/unix/sysv/linux/arm/le/libc.abilist b/sysdeps/unix/sysv/linux/arm/le/libc.abilist
> index 9371927927..efcdfc72bf 100644
> --- a/sysdeps/unix/sysv/linux/arm/le/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/arm/le/libc.abilist
> @@ -130,6 +130,7 @@ GLIBC_2.30 getdents64 F
> GLIBC_2.30 gettid F
> GLIBC_2.30 tgkill F
> GLIBC_2.30 twalk_r F
> +GLIBC_2.31 dlinfo_soname F
> GLIBC_2.4 _Exit F
> GLIBC_2.4 _IO_2_1_stderr_ D 0xa0
> GLIBC_2.4 _IO_2_1_stdin_ D 0xa0
> diff --git a/sysdeps/unix/sysv/linux/csky/libc.abilist b/sysdeps/unix/sysv/linux/csky/libc.abilist
> index 9b3cee65bb..2fce65b435 100644
> --- a/sysdeps/unix/sysv/linux/csky/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/csky/libc.abilist
> @@ -2089,3 +2089,4 @@ GLIBC_2.30 getdents64 F
> GLIBC_2.30 gettid F
> GLIBC_2.30 tgkill F
> GLIBC_2.30 twalk_r F
> +GLIBC_2.31 dlinfo_soname F
> diff --git a/sysdeps/unix/sysv/linux/hppa/libc.abilist b/sysdeps/unix/sysv/linux/hppa/libc.abilist
> index df6d96fbae..0e7af8dd98 100644
> --- a/sysdeps/unix/sysv/linux/hppa/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/hppa/libc.abilist
> @@ -2046,6 +2046,7 @@ GLIBC_2.30 getdents64 F
> GLIBC_2.30 gettid F
> GLIBC_2.30 tgkill F
> GLIBC_2.30 twalk_r F
> +GLIBC_2.31 dlinfo_soname F
> GLIBC_2.4 __confstr_chk F
> GLIBC_2.4 __fgets_chk F
> GLIBC_2.4 __fgets_unlocked_chk F
> diff --git a/sysdeps/unix/sysv/linux/i386/libc.abilist b/sysdeps/unix/sysv/linux/i386/libc.abilist
> index fcb625b6bf..ccbdcfe888 100644
> --- a/sysdeps/unix/sysv/linux/i386/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/i386/libc.abilist
> @@ -2212,6 +2212,7 @@ GLIBC_2.30 getdents64 F
> GLIBC_2.30 gettid F
> GLIBC_2.30 tgkill F
> GLIBC_2.30 twalk_r F
> +GLIBC_2.31 dlinfo_soname F
> GLIBC_2.4 __confstr_chk F
> GLIBC_2.4 __fgets_chk F
> GLIBC_2.4 __fgets_unlocked_chk F
> diff --git a/sysdeps/unix/sysv/linux/ia64/libc.abilist b/sysdeps/unix/sysv/linux/ia64/libc.abilist
> index cb556c5998..f05657ddfd 100644
> --- a/sysdeps/unix/sysv/linux/ia64/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/ia64/libc.abilist
> @@ -2078,6 +2078,7 @@ GLIBC_2.30 getdents64 F
> GLIBC_2.30 gettid F
> GLIBC_2.30 tgkill F
> GLIBC_2.30 twalk_r F
> +GLIBC_2.31 dlinfo_soname F
> GLIBC_2.4 __confstr_chk F
> GLIBC_2.4 __fgets_chk F
> GLIBC_2.4 __fgets_unlocked_chk F
> diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist
> index f3aa47d090..873ffc2409 100644
> --- a/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist
> @@ -131,6 +131,7 @@ GLIBC_2.30 getdents64 F
> GLIBC_2.30 gettid F
> GLIBC_2.30 tgkill F
> GLIBC_2.30 twalk_r F
> +GLIBC_2.31 dlinfo_soname F
> GLIBC_2.4 _Exit F
> GLIBC_2.4 _IO_2_1_stderr_ D 0x98
> GLIBC_2.4 _IO_2_1_stdin_ D 0x98
> diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist
> index 64d4623b6b..d10d07a206 100644
> --- a/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist
> @@ -2155,6 +2155,7 @@ GLIBC_2.30 getdents64 F
> GLIBC_2.30 gettid F
> GLIBC_2.30 tgkill F
> GLIBC_2.30 twalk_r F
> +GLIBC_2.31 dlinfo_soname F
> GLIBC_2.4 __confstr_chk F
> GLIBC_2.4 __fgets_chk F
> GLIBC_2.4 __fgets_unlocked_chk F
> diff --git a/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist b/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist
> index f7ced487f7..a4890752b2 100644
> --- a/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist
> @@ -2137,3 +2137,4 @@ GLIBC_2.30 getdents64 F
> GLIBC_2.30 gettid F
> GLIBC_2.30 tgkill F
> GLIBC_2.30 twalk_r F
> +GLIBC_2.31 dlinfo_soname F
> diff --git a/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist b/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist
> index f7ced487f7..a4890752b2 100644
> --- a/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist
> @@ -2137,3 +2137,4 @@ GLIBC_2.30 getdents64 F
> GLIBC_2.30 gettid F
> GLIBC_2.30 tgkill F
> GLIBC_2.30 twalk_r F
> +GLIBC_2.31 dlinfo_soname F
> diff --git a/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
> index 06c2e64edd..ae8b84bfdb 100644
> --- a/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
> @@ -2129,6 +2129,7 @@ GLIBC_2.30 getdents64 F
> GLIBC_2.30 gettid F
> GLIBC_2.30 tgkill F
> GLIBC_2.30 twalk_r F
> +GLIBC_2.31 dlinfo_soname F
> GLIBC_2.4 __confstr_chk F
> GLIBC_2.4 __fgets_chk F
> GLIBC_2.4 __fgets_unlocked_chk F
> diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
> index bdfd073b86..9475c55905 100644
> --- a/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
> @@ -2127,6 +2127,7 @@ GLIBC_2.30 getdents64 F
> GLIBC_2.30 gettid F
> GLIBC_2.30 tgkill F
> GLIBC_2.30 twalk_r F
> +GLIBC_2.31 dlinfo_soname F
> GLIBC_2.4 __confstr_chk F
> GLIBC_2.4 __fgets_chk F
> GLIBC_2.4 __fgets_unlocked_chk F
> diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
> index 3d61d4974a..f22c547b60 100644
> --- a/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
> @@ -2135,6 +2135,7 @@ GLIBC_2.30 getdents64 F
> GLIBC_2.30 gettid F
> GLIBC_2.30 tgkill F
> GLIBC_2.30 twalk_r F
> +GLIBC_2.31 dlinfo_soname F
> GLIBC_2.4 __confstr_chk F
> GLIBC_2.4 __fgets_chk F
> GLIBC_2.4 __fgets_unlocked_chk F
> diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
> index 675acca5db..e0430f1986 100644
> --- a/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
> @@ -2129,6 +2129,7 @@ GLIBC_2.30 getdents64 F
> GLIBC_2.30 gettid F
> GLIBC_2.30 tgkill F
> GLIBC_2.30 twalk_r F
> +GLIBC_2.31 dlinfo_soname F
> GLIBC_2.4 __confstr_chk F
> GLIBC_2.4 __fgets_chk F
> GLIBC_2.4 __fgets_unlocked_chk F
> diff --git a/sysdeps/unix/sysv/linux/nios2/libc.abilist b/sysdeps/unix/sysv/linux/nios2/libc.abilist
> index 7fec0c9670..d569bfccd5 100644
> --- a/sysdeps/unix/sysv/linux/nios2/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/nios2/libc.abilist
> @@ -2178,3 +2178,4 @@ GLIBC_2.30 getdents64 F
> GLIBC_2.30 gettid F
> GLIBC_2.30 tgkill F
> GLIBC_2.30 twalk_r F
> +GLIBC_2.31 dlinfo_soname F
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
> index 1e8ff6f83e..cac40c4ced 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
> @@ -2185,6 +2185,7 @@ GLIBC_2.30 getdents64 F
> GLIBC_2.30 gettid F
> GLIBC_2.30 tgkill F
> GLIBC_2.30 twalk_r F
> +GLIBC_2.31 dlinfo_soname F
> GLIBC_2.4 _IO_fprintf F
> GLIBC_2.4 _IO_printf F
> GLIBC_2.4 _IO_sprintf F
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
> index b5a0751d90..572c61c96a 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
> @@ -2218,6 +2218,7 @@ GLIBC_2.30 getdents64 F
> GLIBC_2.30 gettid F
> GLIBC_2.30 tgkill F
> GLIBC_2.30 twalk_r F
> +GLIBC_2.31 dlinfo_soname F
> GLIBC_2.4 _IO_fprintf F
> GLIBC_2.4 _IO_printf F
> GLIBC_2.4 _IO_sprintf F
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist
> index 0c86217fc6..7dd5ae15e7 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist
> @@ -2048,6 +2048,7 @@ GLIBC_2.30 getdents64 F
> GLIBC_2.30 gettid F
> GLIBC_2.30 tgkill F
> GLIBC_2.30 twalk_r F
> +GLIBC_2.31 dlinfo_soname F
> GLIBC_2.4 _IO_fprintf F
> GLIBC_2.4 _IO_printf F
> GLIBC_2.4 _IO_sprintf F
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist
> index 2229a1dcc0..69719c2cfe 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist
> @@ -2247,3 +2247,4 @@ GLIBC_2.30 getdents64 F
> GLIBC_2.30 gettid F
> GLIBC_2.30 tgkill F
> GLIBC_2.30 twalk_r F
> +GLIBC_2.31 dlinfo_soname F
> diff --git a/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist b/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist
> index 31010e6cf7..36cce9c25c 100644
> --- a/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist
> @@ -2107,3 +2107,4 @@ GLIBC_2.30 getdents64 F
> GLIBC_2.30 gettid F
> GLIBC_2.30 tgkill F
> GLIBC_2.30 twalk_r F
> +GLIBC_2.31 dlinfo_soname F
> diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
> index 122d0fb65a..832818c0af 100644
> --- a/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
> @@ -2180,6 +2180,7 @@ GLIBC_2.30 getdents64 F
> GLIBC_2.30 gettid F
> GLIBC_2.30 tgkill F
> GLIBC_2.30 twalk_r F
> +GLIBC_2.31 dlinfo_soname F
> GLIBC_2.4 _IO_fprintf F
> GLIBC_2.4 _IO_printf F
> GLIBC_2.4 _IO_sprintf F
> diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
> index efe588a072..f1e3d165de 100644
> --- a/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
> @@ -2084,6 +2084,7 @@ GLIBC_2.30 getdents64 F
> GLIBC_2.30 gettid F
> GLIBC_2.30 tgkill F
> GLIBC_2.30 twalk_r F
> +GLIBC_2.31 dlinfo_soname F
> GLIBC_2.4 _IO_fprintf F
> GLIBC_2.4 _IO_printf F
> GLIBC_2.4 _IO_sprintf F
> diff --git a/sysdeps/unix/sysv/linux/sh/be/libc.abilist b/sysdeps/unix/sysv/linux/sh/be/libc.abilist
> index 4b057bf4a2..fc4438a121 100644
> --- a/sysdeps/unix/sysv/linux/sh/be/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/sh/be/libc.abilist
> @@ -2050,6 +2050,7 @@ GLIBC_2.30 getdents64 F
> GLIBC_2.30 gettid F
> GLIBC_2.30 tgkill F
> GLIBC_2.30 twalk_r F
> +GLIBC_2.31 dlinfo_soname F
> GLIBC_2.4 __confstr_chk F
> GLIBC_2.4 __fgets_chk F
> GLIBC_2.4 __fgets_unlocked_chk F
> diff --git a/sysdeps/unix/sysv/linux/sh/le/libc.abilist b/sysdeps/unix/sysv/linux/sh/le/libc.abilist
> index 4b057bf4a2..fc4438a121 100644
> --- a/sysdeps/unix/sysv/linux/sh/le/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/sh/le/libc.abilist
> @@ -2050,6 +2050,7 @@ GLIBC_2.30 getdents64 F
> GLIBC_2.30 gettid F
> GLIBC_2.30 tgkill F
> GLIBC_2.30 twalk_r F
> +GLIBC_2.31 dlinfo_soname F
> GLIBC_2.4 __confstr_chk F
> GLIBC_2.4 __fgets_chk F
> GLIBC_2.4 __fgets_unlocked_chk F
> diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist
> index 49cd597fd6..2735378da7 100644
> --- a/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist
> @@ -2174,6 +2174,7 @@ GLIBC_2.30 getdents64 F
> GLIBC_2.30 gettid F
> GLIBC_2.30 tgkill F
> GLIBC_2.30 twalk_r F
> +GLIBC_2.31 dlinfo_soname F
> GLIBC_2.4 _IO_fprintf F
> GLIBC_2.4 _IO_printf F
> GLIBC_2.4 _IO_sprintf F
> diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist
> index 95e68e0ba1..073c01d0d9 100644
> --- a/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist
> @@ -2101,6 +2101,7 @@ GLIBC_2.30 getdents64 F
> GLIBC_2.30 gettid F
> GLIBC_2.30 tgkill F
> GLIBC_2.30 twalk_r F
> +GLIBC_2.31 dlinfo_soname F
> GLIBC_2.4 __confstr_chk F
> GLIBC_2.4 __fgets_chk F
> GLIBC_2.4 __fgets_unlocked_chk F
> diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
> index 1f2dbd1451..16ea5b0b61 100644
> --- a/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
> @@ -2059,6 +2059,7 @@ GLIBC_2.30 getdents64 F
> GLIBC_2.30 gettid F
> GLIBC_2.30 tgkill F
> GLIBC_2.30 twalk_r F
> +GLIBC_2.31 dlinfo_soname F
> GLIBC_2.4 __confstr_chk F
> GLIBC_2.4 __fgets_chk F
> GLIBC_2.4 __fgets_unlocked_chk F
> diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist
> index 59da85a5d8..6a4546663d 100644
> --- a/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist
> @@ -2158,3 +2158,4 @@ GLIBC_2.30 getdents64 F
> GLIBC_2.30 gettid F
> GLIBC_2.30 tgkill F
> GLIBC_2.30 twalk_r F
> +GLIBC_2.31 dlinfo_soname F
>