[10/16] dlfcn: Move dladdr1 into libc

Message ID 70797537dd2c976c7ce8b35304df5f64fc1c57ff.1622469908.git.fweimer@redhat.com
State New
Headers show
Series
  • Move libdl into libc
Related show

Commit Message

Szabolcs Nagy via Libc-alpha May 31, 2021, 2:12 p.m.
The symbol was moved using scripts/move-symbol-to-libc.py.
---
 dlfcn/Makefile                                |  3 ++-
 dlfcn/Versions                                |  6 ++++-
 dlfcn/dladdr1.c                               | 22 ++++++-------------
 dlfcn/sdladdr1.c                              |  1 -
 include/dlfcn.h                               |  3 +--
 sysdeps/mach/hurd/i386/libc.abilist           |  2 ++
 sysdeps/mach/hurd/i386/libdl.abilist          |  1 -
 sysdeps/unix/sysv/linux/aarch64/libc.abilist  |  2 ++
 sysdeps/unix/sysv/linux/aarch64/libdl.abilist |  1 -
 sysdeps/unix/sysv/linux/alpha/libc.abilist    |  2 ++
 sysdeps/unix/sysv/linux/alpha/libdl.abilist   |  1 -
 sysdeps/unix/sysv/linux/arc/libc.abilist      |  2 ++
 sysdeps/unix/sysv/linux/arc/libdl.abilist     |  1 -
 sysdeps/unix/sysv/linux/arm/be/libc.abilist   |  2 ++
 sysdeps/unix/sysv/linux/arm/be/libdl.abilist  |  1 -
 sysdeps/unix/sysv/linux/arm/le/libc.abilist   |  2 ++
 sysdeps/unix/sysv/linux/arm/le/libdl.abilist  |  1 -
 sysdeps/unix/sysv/linux/csky/libc.abilist     |  2 ++
 sysdeps/unix/sysv/linux/csky/libdl.abilist    |  1 -
 sysdeps/unix/sysv/linux/hppa/libc.abilist     |  2 ++
 sysdeps/unix/sysv/linux/hppa/libdl.abilist    |  1 -
 sysdeps/unix/sysv/linux/i386/libc.abilist     |  2 ++
 sysdeps/unix/sysv/linux/i386/libdl.abilist    |  1 -
 sysdeps/unix/sysv/linux/ia64/libc.abilist     |  2 ++
 sysdeps/unix/sysv/linux/ia64/libdl.abilist    |  1 -
 .../sysv/linux/m68k/coldfire/libc.abilist     |  2 ++
 .../sysv/linux/m68k/coldfire/libdl.abilist    |  1 -
 .../unix/sysv/linux/m68k/m680x0/libc.abilist  |  2 ++
 .../unix/sysv/linux/m68k/m680x0/libdl.abilist |  1 -
 .../sysv/linux/microblaze/be/libc.abilist     |  2 ++
 .../sysv/linux/microblaze/be/libdl.abilist    |  1 -
 .../sysv/linux/microblaze/le/libc.abilist     |  2 ++
 .../sysv/linux/microblaze/le/libdl.abilist    |  1 -
 .../sysv/linux/mips/mips32/fpu/libc.abilist   |  2 ++
 .../unix/sysv/linux/mips/mips32/libdl.abilist |  1 -
 .../sysv/linux/mips/mips32/nofpu/libc.abilist |  2 ++
 .../unix/sysv/linux/mips/mips64/libdl.abilist |  1 -
 .../sysv/linux/mips/mips64/n32/libc.abilist   |  2 ++
 .../sysv/linux/mips/mips64/n64/libc.abilist   |  2 ++
 sysdeps/unix/sysv/linux/nios2/libc.abilist    |  2 ++
 sysdeps/unix/sysv/linux/nios2/libdl.abilist   |  1 -
 .../linux/powerpc/powerpc32/fpu/libc.abilist  |  2 ++
 .../linux/powerpc/powerpc32/libdl.abilist     |  1 -
 .../powerpc/powerpc32/nofpu/libc.abilist      |  2 ++
 .../linux/powerpc/powerpc64/be/libc.abilist   |  2 ++
 .../linux/powerpc/powerpc64/be/libdl.abilist  |  1 -
 .../linux/powerpc/powerpc64/le/libc.abilist   |  2 ++
 .../linux/powerpc/powerpc64/le/libdl.abilist  |  1 -
 .../unix/sysv/linux/riscv/rv32/libc.abilist   |  2 ++
 .../unix/sysv/linux/riscv/rv32/libdl.abilist  |  1 -
 .../unix/sysv/linux/riscv/rv64/libc.abilist   |  2 ++
 .../unix/sysv/linux/riscv/rv64/libdl.abilist  |  1 -
 .../unix/sysv/linux/s390/s390-32/libc.abilist |  2 ++
 .../sysv/linux/s390/s390-32/libdl.abilist     |  1 -
 .../unix/sysv/linux/s390/s390-64/libc.abilist |  2 ++
 .../sysv/linux/s390/s390-64/libdl.abilist     |  1 -
 sysdeps/unix/sysv/linux/sh/be/libc.abilist    |  2 ++
 sysdeps/unix/sysv/linux/sh/be/libdl.abilist   |  1 -
 sysdeps/unix/sysv/linux/sh/le/libc.abilist    |  2 ++
 sysdeps/unix/sysv/linux/sh/le/libdl.abilist   |  1 -
 .../sysv/linux/sparc/sparc32/libc.abilist     |  2 ++
 .../sysv/linux/sparc/sparc32/libdl.abilist    |  1 -
 .../sysv/linux/sparc/sparc64/libc.abilist     |  2 ++
 .../sysv/linux/sparc/sparc64/libdl.abilist    |  1 -
 .../unix/sysv/linux/x86_64/64/libc.abilist    |  2 ++
 .../unix/sysv/linux/x86_64/64/libdl.abilist   |  1 -
 .../unix/sysv/linux/x86_64/x32/libc.abilist   |  2 ++
 .../unix/sysv/linux/x86_64/x32/libdl.abilist  |  1 -
 68 files changed, 81 insertions(+), 50 deletions(-)
 delete mode 100644 dlfcn/sdladdr1.c

-- 
2.31.1

Comments

Szabolcs Nagy via Libc-alpha June 2, 2021, 2:29 p.m. | #1
On 31/05/2021 11:12, Florian Weimer via Libc-alpha wrote:
> The symbol was moved using scripts/move-symbol-to-libc.py.


LGTM, thanks.

Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>


> ---

>  dlfcn/Makefile                                |  3 ++-

>  dlfcn/Versions                                |  6 ++++-

>  dlfcn/dladdr1.c                               | 22 ++++++-------------

>  dlfcn/sdladdr1.c                              |  1 -

>  include/dlfcn.h                               |  3 +--

>  sysdeps/mach/hurd/i386/libc.abilist           |  2 ++

>  sysdeps/mach/hurd/i386/libdl.abilist          |  1 -

>  sysdeps/unix/sysv/linux/aarch64/libc.abilist  |  2 ++

>  sysdeps/unix/sysv/linux/aarch64/libdl.abilist |  1 -

>  sysdeps/unix/sysv/linux/alpha/libc.abilist    |  2 ++

>  sysdeps/unix/sysv/linux/alpha/libdl.abilist   |  1 -

>  sysdeps/unix/sysv/linux/arc/libc.abilist      |  2 ++

>  sysdeps/unix/sysv/linux/arc/libdl.abilist     |  1 -

>  sysdeps/unix/sysv/linux/arm/be/libc.abilist   |  2 ++

>  sysdeps/unix/sysv/linux/arm/be/libdl.abilist  |  1 -

>  sysdeps/unix/sysv/linux/arm/le/libc.abilist   |  2 ++

>  sysdeps/unix/sysv/linux/arm/le/libdl.abilist  |  1 -

>  sysdeps/unix/sysv/linux/csky/libc.abilist     |  2 ++

>  sysdeps/unix/sysv/linux/csky/libdl.abilist    |  1 -

>  sysdeps/unix/sysv/linux/hppa/libc.abilist     |  2 ++

>  sysdeps/unix/sysv/linux/hppa/libdl.abilist    |  1 -

>  sysdeps/unix/sysv/linux/i386/libc.abilist     |  2 ++

>  sysdeps/unix/sysv/linux/i386/libdl.abilist    |  1 -

>  sysdeps/unix/sysv/linux/ia64/libc.abilist     |  2 ++

>  sysdeps/unix/sysv/linux/ia64/libdl.abilist    |  1 -

>  .../sysv/linux/m68k/coldfire/libc.abilist     |  2 ++

>  .../sysv/linux/m68k/coldfire/libdl.abilist    |  1 -

>  .../unix/sysv/linux/m68k/m680x0/libc.abilist  |  2 ++

>  .../unix/sysv/linux/m68k/m680x0/libdl.abilist |  1 -

>  .../sysv/linux/microblaze/be/libc.abilist     |  2 ++

>  .../sysv/linux/microblaze/be/libdl.abilist    |  1 -

>  .../sysv/linux/microblaze/le/libc.abilist     |  2 ++

>  .../sysv/linux/microblaze/le/libdl.abilist    |  1 -

>  .../sysv/linux/mips/mips32/fpu/libc.abilist   |  2 ++

>  .../unix/sysv/linux/mips/mips32/libdl.abilist |  1 -

>  .../sysv/linux/mips/mips32/nofpu/libc.abilist |  2 ++

>  .../unix/sysv/linux/mips/mips64/libdl.abilist |  1 -

>  .../sysv/linux/mips/mips64/n32/libc.abilist   |  2 ++

>  .../sysv/linux/mips/mips64/n64/libc.abilist   |  2 ++

>  sysdeps/unix/sysv/linux/nios2/libc.abilist    |  2 ++

>  sysdeps/unix/sysv/linux/nios2/libdl.abilist   |  1 -

>  .../linux/powerpc/powerpc32/fpu/libc.abilist  |  2 ++

>  .../linux/powerpc/powerpc32/libdl.abilist     |  1 -

>  .../powerpc/powerpc32/nofpu/libc.abilist      |  2 ++

>  .../linux/powerpc/powerpc64/be/libc.abilist   |  2 ++

>  .../linux/powerpc/powerpc64/be/libdl.abilist  |  1 -

>  .../linux/powerpc/powerpc64/le/libc.abilist   |  2 ++

>  .../linux/powerpc/powerpc64/le/libdl.abilist  |  1 -

>  .../unix/sysv/linux/riscv/rv32/libc.abilist   |  2 ++

>  .../unix/sysv/linux/riscv/rv32/libdl.abilist  |  1 -

>  .../unix/sysv/linux/riscv/rv64/libc.abilist   |  2 ++

>  .../unix/sysv/linux/riscv/rv64/libdl.abilist  |  1 -

>  .../unix/sysv/linux/s390/s390-32/libc.abilist |  2 ++

>  .../sysv/linux/s390/s390-32/libdl.abilist     |  1 -

>  .../unix/sysv/linux/s390/s390-64/libc.abilist |  2 ++

>  .../sysv/linux/s390/s390-64/libdl.abilist     |  1 -

>  sysdeps/unix/sysv/linux/sh/be/libc.abilist    |  2 ++

>  sysdeps/unix/sysv/linux/sh/be/libdl.abilist   |  1 -

>  sysdeps/unix/sysv/linux/sh/le/libc.abilist    |  2 ++

>  sysdeps/unix/sysv/linux/sh/le/libdl.abilist   |  1 -

>  .../sysv/linux/sparc/sparc32/libc.abilist     |  2 ++

>  .../sysv/linux/sparc/sparc32/libdl.abilist    |  1 -

>  .../sysv/linux/sparc/sparc64/libc.abilist     |  2 ++

>  .../sysv/linux/sparc/sparc64/libdl.abilist    |  1 -

>  .../unix/sysv/linux/x86_64/64/libc.abilist    |  2 ++

>  .../unix/sysv/linux/x86_64/64/libdl.abilist   |  1 -

>  .../unix/sysv/linux/x86_64/x32/libc.abilist   |  2 ++

>  .../unix/sysv/linux/x86_64/x32/libdl.abilist  |  1 -

>  68 files changed, 81 insertions(+), 50 deletions(-)

>  delete mode 100644 dlfcn/sdladdr1.c

> 

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

> index f7ffd242dc..1dfa247538 100644

> --- a/dlfcn/Makefile

> +++ b/dlfcn/Makefile

> @@ -21,12 +21,13 @@ include ../Makeconfig

>  

>  headers		:= bits/dlfcn.h dlfcn.h

>  extra-libs	:= libdl

> -libdl-routines	:= dlopen dlvsym dladdr1 dlinfo \

> +libdl-routines	:= dlopen dlvsym dlinfo \

>  		   dlfcn

>  routines	:= $(patsubst %,s%,$(filter-out dlfcn,$(libdl-routines)))

>  elide-routines.os := $(routines)

>  routines += \

>    dladdr \

> +  dladdr1 \

>    dlclose \

>    dlerror \

>    dlmopen \


Ok.

> diff --git a/dlfcn/Versions b/dlfcn/Versions

> index 584035e203..acd9402b34 100644

> --- a/dlfcn/Versions

> +++ b/dlfcn/Versions

> @@ -5,10 +5,14 @@ libc {

>      dlerror;

>      dlsym;

>    }

> +  GLIBC_2.3.3 {

> +    dladdr1;

> +  }

>    GLIBC_2.3.4 {

>      dlmopen;

>    }

>    GLIBC_2.34 {

> +    dladdr1;

>      dladdr;

>      dlclose;

>      dlerror;

> @@ -29,7 +33,7 @@ libdl {

>      dlopen; dlvsym;

>    }

>    GLIBC_2.3.3 {

> -    dladdr1; dlinfo;

> +    dlinfo;

>    }

>    GLIBC_2.3.4 {

>      __libdl_version_placeholder;


Ok.

> diff --git a/dlfcn/dladdr1.c b/dlfcn/dladdr1.c

> index 98cd60d78e..203d6398e4 100644

> --- a/dlfcn/dladdr1.c

> +++ b/dlfcn/dladdr1.c

> @@ -18,24 +18,15 @@

>  

>  #include <dlfcn.h>

>  #include <ldsodefs.h>

> -

> -#if !defined SHARED && IS_IN (libdl)

> -

> -int

> -dladdr1 (const void *address, Dl_info *info, void **extra, int flags)

> -{

> -  return __dladdr1 (address, info, extra, flags);

> -}

> -

> -#else

> +#include <shlib-compat.h>

>  

>  int

>  __dladdr1 (const void *address, Dl_info *info, void **extra, int flags)

>  {

> -# ifdef SHARED

> +#ifdef SHARED

>    if (!rtld_active ())

>      return _dlfcn_hook->dladdr1 (address, info, extra, flags);

> -# endif

> +#endif

>  

>    switch (flags)

>      {

> @@ -48,7 +39,8 @@ __dladdr1 (const void *address, Dl_info *info, void **extra, int flags)

>        return _dl_addr (address, info, (struct link_map **) extra, NULL);

>      }

>  }

> -# ifdef SHARED

> -strong_alias (__dladdr1, dladdr1)

> -# endif

> +versioned_symbol (libc, __dladdr1, dladdr1, GLIBC_2_34);

> +

> +#if OTHER_SHLIB_COMPAT  (libdl, GLIBC_2_3_3, GLIBC_2_34)

> +compat_symbol (libdl, __dladdr1, dladdr1, GLIBC_2_3_3);

>  #endif


Ok.

> diff --git a/dlfcn/sdladdr1.c b/dlfcn/sdladdr1.c

> deleted file mode 100644

> index a655979bcf..0000000000

> --- a/dlfcn/sdladdr1.c

> +++ /dev/null

> @@ -1 +0,0 @@

> -#include "dladdr1.c"


Ok.

> diff --git a/include/dlfcn.h b/include/dlfcn.h

> index 27309ab1dd..dc5193acbb 100644

> --- a/include/dlfcn.h

> +++ b/include/dlfcn.h

> @@ -142,8 +142,7 @@ extern void *__dlvsym (void *handle, const char *name, const char *version

>       attribute_hidden;

>  extern int __dladdr (const void *address, Dl_info *info);

>  extern int __dladdr1 (const void *address, Dl_info *info,

> -		      void **extra_info, int flags)

> -     attribute_hidden;

> +		      void **extra_info, int flags);

>  extern int __dlinfo (void *handle, int request, void *arg) attribute_hidden;

>  

>  #ifndef SHARED


Ok.

> diff --git a/sysdeps/mach/hurd/i386/libc.abilist b/sysdeps/mach/hurd/i386/libc.abilist

> index 9827bea1e9..172e269fe9 100644

> --- a/sysdeps/mach/hurd/i386/libc.abilist

> +++ b/sysdeps/mach/hurd/i386/libc.abilist

> @@ -2144,6 +2144,7 @@ GLIBC_2.3.2 lchmod F

>  GLIBC_2.3.2 setresgid F

>  GLIBC_2.3.2 setresuid F

>  GLIBC_2.3.2 strptime_l F

> +GLIBC_2.3.3 dladdr1 F

>  GLIBC_2.3.3 inet6_option_alloc F

>  GLIBC_2.3.3 inet6_option_append F

>  GLIBC_2.3.3 inet6_option_find F

> @@ -2213,6 +2214,7 @@ GLIBC_2.34 __isnanf128 F

>  GLIBC_2.34 __libc_start_main F

>  GLIBC_2.34 _hurd_libc_proc_init F

>  GLIBC_2.34 dladdr F

> +GLIBC_2.34 dladdr1 F

>  GLIBC_2.34 dlclose F

>  GLIBC_2.34 dlerror F

>  GLIBC_2.34 dlmopen F

> diff --git a/sysdeps/mach/hurd/i386/libdl.abilist b/sysdeps/mach/hurd/i386/libdl.abilist

> index d2c315509d..9e890a9815 100644

> --- a/sysdeps/mach/hurd/i386/libdl.abilist

> +++ b/sysdeps/mach/hurd/i386/libdl.abilist

> @@ -1,5 +1,4 @@

>  GLIBC_2.2.6 dlopen F

>  GLIBC_2.2.6 dlvsym F

> -GLIBC_2.3.3 dladdr1 F

>  GLIBC_2.3.3 dlinfo F

>  GLIBC_2.3.4 __libdl_version_placeholder F

> diff --git a/sysdeps/unix/sysv/linux/aarch64/libc.abilist b/sysdeps/unix/sysv/linux/aarch64/libc.abilist

> index 9b0f917944..f09046237f 100644

> --- a/sysdeps/unix/sysv/linux/aarch64/libc.abilist

> +++ b/sysdeps/unix/sysv/linux/aarch64/libc.abilist

> @@ -719,6 +719,7 @@ GLIBC_2.17 dirname F

>  GLIBC_2.17 div F

>  GLIBC_2.17 dl_iterate_phdr F

>  GLIBC_2.17 dladdr F

> +GLIBC_2.17 dladdr1 F

>  GLIBC_2.17 dlclose F

>  GLIBC_2.17 dlerror F

>  GLIBC_2.17 dlmopen F

> @@ -2348,6 +2349,7 @@ GLIBC_2.34 cnd_signal F

>  GLIBC_2.34 cnd_timedwait F

>  GLIBC_2.34 cnd_wait F

>  GLIBC_2.34 dladdr F

> +GLIBC_2.34 dladdr1 F

>  GLIBC_2.34 dlclose F

>  GLIBC_2.34 dlerror F

>  GLIBC_2.34 dlmopen F

> diff --git a/sysdeps/unix/sysv/linux/aarch64/libdl.abilist b/sysdeps/unix/sysv/linux/aarch64/libdl.abilist

> index 391b72c100..05eeace024 100644

> --- a/sysdeps/unix/sysv/linux/aarch64/libdl.abilist

> +++ b/sysdeps/unix/sysv/linux/aarch64/libdl.abilist

> @@ -1,4 +1,3 @@

> -GLIBC_2.17 dladdr1 F

>  GLIBC_2.17 dlinfo F

>  GLIBC_2.17 dlopen F

>  GLIBC_2.17 dlvsym F

> diff --git a/sysdeps/unix/sysv/linux/alpha/libc.abilist b/sysdeps/unix/sysv/linux/alpha/libc.abilist

> index 5b24169acf..1523233c99 100644

> --- a/sysdeps/unix/sysv/linux/alpha/libc.abilist

> +++ b/sysdeps/unix/sysv/linux/alpha/libc.abilist

> @@ -2297,6 +2297,7 @@ GLIBC_2.3.3 __pthread_unregister_cancel F

>  GLIBC_2.3.3 __pthread_unregister_cancel_restore F

>  GLIBC_2.3.3 __pthread_unwind_next F

>  GLIBC_2.3.3 _sys_siglist D 0x208

> +GLIBC_2.3.3 dladdr1 F

>  GLIBC_2.3.3 gnu_dev_major F

>  GLIBC_2.3.3 gnu_dev_makedev F

>  GLIBC_2.3.3 gnu_dev_minor F

> @@ -2440,6 +2441,7 @@ GLIBC_2.34 cnd_signal F

>  GLIBC_2.34 cnd_timedwait F

>  GLIBC_2.34 cnd_wait F

>  GLIBC_2.34 dladdr F

> +GLIBC_2.34 dladdr1 F

>  GLIBC_2.34 dlclose F

>  GLIBC_2.34 dlerror F

>  GLIBC_2.34 dlmopen F

> diff --git a/sysdeps/unix/sysv/linux/alpha/libdl.abilist b/sysdeps/unix/sysv/linux/alpha/libdl.abilist

> index 795a5abd45..5f81d13a21 100644

> --- a/sysdeps/unix/sysv/linux/alpha/libdl.abilist

> +++ b/sysdeps/unix/sysv/linux/alpha/libdl.abilist

> @@ -1,6 +1,5 @@

>  GLIBC_2.0 dlopen F

>  GLIBC_2.1 dlopen F

>  GLIBC_2.1 dlvsym F

> -GLIBC_2.3.3 dladdr1 F

>  GLIBC_2.3.3 dlinfo F

>  GLIBC_2.3.4 __libdl_version_placeholder F

> diff --git a/sysdeps/unix/sysv/linux/arc/libc.abilist b/sysdeps/unix/sysv/linux/arc/libc.abilist

> index 5e28b203cd..cd6a555f6b 100644

> --- a/sysdeps/unix/sysv/linux/arc/libc.abilist

> +++ b/sysdeps/unix/sysv/linux/arc/libc.abilist

> @@ -664,6 +664,7 @@ GLIBC_2.32 dirname F

>  GLIBC_2.32 div F

>  GLIBC_2.32 dl_iterate_phdr F

>  GLIBC_2.32 dladdr F

> +GLIBC_2.32 dladdr1 F

>  GLIBC_2.32 dlclose F

>  GLIBC_2.32 dlerror F

>  GLIBC_2.32 dlmopen F

> @@ -2107,6 +2108,7 @@ GLIBC_2.34 cnd_signal F

>  GLIBC_2.34 cnd_timedwait F

>  GLIBC_2.34 cnd_wait F

>  GLIBC_2.34 dladdr F

> +GLIBC_2.34 dladdr1 F

>  GLIBC_2.34 dlclose F

>  GLIBC_2.34 dlerror F

>  GLIBC_2.34 dlmopen F

> diff --git a/sysdeps/unix/sysv/linux/arc/libdl.abilist b/sysdeps/unix/sysv/linux/arc/libdl.abilist

> index b23f34195f..d3afdc0308 100644

> --- a/sysdeps/unix/sysv/linux/arc/libdl.abilist

> +++ b/sysdeps/unix/sysv/linux/arc/libdl.abilist

> @@ -1,4 +1,3 @@

> -GLIBC_2.32 dladdr1 F

>  GLIBC_2.32 dlinfo F

>  GLIBC_2.32 dlopen F

>  GLIBC_2.32 dlvsym F

> diff --git a/sysdeps/unix/sysv/linux/arm/be/libc.abilist b/sysdeps/unix/sysv/linux/arm/be/libc.abilist

> index ea14c3cd99..07e8854909 100644

> --- a/sysdeps/unix/sysv/linux/arm/be/libc.abilist

> +++ b/sysdeps/unix/sysv/linux/arm/be/libc.abilist

> @@ -208,6 +208,7 @@ GLIBC_2.34 cnd_signal F

>  GLIBC_2.34 cnd_timedwait F

>  GLIBC_2.34 cnd_wait F

>  GLIBC_2.34 dladdr F

> +GLIBC_2.34 dladdr1 F

>  GLIBC_2.34 dlclose F

>  GLIBC_2.34 dlerror F

>  GLIBC_2.34 dlmopen F

> @@ -1023,6 +1024,7 @@ GLIBC_2.4 dirname F

>  GLIBC_2.4 div F

>  GLIBC_2.4 dl_iterate_phdr F

>  GLIBC_2.4 dladdr F

> +GLIBC_2.4 dladdr1 F

>  GLIBC_2.4 dlclose F

>  GLIBC_2.4 dlerror F

>  GLIBC_2.4 dlmopen F

> diff --git a/sysdeps/unix/sysv/linux/arm/be/libdl.abilist b/sysdeps/unix/sysv/linux/arm/be/libdl.abilist

> index 22691633fb..c24e10d9c5 100644

> --- a/sysdeps/unix/sysv/linux/arm/be/libdl.abilist

> +++ b/sysdeps/unix/sysv/linux/arm/be/libdl.abilist

> @@ -1,4 +1,3 @@

> -GLIBC_2.4 dladdr1 F

>  GLIBC_2.4 dlinfo F

>  GLIBC_2.4 dlopen F

>  GLIBC_2.4 dlvsym F

> diff --git a/sysdeps/unix/sysv/linux/arm/le/libc.abilist b/sysdeps/unix/sysv/linux/arm/le/libc.abilist

> index 5ff5eb7d04..2f0fef9d7d 100644

> --- a/sysdeps/unix/sysv/linux/arm/le/libc.abilist

> +++ b/sysdeps/unix/sysv/linux/arm/le/libc.abilist

> @@ -205,6 +205,7 @@ GLIBC_2.34 cnd_signal F

>  GLIBC_2.34 cnd_timedwait F

>  GLIBC_2.34 cnd_wait F

>  GLIBC_2.34 dladdr F

> +GLIBC_2.34 dladdr1 F

>  GLIBC_2.34 dlclose F

>  GLIBC_2.34 dlerror F

>  GLIBC_2.34 dlmopen F

> @@ -1020,6 +1021,7 @@ GLIBC_2.4 dirname F

>  GLIBC_2.4 div F

>  GLIBC_2.4 dl_iterate_phdr F

>  GLIBC_2.4 dladdr F

> +GLIBC_2.4 dladdr1 F

>  GLIBC_2.4 dlclose F

>  GLIBC_2.4 dlerror F

>  GLIBC_2.4 dlmopen F

> diff --git a/sysdeps/unix/sysv/linux/arm/le/libdl.abilist b/sysdeps/unix/sysv/linux/arm/le/libdl.abilist

> index 22691633fb..c24e10d9c5 100644

> --- a/sysdeps/unix/sysv/linux/arm/le/libdl.abilist

> +++ b/sysdeps/unix/sysv/linux/arm/le/libdl.abilist

> @@ -1,4 +1,3 @@

> -GLIBC_2.4 dladdr1 F

>  GLIBC_2.4 dlinfo F

>  GLIBC_2.4 dlopen F

>  GLIBC_2.4 dlvsym F

> diff --git a/sysdeps/unix/sysv/linux/csky/libc.abilist b/sysdeps/unix/sysv/linux/csky/libc.abilist

> index 8f36e5c844..97ba0642d5 100644

> --- a/sysdeps/unix/sysv/linux/csky/libc.abilist

> +++ b/sysdeps/unix/sysv/linux/csky/libc.abilist

> @@ -700,6 +700,7 @@ GLIBC_2.29 dirname F

>  GLIBC_2.29 div F

>  GLIBC_2.29 dl_iterate_phdr F

>  GLIBC_2.29 dladdr F

> +GLIBC_2.29 dladdr1 F

>  GLIBC_2.29 dlclose F

>  GLIBC_2.29 dlerror F

>  GLIBC_2.29 dlmopen F

> @@ -2291,6 +2292,7 @@ GLIBC_2.34 cnd_signal F

>  GLIBC_2.34 cnd_timedwait F

>  GLIBC_2.34 cnd_wait F

>  GLIBC_2.34 dladdr F

> +GLIBC_2.34 dladdr1 F

>  GLIBC_2.34 dlclose F

>  GLIBC_2.34 dlerror F

>  GLIBC_2.34 dlmopen F

> diff --git a/sysdeps/unix/sysv/linux/csky/libdl.abilist b/sysdeps/unix/sysv/linux/csky/libdl.abilist

> index 51061cb361..5cb45f50d3 100644

> --- a/sysdeps/unix/sysv/linux/csky/libdl.abilist

> +++ b/sysdeps/unix/sysv/linux/csky/libdl.abilist

> @@ -1,4 +1,3 @@

> -GLIBC_2.29 dladdr1 F

>  GLIBC_2.29 dlinfo F

>  GLIBC_2.29 dlopen F

>  GLIBC_2.29 dlvsym F

> diff --git a/sysdeps/unix/sysv/linux/hppa/libc.abilist b/sysdeps/unix/sysv/linux/hppa/libc.abilist

> index 0302aeae56..257072a63a 100644

> --- a/sysdeps/unix/sysv/linux/hppa/libc.abilist

> +++ b/sysdeps/unix/sysv/linux/hppa/libc.abilist

> @@ -2131,6 +2131,7 @@ GLIBC_2.3.3 __pthread_unregister_cancel F

>  GLIBC_2.3.3 __pthread_unregister_cancel_restore F

>  GLIBC_2.3.3 __pthread_unwind_next F

>  GLIBC_2.3.3 _sys_siglist D 0x104

> +GLIBC_2.3.3 dladdr1 F

>  GLIBC_2.3.3 gnu_dev_major F

>  GLIBC_2.3.3 gnu_dev_makedev F

>  GLIBC_2.3.3 gnu_dev_minor F

> @@ -2244,6 +2245,7 @@ GLIBC_2.34 cnd_signal F

>  GLIBC_2.34 cnd_timedwait F

>  GLIBC_2.34 cnd_wait F

>  GLIBC_2.34 dladdr F

> +GLIBC_2.34 dladdr1 F

>  GLIBC_2.34 dlclose F

>  GLIBC_2.34 dlerror F

>  GLIBC_2.34 dlmopen F

> diff --git a/sysdeps/unix/sysv/linux/hppa/libdl.abilist b/sysdeps/unix/sysv/linux/hppa/libdl.abilist

> index 795a5abd45..5f81d13a21 100644

> --- a/sysdeps/unix/sysv/linux/hppa/libdl.abilist

> +++ b/sysdeps/unix/sysv/linux/hppa/libdl.abilist

> @@ -1,6 +1,5 @@

>  GLIBC_2.0 dlopen F

>  GLIBC_2.1 dlopen F

>  GLIBC_2.1 dlvsym F

> -GLIBC_2.3.3 dladdr1 F

>  GLIBC_2.3.3 dlinfo F

>  GLIBC_2.3.4 __libdl_version_placeholder F

> diff --git a/sysdeps/unix/sysv/linux/i386/libc.abilist b/sysdeps/unix/sysv/linux/i386/libc.abilist

> index 233096afbd..8b0a2381bb 100644

> --- a/sysdeps/unix/sysv/linux/i386/libc.abilist

> +++ b/sysdeps/unix/sysv/linux/i386/libc.abilist

> @@ -2312,6 +2312,7 @@ GLIBC_2.3.3 __pthread_unregister_cancel F

>  GLIBC_2.3.3 __pthread_unregister_cancel_restore F

>  GLIBC_2.3.3 __pthread_unwind_next F

>  GLIBC_2.3.3 _sys_siglist D 0x104

> +GLIBC_2.3.3 dladdr1 F

>  GLIBC_2.3.3 gnu_dev_major F

>  GLIBC_2.3.3 gnu_dev_makedev F

>  GLIBC_2.3.3 gnu_dev_minor F

> @@ -2428,6 +2429,7 @@ GLIBC_2.34 cnd_signal F

>  GLIBC_2.34 cnd_timedwait F

>  GLIBC_2.34 cnd_wait F

>  GLIBC_2.34 dladdr F

> +GLIBC_2.34 dladdr1 F

>  GLIBC_2.34 dlclose F

>  GLIBC_2.34 dlerror F

>  GLIBC_2.34 dlmopen F

> diff --git a/sysdeps/unix/sysv/linux/i386/libdl.abilist b/sysdeps/unix/sysv/linux/i386/libdl.abilist

> index 795a5abd45..5f81d13a21 100644

> --- a/sysdeps/unix/sysv/linux/i386/libdl.abilist

> +++ b/sysdeps/unix/sysv/linux/i386/libdl.abilist

> @@ -1,6 +1,5 @@

>  GLIBC_2.0 dlopen F

>  GLIBC_2.1 dlopen F

>  GLIBC_2.1 dlvsym F

> -GLIBC_2.3.3 dladdr1 F

>  GLIBC_2.3.3 dlinfo F

>  GLIBC_2.3.4 __libdl_version_placeholder F

> diff --git a/sysdeps/unix/sysv/linux/ia64/libc.abilist b/sysdeps/unix/sysv/linux/ia64/libc.abilist

> index 704fe57ca2..a2fd7b6f0e 100644

> --- a/sysdeps/unix/sysv/linux/ia64/libc.abilist

> +++ b/sysdeps/unix/sysv/linux/ia64/libc.abilist

> @@ -2164,6 +2164,7 @@ GLIBC_2.3.3 __pthread_unregister_cancel F

>  GLIBC_2.3.3 __pthread_unregister_cancel_restore F

>  GLIBC_2.3.3 __pthread_unwind_next F

>  GLIBC_2.3.3 _sys_siglist D 0x208

> +GLIBC_2.3.3 dladdr1 F

>  GLIBC_2.3.3 gnu_dev_major F

>  GLIBC_2.3.3 gnu_dev_makedev F

>  GLIBC_2.3.3 gnu_dev_minor F

> @@ -2280,6 +2281,7 @@ GLIBC_2.34 cnd_signal F

>  GLIBC_2.34 cnd_timedwait F

>  GLIBC_2.34 cnd_wait F

>  GLIBC_2.34 dladdr F

> +GLIBC_2.34 dladdr1 F

>  GLIBC_2.34 dlclose F

>  GLIBC_2.34 dlerror F

>  GLIBC_2.34 dlmopen F

> diff --git a/sysdeps/unix/sysv/linux/ia64/libdl.abilist b/sysdeps/unix/sysv/linux/ia64/libdl.abilist

> index 795a5abd45..5f81d13a21 100644

> --- a/sysdeps/unix/sysv/linux/ia64/libdl.abilist

> +++ b/sysdeps/unix/sysv/linux/ia64/libdl.abilist

> @@ -1,6 +1,5 @@

>  GLIBC_2.0 dlopen F

>  GLIBC_2.1 dlopen F

>  GLIBC_2.1 dlvsym F

> -GLIBC_2.3.3 dladdr1 F

>  GLIBC_2.3.3 dlinfo F

>  GLIBC_2.3.4 __libdl_version_placeholder F

> diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist

> index dc32b7561b..ec0f948a22 100644

> --- a/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist

> +++ b/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist

> @@ -209,6 +209,7 @@ GLIBC_2.34 cnd_signal F

>  GLIBC_2.34 cnd_timedwait F

>  GLIBC_2.34 cnd_wait F

>  GLIBC_2.34 dladdr F

> +GLIBC_2.34 dladdr1 F

>  GLIBC_2.34 dlclose F

>  GLIBC_2.34 dlerror F

>  GLIBC_2.34 dlmopen F

> @@ -1012,6 +1013,7 @@ GLIBC_2.4 dirname F

>  GLIBC_2.4 div F

>  GLIBC_2.4 dl_iterate_phdr F

>  GLIBC_2.4 dladdr F

> +GLIBC_2.4 dladdr1 F

>  GLIBC_2.4 dlclose F

>  GLIBC_2.4 dlerror F

>  GLIBC_2.4 dlmopen F

> diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/libdl.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/libdl.abilist

> index 22691633fb..c24e10d9c5 100644

> --- a/sysdeps/unix/sysv/linux/m68k/coldfire/libdl.abilist

> +++ b/sysdeps/unix/sysv/linux/m68k/coldfire/libdl.abilist

> @@ -1,4 +1,3 @@

> -GLIBC_2.4 dladdr1 F

>  GLIBC_2.4 dlinfo F

>  GLIBC_2.4 dlopen F

>  GLIBC_2.4 dlvsym F

> diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist

> index 0ad41be521..2d69d956a1 100644

> --- a/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist

> +++ b/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist

> @@ -2255,6 +2255,7 @@ GLIBC_2.3.3 __pthread_unregister_cancel F

>  GLIBC_2.3.3 __pthread_unregister_cancel_restore F

>  GLIBC_2.3.3 __pthread_unwind_next F

>  GLIBC_2.3.3 _sys_siglist D 0x104

> +GLIBC_2.3.3 dladdr1 F

>  GLIBC_2.3.3 gnu_dev_major F

>  GLIBC_2.3.3 gnu_dev_makedev F

>  GLIBC_2.3.3 gnu_dev_minor F

> @@ -2371,6 +2372,7 @@ GLIBC_2.34 cnd_signal F

>  GLIBC_2.34 cnd_timedwait F

>  GLIBC_2.34 cnd_wait F

>  GLIBC_2.34 dladdr F

> +GLIBC_2.34 dladdr1 F

>  GLIBC_2.34 dlclose F

>  GLIBC_2.34 dlerror F

>  GLIBC_2.34 dlmopen F

> diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/libdl.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/libdl.abilist

> index 795a5abd45..5f81d13a21 100644

> --- a/sysdeps/unix/sysv/linux/m68k/m680x0/libdl.abilist

> +++ b/sysdeps/unix/sysv/linux/m68k/m680x0/libdl.abilist

> @@ -1,6 +1,5 @@

>  GLIBC_2.0 dlopen F

>  GLIBC_2.1 dlopen F

>  GLIBC_2.1 dlvsym F

> -GLIBC_2.3.3 dladdr1 F

>  GLIBC_2.3.3 dlinfo F

>  GLIBC_2.3.4 __libdl_version_placeholder F

> diff --git a/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist b/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist

> index ea61742cf2..7e6a7b1645 100644

> --- a/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist

> +++ b/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist

> @@ -721,6 +721,7 @@ GLIBC_2.18 dirname F

>  GLIBC_2.18 div F

>  GLIBC_2.18 dl_iterate_phdr F

>  GLIBC_2.18 dladdr F

> +GLIBC_2.18 dladdr1 F

>  GLIBC_2.18 dlclose F

>  GLIBC_2.18 dlerror F

>  GLIBC_2.18 dlmopen F

> @@ -2342,6 +2343,7 @@ GLIBC_2.34 cnd_signal F

>  GLIBC_2.34 cnd_timedwait F

>  GLIBC_2.34 cnd_wait F

>  GLIBC_2.34 dladdr F

> +GLIBC_2.34 dladdr1 F

>  GLIBC_2.34 dlclose F

>  GLIBC_2.34 dlerror F

>  GLIBC_2.34 dlmopen F

> diff --git a/sysdeps/unix/sysv/linux/microblaze/be/libdl.abilist b/sysdeps/unix/sysv/linux/microblaze/be/libdl.abilist

> index 409e59cf21..c042c043d6 100644

> --- a/sysdeps/unix/sysv/linux/microblaze/be/libdl.abilist

> +++ b/sysdeps/unix/sysv/linux/microblaze/be/libdl.abilist

> @@ -1,4 +1,3 @@

> -GLIBC_2.18 dladdr1 F

>  GLIBC_2.18 dlinfo F

>  GLIBC_2.18 dlopen F

>  GLIBC_2.18 dlvsym F

> diff --git a/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist b/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist

> index 3b09b44dd8..01bc9594bb 100644

> --- a/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist

> +++ b/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist

> @@ -721,6 +721,7 @@ GLIBC_2.18 dirname F

>  GLIBC_2.18 div F

>  GLIBC_2.18 dl_iterate_phdr F

>  GLIBC_2.18 dladdr F

> +GLIBC_2.18 dladdr1 F

>  GLIBC_2.18 dlclose F

>  GLIBC_2.18 dlerror F

>  GLIBC_2.18 dlmopen F

> @@ -2339,6 +2340,7 @@ GLIBC_2.34 cnd_signal F

>  GLIBC_2.34 cnd_timedwait F

>  GLIBC_2.34 cnd_wait F

>  GLIBC_2.34 dladdr F

> +GLIBC_2.34 dladdr1 F

>  GLIBC_2.34 dlclose F

>  GLIBC_2.34 dlerror F

>  GLIBC_2.34 dlmopen F

> diff --git a/sysdeps/unix/sysv/linux/microblaze/le/libdl.abilist b/sysdeps/unix/sysv/linux/microblaze/le/libdl.abilist

> index 409e59cf21..c042c043d6 100644

> --- a/sysdeps/unix/sysv/linux/microblaze/le/libdl.abilist

> +++ b/sysdeps/unix/sysv/linux/microblaze/le/libdl.abilist

> @@ -1,4 +1,3 @@

> -GLIBC_2.18 dladdr1 F

>  GLIBC_2.18 dlinfo F

>  GLIBC_2.18 dlopen F

>  GLIBC_2.18 dlvsym F

> diff --git a/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist

> index adde44be66..b13544403e 100644

> --- a/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist

> +++ b/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist

> @@ -2221,6 +2221,7 @@ GLIBC_2.3.3 __pthread_unregister_cancel F

>  GLIBC_2.3.3 __pthread_unregister_cancel_restore F

>  GLIBC_2.3.3 __pthread_unwind_next F

>  GLIBC_2.3.3 _sys_siglist D 0x200

> +GLIBC_2.3.3 dladdr1 F

>  GLIBC_2.3.3 gnu_dev_major F

>  GLIBC_2.3.3 gnu_dev_makedev F

>  GLIBC_2.3.3 gnu_dev_minor F

> @@ -2336,6 +2337,7 @@ GLIBC_2.34 cnd_signal F

>  GLIBC_2.34 cnd_timedwait F

>  GLIBC_2.34 cnd_wait F

>  GLIBC_2.34 dladdr F

> +GLIBC_2.34 dladdr1 F

>  GLIBC_2.34 dlclose F

>  GLIBC_2.34 dlerror F

>  GLIBC_2.34 dlmopen F

> diff --git a/sysdeps/unix/sysv/linux/mips/mips32/libdl.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libdl.abilist

> index 04aca378ef..cb7bf28178 100644

> --- a/sysdeps/unix/sysv/linux/mips/mips32/libdl.abilist

> +++ b/sysdeps/unix/sysv/linux/mips/mips32/libdl.abilist

> @@ -1,6 +1,5 @@

>  GLIBC_2.0 dlopen F

>  GLIBC_2.2 dlopen F

>  GLIBC_2.2 dlvsym F

> -GLIBC_2.3.3 dladdr1 F

>  GLIBC_2.3.3 dlinfo F

>  GLIBC_2.3.4 __libdl_version_placeholder F

> diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist

> index a4c9a17e9e..e76cbe2a87 100644

> --- a/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist

> +++ b/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist

> @@ -2219,6 +2219,7 @@ GLIBC_2.3.3 __pthread_unregister_cancel F

>  GLIBC_2.3.3 __pthread_unregister_cancel_restore F

>  GLIBC_2.3.3 __pthread_unwind_next F

>  GLIBC_2.3.3 _sys_siglist D 0x200

> +GLIBC_2.3.3 dladdr1 F

>  GLIBC_2.3.3 gnu_dev_major F

>  GLIBC_2.3.3 gnu_dev_makedev F

>  GLIBC_2.3.3 gnu_dev_minor F

> @@ -2334,6 +2335,7 @@ GLIBC_2.34 cnd_signal F

>  GLIBC_2.34 cnd_timedwait F

>  GLIBC_2.34 cnd_wait F

>  GLIBC_2.34 dladdr F

> +GLIBC_2.34 dladdr1 F

>  GLIBC_2.34 dlclose F

>  GLIBC_2.34 dlerror F

>  GLIBC_2.34 dlmopen F

> diff --git a/sysdeps/unix/sysv/linux/mips/mips64/libdl.abilist b/sysdeps/unix/sysv/linux/mips/mips64/libdl.abilist

> index 04aca378ef..cb7bf28178 100644

> --- a/sysdeps/unix/sysv/linux/mips/mips64/libdl.abilist

> +++ b/sysdeps/unix/sysv/linux/mips/mips64/libdl.abilist

> @@ -1,6 +1,5 @@

>  GLIBC_2.0 dlopen F

>  GLIBC_2.2 dlopen F

>  GLIBC_2.2 dlvsym F

> -GLIBC_2.3.3 dladdr1 F

>  GLIBC_2.3.3 dlinfo F

>  GLIBC_2.3.4 __libdl_version_placeholder F

> diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist

> index 214e0db752..5ac0d47413 100644

> --- a/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist

> +++ b/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist

> @@ -2227,6 +2227,7 @@ GLIBC_2.3.3 __pthread_unregister_cancel F

>  GLIBC_2.3.3 __pthread_unregister_cancel_restore F

>  GLIBC_2.3.3 __pthread_unwind_next F

>  GLIBC_2.3.3 _sys_siglist D 0x200

> +GLIBC_2.3.3 dladdr1 F

>  GLIBC_2.3.3 gnu_dev_major F

>  GLIBC_2.3.3 gnu_dev_makedev F

>  GLIBC_2.3.3 gnu_dev_minor F

> @@ -2342,6 +2343,7 @@ GLIBC_2.34 cnd_signal F

>  GLIBC_2.34 cnd_timedwait F

>  GLIBC_2.34 cnd_wait F

>  GLIBC_2.34 dladdr F

> +GLIBC_2.34 dladdr1 F

>  GLIBC_2.34 dlclose F

>  GLIBC_2.34 dlerror F

>  GLIBC_2.34 dlmopen F

> diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist

> index b09d4058a2..07d121d225 100644

> --- a/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist

> +++ b/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist

> @@ -2220,6 +2220,7 @@ GLIBC_2.3.3 __pthread_unregister_cancel F

>  GLIBC_2.3.3 __pthread_unregister_cancel_restore F

>  GLIBC_2.3.3 __pthread_unwind_next F

>  GLIBC_2.3.3 _sys_siglist D 0x400

> +GLIBC_2.3.3 dladdr1 F

>  GLIBC_2.3.3 gnu_dev_major F

>  GLIBC_2.3.3 gnu_dev_makedev F

>  GLIBC_2.3.3 gnu_dev_minor F

> @@ -2336,6 +2337,7 @@ GLIBC_2.34 cnd_signal F

>  GLIBC_2.34 cnd_timedwait F

>  GLIBC_2.34 cnd_wait F

>  GLIBC_2.34 dladdr F

> +GLIBC_2.34 dladdr1 F

>  GLIBC_2.34 dlclose F

>  GLIBC_2.34 dlerror F

>  GLIBC_2.34 dlmopen F

> diff --git a/sysdeps/unix/sysv/linux/nios2/libc.abilist b/sysdeps/unix/sysv/linux/nios2/libc.abilist

> index 748f12c254..a27cb9cf18 100644

> --- a/sysdeps/unix/sysv/linux/nios2/libc.abilist

> +++ b/sysdeps/unix/sysv/linux/nios2/libc.abilist

> @@ -764,6 +764,7 @@ GLIBC_2.21 dirname F

>  GLIBC_2.21 div F

>  GLIBC_2.21 dl_iterate_phdr F

>  GLIBC_2.21 dladdr F

> +GLIBC_2.21 dladdr1 F

>  GLIBC_2.21 dlclose F

>  GLIBC_2.21 dlerror F

>  GLIBC_2.21 dlmopen F

> @@ -2381,6 +2382,7 @@ GLIBC_2.34 cnd_signal F

>  GLIBC_2.34 cnd_timedwait F

>  GLIBC_2.34 cnd_wait F

>  GLIBC_2.34 dladdr F

> +GLIBC_2.34 dladdr1 F

>  GLIBC_2.34 dlclose F

>  GLIBC_2.34 dlerror F

>  GLIBC_2.34 dlmopen F

> diff --git a/sysdeps/unix/sysv/linux/nios2/libdl.abilist b/sysdeps/unix/sysv/linux/nios2/libdl.abilist

> index 90aaa0b49b..9acd54fa38 100644

> --- a/sysdeps/unix/sysv/linux/nios2/libdl.abilist

> +++ b/sysdeps/unix/sysv/linux/nios2/libdl.abilist

> @@ -1,4 +1,3 @@

> -GLIBC_2.21 dladdr1 F

>  GLIBC_2.21 dlinfo F

>  GLIBC_2.21 dlopen F

>  GLIBC_2.21 dlvsym F

> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist

> index 4134f7ed41..1a1cbb94ce 100644

> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist

> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist

> @@ -2259,6 +2259,7 @@ GLIBC_2.3.3 __pthread_unregister_cancel F

>  GLIBC_2.3.3 __pthread_unregister_cancel_restore F

>  GLIBC_2.3.3 __pthread_unwind_next F

>  GLIBC_2.3.3 _sys_siglist D 0x104

> +GLIBC_2.3.3 dladdr1 F

>  GLIBC_2.3.3 getcontext F

>  GLIBC_2.3.3 gnu_dev_major F

>  GLIBC_2.3.3 gnu_dev_makedev F

> @@ -2398,6 +2399,7 @@ GLIBC_2.34 cnd_signal F

>  GLIBC_2.34 cnd_timedwait F

>  GLIBC_2.34 cnd_wait F

>  GLIBC_2.34 dladdr F

> +GLIBC_2.34 dladdr1 F

>  GLIBC_2.34 dlclose F

>  GLIBC_2.34 dlerror F

>  GLIBC_2.34 dlmopen F

> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libdl.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libdl.abilist

> index 795a5abd45..5f81d13a21 100644

> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libdl.abilist

> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libdl.abilist

> @@ -1,6 +1,5 @@

>  GLIBC_2.0 dlopen F

>  GLIBC_2.1 dlopen F

>  GLIBC_2.1 dlvsym F

> -GLIBC_2.3.3 dladdr1 F

>  GLIBC_2.3.3 dlinfo F

>  GLIBC_2.3.4 __libdl_version_placeholder F

> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist

> index 43baf50dca..9b9dc9ef3a 100644

> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist

> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist

> @@ -2292,6 +2292,7 @@ GLIBC_2.3.3 __pthread_unregister_cancel F

>  GLIBC_2.3.3 __pthread_unregister_cancel_restore F

>  GLIBC_2.3.3 __pthread_unwind_next F

>  GLIBC_2.3.3 _sys_siglist D 0x104

> +GLIBC_2.3.3 dladdr1 F

>  GLIBC_2.3.3 getcontext F

>  GLIBC_2.3.3 gnu_dev_major F

>  GLIBC_2.3.3 gnu_dev_makedev F

> @@ -2431,6 +2432,7 @@ GLIBC_2.34 cnd_signal F

>  GLIBC_2.34 cnd_timedwait F

>  GLIBC_2.34 cnd_wait F

>  GLIBC_2.34 dladdr F

> +GLIBC_2.34 dladdr1 F

>  GLIBC_2.34 dlclose F

>  GLIBC_2.34 dlerror F

>  GLIBC_2.34 dlmopen F

> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist

> index b3d27c2678..aad3704047 100644

> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist

> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist

> @@ -2111,6 +2111,7 @@ GLIBC_2.3.3 __pthread_unregister_cancel F

>  GLIBC_2.3.3 __pthread_unregister_cancel_restore F

>  GLIBC_2.3.3 __pthread_unwind_next F

>  GLIBC_2.3.3 _sys_siglist D 0x208

> +GLIBC_2.3.3 dladdr1 F

>  GLIBC_2.3.3 gnu_dev_major F

>  GLIBC_2.3.3 gnu_dev_makedev F

>  GLIBC_2.3.3 gnu_dev_minor F

> @@ -2245,6 +2246,7 @@ GLIBC_2.34 cnd_signal F

>  GLIBC_2.34 cnd_timedwait F

>  GLIBC_2.34 cnd_wait F

>  GLIBC_2.34 dladdr F

> +GLIBC_2.34 dladdr1 F

>  GLIBC_2.34 dlclose F

>  GLIBC_2.34 dlerror F

>  GLIBC_2.34 dlmopen F

> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libdl.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libdl.abilist

> index 8e709e5bc4..c27f19ac95 100644

> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libdl.abilist

> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libdl.abilist

> @@ -1,5 +1,4 @@

>  GLIBC_2.3 dlopen F

>  GLIBC_2.3 dlvsym F

> -GLIBC_2.3.3 dladdr1 F

>  GLIBC_2.3.3 dlinfo F

>  GLIBC_2.3.4 __libdl_version_placeholder F

> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist

> index 60a6327f37..64a45a1c48 100644

> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist

> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist

> @@ -807,6 +807,7 @@ GLIBC_2.17 dirname F

>  GLIBC_2.17 div F

>  GLIBC_2.17 dl_iterate_phdr F

>  GLIBC_2.17 dladdr F

> +GLIBC_2.17 dladdr1 F

>  GLIBC_2.17 dlclose F

>  GLIBC_2.17 dlerror F

>  GLIBC_2.17 dlmopen F

> @@ -2544,6 +2545,7 @@ GLIBC_2.34 cnd_signal F

>  GLIBC_2.34 cnd_timedwait F

>  GLIBC_2.34 cnd_wait F

>  GLIBC_2.34 dladdr F

> +GLIBC_2.34 dladdr1 F

>  GLIBC_2.34 dlclose F

>  GLIBC_2.34 dlerror F

>  GLIBC_2.34 dlmopen F

> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libdl.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libdl.abilist

> index 391b72c100..05eeace024 100644

> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libdl.abilist

> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libdl.abilist

> @@ -1,4 +1,3 @@

> -GLIBC_2.17 dladdr1 F

>  GLIBC_2.17 dlinfo F

>  GLIBC_2.17 dlopen F

>  GLIBC_2.17 dlvsym F

> diff --git a/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist b/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist

> index dccdf14b63..94c3bcf6e2 100644

> --- a/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist

> +++ b/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist

> @@ -657,6 +657,7 @@ GLIBC_2.33 dirname F

>  GLIBC_2.33 div F

>  GLIBC_2.33 dl_iterate_phdr F

>  GLIBC_2.33 dladdr F

> +GLIBC_2.33 dladdr1 F

>  GLIBC_2.33 dlclose F

>  GLIBC_2.33 dlerror F

>  GLIBC_2.33 dlmopen F

> @@ -2109,6 +2110,7 @@ GLIBC_2.34 cnd_signal F

>  GLIBC_2.34 cnd_timedwait F

>  GLIBC_2.34 cnd_wait F

>  GLIBC_2.34 dladdr F

> +GLIBC_2.34 dladdr1 F

>  GLIBC_2.34 dlclose F

>  GLIBC_2.34 dlerror F

>  GLIBC_2.34 dlmopen F

> diff --git a/sysdeps/unix/sysv/linux/riscv/rv32/libdl.abilist b/sysdeps/unix/sysv/linux/riscv/rv32/libdl.abilist

> index 2710b64293..2b91d9886c 100644

> --- a/sysdeps/unix/sysv/linux/riscv/rv32/libdl.abilist

> +++ b/sysdeps/unix/sysv/linux/riscv/rv32/libdl.abilist

> @@ -1,4 +1,3 @@

> -GLIBC_2.33 dladdr1 F

>  GLIBC_2.33 dlinfo F

>  GLIBC_2.33 dlopen F

>  GLIBC_2.33 dlvsym F

> diff --git a/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist b/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist

> index 2acb8db062..d2cde862c3 100644

> --- a/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist

> +++ b/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist

> @@ -698,6 +698,7 @@ GLIBC_2.27 dirname F

>  GLIBC_2.27 div F

>  GLIBC_2.27 dl_iterate_phdr F

>  GLIBC_2.27 dladdr F

> +GLIBC_2.27 dladdr1 F

>  GLIBC_2.27 dlclose F

>  GLIBC_2.27 dlerror F

>  GLIBC_2.27 dlmopen F

> @@ -2309,6 +2310,7 @@ GLIBC_2.34 cnd_signal F

>  GLIBC_2.34 cnd_timedwait F

>  GLIBC_2.34 cnd_wait F

>  GLIBC_2.34 dladdr F

> +GLIBC_2.34 dladdr1 F

>  GLIBC_2.34 dlclose F

>  GLIBC_2.34 dlerror F

>  GLIBC_2.34 dlmopen F

> diff --git a/sysdeps/unix/sysv/linux/riscv/rv64/libdl.abilist b/sysdeps/unix/sysv/linux/riscv/rv64/libdl.abilist

> index c0d8307937..8e30134591 100644

> --- a/sysdeps/unix/sysv/linux/riscv/rv64/libdl.abilist

> +++ b/sysdeps/unix/sysv/linux/riscv/rv64/libdl.abilist

> @@ -1,4 +1,3 @@

> -GLIBC_2.27 dladdr1 F

>  GLIBC_2.27 dlinfo F

>  GLIBC_2.27 dlopen F

>  GLIBC_2.27 dlvsym F

> diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist

> index b2666bd723..30a533b622 100644

> --- a/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist

> +++ b/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist

> @@ -2268,6 +2268,7 @@ GLIBC_2.3.3 __pthread_unregister_cancel F

>  GLIBC_2.3.3 __pthread_unregister_cancel_restore F

>  GLIBC_2.3.3 __pthread_unwind_next F

>  GLIBC_2.3.3 _sys_siglist D 0x104

> +GLIBC_2.3.3 dladdr1 F

>  GLIBC_2.3.3 gnu_dev_major F

>  GLIBC_2.3.3 gnu_dev_makedev F

>  GLIBC_2.3.3 gnu_dev_minor F

> @@ -2396,6 +2397,7 @@ GLIBC_2.34 cnd_signal F

>  GLIBC_2.34 cnd_timedwait F

>  GLIBC_2.34 cnd_wait F

>  GLIBC_2.34 dladdr F

> +GLIBC_2.34 dladdr1 F

>  GLIBC_2.34 dlclose F

>  GLIBC_2.34 dlerror F

>  GLIBC_2.34 dlmopen F

> diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/libdl.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libdl.abilist

> index 795a5abd45..5f81d13a21 100644

> --- a/sysdeps/unix/sysv/linux/s390/s390-32/libdl.abilist

> +++ b/sysdeps/unix/sysv/linux/s390/s390-32/libdl.abilist

> @@ -1,6 +1,5 @@

>  GLIBC_2.0 dlopen F

>  GLIBC_2.1 dlopen F

>  GLIBC_2.1 dlvsym F

> -GLIBC_2.3.3 dladdr1 F

>  GLIBC_2.3.3 dlinfo F

>  GLIBC_2.3.4 __libdl_version_placeholder F

> diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist

> index 6ea55ebcdf..77b21973db 100644

> --- a/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist

> +++ b/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist

> @@ -2157,6 +2157,7 @@ GLIBC_2.3.3 __pthread_unregister_cancel F

>  GLIBC_2.3.3 __pthread_unregister_cancel_restore F

>  GLIBC_2.3.3 __pthread_unwind_next F

>  GLIBC_2.3.3 _sys_siglist D 0x208

> +GLIBC_2.3.3 dladdr1 F

>  GLIBC_2.3.3 gnu_dev_major F

>  GLIBC_2.3.3 gnu_dev_makedev F

>  GLIBC_2.3.3 gnu_dev_minor F

> @@ -2282,6 +2283,7 @@ GLIBC_2.34 cnd_signal F

>  GLIBC_2.34 cnd_timedwait F

>  GLIBC_2.34 cnd_wait F

>  GLIBC_2.34 dladdr F

> +GLIBC_2.34 dladdr1 F

>  GLIBC_2.34 dlclose F

>  GLIBC_2.34 dlerror F

>  GLIBC_2.34 dlmopen F

> diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/libdl.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libdl.abilist

> index 45decb94f9..f882403fe2 100644

> --- a/sysdeps/unix/sysv/linux/s390/s390-64/libdl.abilist

> +++ b/sysdeps/unix/sysv/linux/s390/s390-64/libdl.abilist

> @@ -1,5 +1,4 @@

>  GLIBC_2.2 dlopen F

>  GLIBC_2.2 dlvsym F

> -GLIBC_2.3.3 dladdr1 F

>  GLIBC_2.3.3 dlinfo F

>  GLIBC_2.3.4 __libdl_version_placeholder F

> diff --git a/sysdeps/unix/sysv/linux/sh/be/libc.abilist b/sysdeps/unix/sysv/linux/sh/be/libc.abilist

> index 7d3680520a..2700b6bf98 100644

> --- a/sysdeps/unix/sysv/linux/sh/be/libc.abilist

> +++ b/sysdeps/unix/sysv/linux/sh/be/libc.abilist

> @@ -2135,6 +2135,7 @@ GLIBC_2.3.3 __pthread_unregister_cancel F

>  GLIBC_2.3.3 __pthread_unregister_cancel_restore F

>  GLIBC_2.3.3 __pthread_unwind_next F

>  GLIBC_2.3.3 _sys_siglist D 0x104

> +GLIBC_2.3.3 dladdr1 F

>  GLIBC_2.3.3 gnu_dev_major F

>  GLIBC_2.3.3 gnu_dev_makedev F

>  GLIBC_2.3.3 gnu_dev_minor F

> @@ -2251,6 +2252,7 @@ GLIBC_2.34 cnd_signal F

>  GLIBC_2.34 cnd_timedwait F

>  GLIBC_2.34 cnd_wait F

>  GLIBC_2.34 dladdr F

> +GLIBC_2.34 dladdr1 F

>  GLIBC_2.34 dlclose F

>  GLIBC_2.34 dlerror F

>  GLIBC_2.34 dlmopen F

> diff --git a/sysdeps/unix/sysv/linux/sh/be/libdl.abilist b/sysdeps/unix/sysv/linux/sh/be/libdl.abilist

> index 795a5abd45..5f81d13a21 100644

> --- a/sysdeps/unix/sysv/linux/sh/be/libdl.abilist

> +++ b/sysdeps/unix/sysv/linux/sh/be/libdl.abilist

> @@ -1,6 +1,5 @@

>  GLIBC_2.0 dlopen F

>  GLIBC_2.1 dlopen F

>  GLIBC_2.1 dlvsym F

> -GLIBC_2.3.3 dladdr1 F

>  GLIBC_2.3.3 dlinfo F

>  GLIBC_2.3.4 __libdl_version_placeholder F

> diff --git a/sysdeps/unix/sysv/linux/sh/le/libc.abilist b/sysdeps/unix/sysv/linux/sh/le/libc.abilist

> index 51a77c9553..de6251d508 100644

> --- a/sysdeps/unix/sysv/linux/sh/le/libc.abilist

> +++ b/sysdeps/unix/sysv/linux/sh/le/libc.abilist

> @@ -2135,6 +2135,7 @@ GLIBC_2.3.3 __pthread_unregister_cancel F

>  GLIBC_2.3.3 __pthread_unregister_cancel_restore F

>  GLIBC_2.3.3 __pthread_unwind_next F

>  GLIBC_2.3.3 _sys_siglist D 0x104

> +GLIBC_2.3.3 dladdr1 F

>  GLIBC_2.3.3 gnu_dev_major F

>  GLIBC_2.3.3 gnu_dev_makedev F

>  GLIBC_2.3.3 gnu_dev_minor F

> @@ -2248,6 +2249,7 @@ GLIBC_2.34 cnd_signal F

>  GLIBC_2.34 cnd_timedwait F

>  GLIBC_2.34 cnd_wait F

>  GLIBC_2.34 dladdr F

> +GLIBC_2.34 dladdr1 F

>  GLIBC_2.34 dlclose F

>  GLIBC_2.34 dlerror F

>  GLIBC_2.34 dlmopen F

> diff --git a/sysdeps/unix/sysv/linux/sh/le/libdl.abilist b/sysdeps/unix/sysv/linux/sh/le/libdl.abilist

> index 795a5abd45..5f81d13a21 100644

> --- a/sysdeps/unix/sysv/linux/sh/le/libdl.abilist

> +++ b/sysdeps/unix/sysv/linux/sh/le/libdl.abilist

> @@ -1,6 +1,5 @@

>  GLIBC_2.0 dlopen F

>  GLIBC_2.1 dlopen F

>  GLIBC_2.1 dlvsym F

> -GLIBC_2.3.3 dladdr1 F

>  GLIBC_2.3.3 dlinfo F

>  GLIBC_2.3.4 __libdl_version_placeholder F

> diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist

> index 45053a171a..7ada64410a 100644

> --- a/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist

> +++ b/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist

> @@ -2262,6 +2262,7 @@ GLIBC_2.3.3 __pthread_unregister_cancel F

>  GLIBC_2.3.3 __pthread_unregister_cancel_restore F

>  GLIBC_2.3.3 __pthread_unwind_next F

>  GLIBC_2.3.3 _sys_siglist D 0x104

> +GLIBC_2.3.3 dladdr1 F

>  GLIBC_2.3.3 gnu_dev_major F

>  GLIBC_2.3.3 gnu_dev_makedev F

>  GLIBC_2.3.3 gnu_dev_minor F

> @@ -2389,6 +2390,7 @@ GLIBC_2.34 cnd_signal F

>  GLIBC_2.34 cnd_timedwait F

>  GLIBC_2.34 cnd_wait F

>  GLIBC_2.34 dladdr F

> +GLIBC_2.34 dladdr1 F

>  GLIBC_2.34 dlclose F

>  GLIBC_2.34 dlerror F

>  GLIBC_2.34 dlmopen F

> diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/libdl.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libdl.abilist

> index 795a5abd45..5f81d13a21 100644

> --- a/sysdeps/unix/sysv/linux/sparc/sparc32/libdl.abilist

> +++ b/sysdeps/unix/sysv/linux/sparc/sparc32/libdl.abilist

> @@ -1,6 +1,5 @@

>  GLIBC_2.0 dlopen F

>  GLIBC_2.1 dlopen F

>  GLIBC_2.1 dlvsym F

> -GLIBC_2.3.3 dladdr1 F

>  GLIBC_2.3.3 dlinfo F

>  GLIBC_2.3.4 __libdl_version_placeholder F

> diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist

> index 30e7e6baa0..75fb6e4bbe 100644

> --- a/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist

> +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist

> @@ -2186,6 +2186,7 @@ GLIBC_2.3.3 __pthread_unregister_cancel F

>  GLIBC_2.3.3 __pthread_unregister_cancel_restore F

>  GLIBC_2.3.3 __pthread_unwind_next F

>  GLIBC_2.3.3 _sys_siglist D 0x208

> +GLIBC_2.3.3 dladdr1 F

>  GLIBC_2.3.3 gnu_dev_major F

>  GLIBC_2.3.3 gnu_dev_makedev F

>  GLIBC_2.3.3 gnu_dev_minor F

> @@ -2301,6 +2302,7 @@ GLIBC_2.34 cnd_signal F

>  GLIBC_2.34 cnd_timedwait F

>  GLIBC_2.34 cnd_wait F

>  GLIBC_2.34 dladdr F

> +GLIBC_2.34 dladdr1 F

>  GLIBC_2.34 dlclose F

>  GLIBC_2.34 dlerror F

>  GLIBC_2.34 dlmopen F

> diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/libdl.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/libdl.abilist

> index 795a5abd45..5f81d13a21 100644

> --- a/sysdeps/unix/sysv/linux/sparc/sparc64/libdl.abilist

> +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libdl.abilist

> @@ -1,6 +1,5 @@

>  GLIBC_2.0 dlopen F

>  GLIBC_2.1 dlopen F

>  GLIBC_2.1 dlvsym F

> -GLIBC_2.3.3 dladdr1 F

>  GLIBC_2.3.3 dlinfo F

>  GLIBC_2.3.4 __libdl_version_placeholder F

> diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist

> index abaf3ee9de..d94135174a 100644

> --- a/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist

> +++ b/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist

> @@ -2145,6 +2145,7 @@ GLIBC_2.3.3 __pthread_unregister_cancel F

>  GLIBC_2.3.3 __pthread_unregister_cancel_restore F

>  GLIBC_2.3.3 __pthread_unwind_next F

>  GLIBC_2.3.3 _sys_siglist D 0x208

> +GLIBC_2.3.3 dladdr1 F

>  GLIBC_2.3.3 gnu_dev_major F

>  GLIBC_2.3.3 gnu_dev_makedev F

>  GLIBC_2.3.3 gnu_dev_minor F

> @@ -2260,6 +2261,7 @@ GLIBC_2.34 cnd_signal F

>  GLIBC_2.34 cnd_timedwait F

>  GLIBC_2.34 cnd_wait F

>  GLIBC_2.34 dladdr F

> +GLIBC_2.34 dladdr1 F

>  GLIBC_2.34 dlclose F

>  GLIBC_2.34 dlerror F

>  GLIBC_2.34 dlmopen F

> diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libdl.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libdl.abilist

> index 91f878e859..6b11f673cc 100644

> --- a/sysdeps/unix/sysv/linux/x86_64/64/libdl.abilist

> +++ b/sysdeps/unix/sysv/linux/x86_64/64/libdl.abilist

> @@ -1,5 +1,4 @@

>  GLIBC_2.2.5 dlopen F

>  GLIBC_2.2.5 dlvsym F

> -GLIBC_2.3.3 dladdr1 F

>  GLIBC_2.3.3 dlinfo F

>  GLIBC_2.3.4 __libdl_version_placeholder F

> diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist

> index b30feb4888..989f276480 100644

> --- a/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist

> +++ b/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist

> @@ -723,6 +723,7 @@ GLIBC_2.16 dirname F

>  GLIBC_2.16 div F

>  GLIBC_2.16 dl_iterate_phdr F

>  GLIBC_2.16 dladdr F

> +GLIBC_2.16 dladdr1 F

>  GLIBC_2.16 dlclose F

>  GLIBC_2.16 dlerror F

>  GLIBC_2.16 dlmopen F

> @@ -2363,6 +2364,7 @@ GLIBC_2.34 cnd_signal F

>  GLIBC_2.34 cnd_timedwait F

>  GLIBC_2.34 cnd_wait F

>  GLIBC_2.34 dladdr F

> +GLIBC_2.34 dladdr1 F

>  GLIBC_2.34 dlclose F

>  GLIBC_2.34 dlerror F

>  GLIBC_2.34 dlmopen F

> diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libdl.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libdl.abilist

> index b37e9ff78c..fe8858d4ec 100644

> --- a/sysdeps/unix/sysv/linux/x86_64/x32/libdl.abilist

> +++ b/sysdeps/unix/sysv/linux/x86_64/x32/libdl.abilist

> @@ -1,4 +1,3 @@

> -GLIBC_2.16 dladdr1 F

>  GLIBC_2.16 dlinfo F

>  GLIBC_2.16 dlopen F

>  GLIBC_2.16 dlvsym F

> 


Ok.

Patch

diff --git a/dlfcn/Makefile b/dlfcn/Makefile
index f7ffd242dc..1dfa247538 100644
--- a/dlfcn/Makefile
+++ b/dlfcn/Makefile
@@ -21,12 +21,13 @@  include ../Makeconfig
 
 headers		:= bits/dlfcn.h dlfcn.h
 extra-libs	:= libdl
-libdl-routines	:= dlopen dlvsym dladdr1 dlinfo \
+libdl-routines	:= dlopen dlvsym dlinfo \
 		   dlfcn
 routines	:= $(patsubst %,s%,$(filter-out dlfcn,$(libdl-routines)))
 elide-routines.os := $(routines)
 routines += \
   dladdr \
+  dladdr1 \
   dlclose \
   dlerror \
   dlmopen \
diff --git a/dlfcn/Versions b/dlfcn/Versions
index 584035e203..acd9402b34 100644
--- a/dlfcn/Versions
+++ b/dlfcn/Versions
@@ -5,10 +5,14 @@  libc {
     dlerror;
     dlsym;
   }
+  GLIBC_2.3.3 {
+    dladdr1;
+  }
   GLIBC_2.3.4 {
     dlmopen;
   }
   GLIBC_2.34 {
+    dladdr1;
     dladdr;
     dlclose;
     dlerror;
@@ -29,7 +33,7 @@  libdl {
     dlopen; dlvsym;
   }
   GLIBC_2.3.3 {
-    dladdr1; dlinfo;
+    dlinfo;
   }
   GLIBC_2.3.4 {
     __libdl_version_placeholder;
diff --git a/dlfcn/dladdr1.c b/dlfcn/dladdr1.c
index 98cd60d78e..203d6398e4 100644
--- a/dlfcn/dladdr1.c
+++ b/dlfcn/dladdr1.c
@@ -18,24 +18,15 @@ 
 
 #include <dlfcn.h>
 #include <ldsodefs.h>
-
-#if !defined SHARED && IS_IN (libdl)
-
-int
-dladdr1 (const void *address, Dl_info *info, void **extra, int flags)
-{
-  return __dladdr1 (address, info, extra, flags);
-}
-
-#else
+#include <shlib-compat.h>
 
 int
 __dladdr1 (const void *address, Dl_info *info, void **extra, int flags)
 {
-# ifdef SHARED
+#ifdef SHARED
   if (!rtld_active ())
     return _dlfcn_hook->dladdr1 (address, info, extra, flags);
-# endif
+#endif
 
   switch (flags)
     {
@@ -48,7 +39,8 @@  __dladdr1 (const void *address, Dl_info *info, void **extra, int flags)
       return _dl_addr (address, info, (struct link_map **) extra, NULL);
     }
 }
-# ifdef SHARED
-strong_alias (__dladdr1, dladdr1)
-# endif
+versioned_symbol (libc, __dladdr1, dladdr1, GLIBC_2_34);
+
+#if OTHER_SHLIB_COMPAT  (libdl, GLIBC_2_3_3, GLIBC_2_34)
+compat_symbol (libdl, __dladdr1, dladdr1, GLIBC_2_3_3);
 #endif
diff --git a/dlfcn/sdladdr1.c b/dlfcn/sdladdr1.c
deleted file mode 100644
index a655979bcf..0000000000
--- a/dlfcn/sdladdr1.c
+++ /dev/null
@@ -1 +0,0 @@ 
-#include "dladdr1.c"
diff --git a/include/dlfcn.h b/include/dlfcn.h
index 27309ab1dd..dc5193acbb 100644
--- a/include/dlfcn.h
+++ b/include/dlfcn.h
@@ -142,8 +142,7 @@  extern void *__dlvsym (void *handle, const char *name, const char *version
      attribute_hidden;
 extern int __dladdr (const void *address, Dl_info *info);
 extern int __dladdr1 (const void *address, Dl_info *info,
-		      void **extra_info, int flags)
-     attribute_hidden;
+		      void **extra_info, int flags);
 extern int __dlinfo (void *handle, int request, void *arg) attribute_hidden;
 
 #ifndef SHARED
diff --git a/sysdeps/mach/hurd/i386/libc.abilist b/sysdeps/mach/hurd/i386/libc.abilist
index 9827bea1e9..172e269fe9 100644
--- a/sysdeps/mach/hurd/i386/libc.abilist
+++ b/sysdeps/mach/hurd/i386/libc.abilist
@@ -2144,6 +2144,7 @@  GLIBC_2.3.2 lchmod F
 GLIBC_2.3.2 setresgid F
 GLIBC_2.3.2 setresuid F
 GLIBC_2.3.2 strptime_l F
+GLIBC_2.3.3 dladdr1 F
 GLIBC_2.3.3 inet6_option_alloc F
 GLIBC_2.3.3 inet6_option_append F
 GLIBC_2.3.3 inet6_option_find F
@@ -2213,6 +2214,7 @@  GLIBC_2.34 __isnanf128 F
 GLIBC_2.34 __libc_start_main F
 GLIBC_2.34 _hurd_libc_proc_init F
 GLIBC_2.34 dladdr F
+GLIBC_2.34 dladdr1 F
 GLIBC_2.34 dlclose F
 GLIBC_2.34 dlerror F
 GLIBC_2.34 dlmopen F
diff --git a/sysdeps/mach/hurd/i386/libdl.abilist b/sysdeps/mach/hurd/i386/libdl.abilist
index d2c315509d..9e890a9815 100644
--- a/sysdeps/mach/hurd/i386/libdl.abilist
+++ b/sysdeps/mach/hurd/i386/libdl.abilist
@@ -1,5 +1,4 @@ 
 GLIBC_2.2.6 dlopen F
 GLIBC_2.2.6 dlvsym F
-GLIBC_2.3.3 dladdr1 F
 GLIBC_2.3.3 dlinfo F
 GLIBC_2.3.4 __libdl_version_placeholder F
diff --git a/sysdeps/unix/sysv/linux/aarch64/libc.abilist b/sysdeps/unix/sysv/linux/aarch64/libc.abilist
index 9b0f917944..f09046237f 100644
--- a/sysdeps/unix/sysv/linux/aarch64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/aarch64/libc.abilist
@@ -719,6 +719,7 @@  GLIBC_2.17 dirname F
 GLIBC_2.17 div F
 GLIBC_2.17 dl_iterate_phdr F
 GLIBC_2.17 dladdr F
+GLIBC_2.17 dladdr1 F
 GLIBC_2.17 dlclose F
 GLIBC_2.17 dlerror F
 GLIBC_2.17 dlmopen F
@@ -2348,6 +2349,7 @@  GLIBC_2.34 cnd_signal F
 GLIBC_2.34 cnd_timedwait F
 GLIBC_2.34 cnd_wait F
 GLIBC_2.34 dladdr F
+GLIBC_2.34 dladdr1 F
 GLIBC_2.34 dlclose F
 GLIBC_2.34 dlerror F
 GLIBC_2.34 dlmopen F
diff --git a/sysdeps/unix/sysv/linux/aarch64/libdl.abilist b/sysdeps/unix/sysv/linux/aarch64/libdl.abilist
index 391b72c100..05eeace024 100644
--- a/sysdeps/unix/sysv/linux/aarch64/libdl.abilist
+++ b/sysdeps/unix/sysv/linux/aarch64/libdl.abilist
@@ -1,4 +1,3 @@ 
-GLIBC_2.17 dladdr1 F
 GLIBC_2.17 dlinfo F
 GLIBC_2.17 dlopen F
 GLIBC_2.17 dlvsym F
diff --git a/sysdeps/unix/sysv/linux/alpha/libc.abilist b/sysdeps/unix/sysv/linux/alpha/libc.abilist
index 5b24169acf..1523233c99 100644
--- a/sysdeps/unix/sysv/linux/alpha/libc.abilist
+++ b/sysdeps/unix/sysv/linux/alpha/libc.abilist
@@ -2297,6 +2297,7 @@  GLIBC_2.3.3 __pthread_unregister_cancel F
 GLIBC_2.3.3 __pthread_unregister_cancel_restore F
 GLIBC_2.3.3 __pthread_unwind_next F
 GLIBC_2.3.3 _sys_siglist D 0x208
+GLIBC_2.3.3 dladdr1 F
 GLIBC_2.3.3 gnu_dev_major F
 GLIBC_2.3.3 gnu_dev_makedev F
 GLIBC_2.3.3 gnu_dev_minor F
@@ -2440,6 +2441,7 @@  GLIBC_2.34 cnd_signal F
 GLIBC_2.34 cnd_timedwait F
 GLIBC_2.34 cnd_wait F
 GLIBC_2.34 dladdr F
+GLIBC_2.34 dladdr1 F
 GLIBC_2.34 dlclose F
 GLIBC_2.34 dlerror F
 GLIBC_2.34 dlmopen F
diff --git a/sysdeps/unix/sysv/linux/alpha/libdl.abilist b/sysdeps/unix/sysv/linux/alpha/libdl.abilist
index 795a5abd45..5f81d13a21 100644
--- a/sysdeps/unix/sysv/linux/alpha/libdl.abilist
+++ b/sysdeps/unix/sysv/linux/alpha/libdl.abilist
@@ -1,6 +1,5 @@ 
 GLIBC_2.0 dlopen F
 GLIBC_2.1 dlopen F
 GLIBC_2.1 dlvsym F
-GLIBC_2.3.3 dladdr1 F
 GLIBC_2.3.3 dlinfo F
 GLIBC_2.3.4 __libdl_version_placeholder F
diff --git a/sysdeps/unix/sysv/linux/arc/libc.abilist b/sysdeps/unix/sysv/linux/arc/libc.abilist
index 5e28b203cd..cd6a555f6b 100644
--- a/sysdeps/unix/sysv/linux/arc/libc.abilist
+++ b/sysdeps/unix/sysv/linux/arc/libc.abilist
@@ -664,6 +664,7 @@  GLIBC_2.32 dirname F
 GLIBC_2.32 div F
 GLIBC_2.32 dl_iterate_phdr F
 GLIBC_2.32 dladdr F
+GLIBC_2.32 dladdr1 F
 GLIBC_2.32 dlclose F
 GLIBC_2.32 dlerror F
 GLIBC_2.32 dlmopen F
@@ -2107,6 +2108,7 @@  GLIBC_2.34 cnd_signal F
 GLIBC_2.34 cnd_timedwait F
 GLIBC_2.34 cnd_wait F
 GLIBC_2.34 dladdr F
+GLIBC_2.34 dladdr1 F
 GLIBC_2.34 dlclose F
 GLIBC_2.34 dlerror F
 GLIBC_2.34 dlmopen F
diff --git a/sysdeps/unix/sysv/linux/arc/libdl.abilist b/sysdeps/unix/sysv/linux/arc/libdl.abilist
index b23f34195f..d3afdc0308 100644
--- a/sysdeps/unix/sysv/linux/arc/libdl.abilist
+++ b/sysdeps/unix/sysv/linux/arc/libdl.abilist
@@ -1,4 +1,3 @@ 
-GLIBC_2.32 dladdr1 F
 GLIBC_2.32 dlinfo F
 GLIBC_2.32 dlopen F
 GLIBC_2.32 dlvsym F
diff --git a/sysdeps/unix/sysv/linux/arm/be/libc.abilist b/sysdeps/unix/sysv/linux/arm/be/libc.abilist
index ea14c3cd99..07e8854909 100644
--- a/sysdeps/unix/sysv/linux/arm/be/libc.abilist
+++ b/sysdeps/unix/sysv/linux/arm/be/libc.abilist
@@ -208,6 +208,7 @@  GLIBC_2.34 cnd_signal F
 GLIBC_2.34 cnd_timedwait F
 GLIBC_2.34 cnd_wait F
 GLIBC_2.34 dladdr F
+GLIBC_2.34 dladdr1 F
 GLIBC_2.34 dlclose F
 GLIBC_2.34 dlerror F
 GLIBC_2.34 dlmopen F
@@ -1023,6 +1024,7 @@  GLIBC_2.4 dirname F
 GLIBC_2.4 div F
 GLIBC_2.4 dl_iterate_phdr F
 GLIBC_2.4 dladdr F
+GLIBC_2.4 dladdr1 F
 GLIBC_2.4 dlclose F
 GLIBC_2.4 dlerror F
 GLIBC_2.4 dlmopen F
diff --git a/sysdeps/unix/sysv/linux/arm/be/libdl.abilist b/sysdeps/unix/sysv/linux/arm/be/libdl.abilist
index 22691633fb..c24e10d9c5 100644
--- a/sysdeps/unix/sysv/linux/arm/be/libdl.abilist
+++ b/sysdeps/unix/sysv/linux/arm/be/libdl.abilist
@@ -1,4 +1,3 @@ 
-GLIBC_2.4 dladdr1 F
 GLIBC_2.4 dlinfo F
 GLIBC_2.4 dlopen F
 GLIBC_2.4 dlvsym F
diff --git a/sysdeps/unix/sysv/linux/arm/le/libc.abilist b/sysdeps/unix/sysv/linux/arm/le/libc.abilist
index 5ff5eb7d04..2f0fef9d7d 100644
--- a/sysdeps/unix/sysv/linux/arm/le/libc.abilist
+++ b/sysdeps/unix/sysv/linux/arm/le/libc.abilist
@@ -205,6 +205,7 @@  GLIBC_2.34 cnd_signal F
 GLIBC_2.34 cnd_timedwait F
 GLIBC_2.34 cnd_wait F
 GLIBC_2.34 dladdr F
+GLIBC_2.34 dladdr1 F
 GLIBC_2.34 dlclose F
 GLIBC_2.34 dlerror F
 GLIBC_2.34 dlmopen F
@@ -1020,6 +1021,7 @@  GLIBC_2.4 dirname F
 GLIBC_2.4 div F
 GLIBC_2.4 dl_iterate_phdr F
 GLIBC_2.4 dladdr F
+GLIBC_2.4 dladdr1 F
 GLIBC_2.4 dlclose F
 GLIBC_2.4 dlerror F
 GLIBC_2.4 dlmopen F
diff --git a/sysdeps/unix/sysv/linux/arm/le/libdl.abilist b/sysdeps/unix/sysv/linux/arm/le/libdl.abilist
index 22691633fb..c24e10d9c5 100644
--- a/sysdeps/unix/sysv/linux/arm/le/libdl.abilist
+++ b/sysdeps/unix/sysv/linux/arm/le/libdl.abilist
@@ -1,4 +1,3 @@ 
-GLIBC_2.4 dladdr1 F
 GLIBC_2.4 dlinfo F
 GLIBC_2.4 dlopen F
 GLIBC_2.4 dlvsym F
diff --git a/sysdeps/unix/sysv/linux/csky/libc.abilist b/sysdeps/unix/sysv/linux/csky/libc.abilist
index 8f36e5c844..97ba0642d5 100644
--- a/sysdeps/unix/sysv/linux/csky/libc.abilist
+++ b/sysdeps/unix/sysv/linux/csky/libc.abilist
@@ -700,6 +700,7 @@  GLIBC_2.29 dirname F
 GLIBC_2.29 div F
 GLIBC_2.29 dl_iterate_phdr F
 GLIBC_2.29 dladdr F
+GLIBC_2.29 dladdr1 F
 GLIBC_2.29 dlclose F
 GLIBC_2.29 dlerror F
 GLIBC_2.29 dlmopen F
@@ -2291,6 +2292,7 @@  GLIBC_2.34 cnd_signal F
 GLIBC_2.34 cnd_timedwait F
 GLIBC_2.34 cnd_wait F
 GLIBC_2.34 dladdr F
+GLIBC_2.34 dladdr1 F
 GLIBC_2.34 dlclose F
 GLIBC_2.34 dlerror F
 GLIBC_2.34 dlmopen F
diff --git a/sysdeps/unix/sysv/linux/csky/libdl.abilist b/sysdeps/unix/sysv/linux/csky/libdl.abilist
index 51061cb361..5cb45f50d3 100644
--- a/sysdeps/unix/sysv/linux/csky/libdl.abilist
+++ b/sysdeps/unix/sysv/linux/csky/libdl.abilist
@@ -1,4 +1,3 @@ 
-GLIBC_2.29 dladdr1 F
 GLIBC_2.29 dlinfo F
 GLIBC_2.29 dlopen F
 GLIBC_2.29 dlvsym F
diff --git a/sysdeps/unix/sysv/linux/hppa/libc.abilist b/sysdeps/unix/sysv/linux/hppa/libc.abilist
index 0302aeae56..257072a63a 100644
--- a/sysdeps/unix/sysv/linux/hppa/libc.abilist
+++ b/sysdeps/unix/sysv/linux/hppa/libc.abilist
@@ -2131,6 +2131,7 @@  GLIBC_2.3.3 __pthread_unregister_cancel F
 GLIBC_2.3.3 __pthread_unregister_cancel_restore F
 GLIBC_2.3.3 __pthread_unwind_next F
 GLIBC_2.3.3 _sys_siglist D 0x104
+GLIBC_2.3.3 dladdr1 F
 GLIBC_2.3.3 gnu_dev_major F
 GLIBC_2.3.3 gnu_dev_makedev F
 GLIBC_2.3.3 gnu_dev_minor F
@@ -2244,6 +2245,7 @@  GLIBC_2.34 cnd_signal F
 GLIBC_2.34 cnd_timedwait F
 GLIBC_2.34 cnd_wait F
 GLIBC_2.34 dladdr F
+GLIBC_2.34 dladdr1 F
 GLIBC_2.34 dlclose F
 GLIBC_2.34 dlerror F
 GLIBC_2.34 dlmopen F
diff --git a/sysdeps/unix/sysv/linux/hppa/libdl.abilist b/sysdeps/unix/sysv/linux/hppa/libdl.abilist
index 795a5abd45..5f81d13a21 100644
--- a/sysdeps/unix/sysv/linux/hppa/libdl.abilist
+++ b/sysdeps/unix/sysv/linux/hppa/libdl.abilist
@@ -1,6 +1,5 @@ 
 GLIBC_2.0 dlopen F
 GLIBC_2.1 dlopen F
 GLIBC_2.1 dlvsym F
-GLIBC_2.3.3 dladdr1 F
 GLIBC_2.3.3 dlinfo F
 GLIBC_2.3.4 __libdl_version_placeholder F
diff --git a/sysdeps/unix/sysv/linux/i386/libc.abilist b/sysdeps/unix/sysv/linux/i386/libc.abilist
index 233096afbd..8b0a2381bb 100644
--- a/sysdeps/unix/sysv/linux/i386/libc.abilist
+++ b/sysdeps/unix/sysv/linux/i386/libc.abilist
@@ -2312,6 +2312,7 @@  GLIBC_2.3.3 __pthread_unregister_cancel F
 GLIBC_2.3.3 __pthread_unregister_cancel_restore F
 GLIBC_2.3.3 __pthread_unwind_next F
 GLIBC_2.3.3 _sys_siglist D 0x104
+GLIBC_2.3.3 dladdr1 F
 GLIBC_2.3.3 gnu_dev_major F
 GLIBC_2.3.3 gnu_dev_makedev F
 GLIBC_2.3.3 gnu_dev_minor F
@@ -2428,6 +2429,7 @@  GLIBC_2.34 cnd_signal F
 GLIBC_2.34 cnd_timedwait F
 GLIBC_2.34 cnd_wait F
 GLIBC_2.34 dladdr F
+GLIBC_2.34 dladdr1 F
 GLIBC_2.34 dlclose F
 GLIBC_2.34 dlerror F
 GLIBC_2.34 dlmopen F
diff --git a/sysdeps/unix/sysv/linux/i386/libdl.abilist b/sysdeps/unix/sysv/linux/i386/libdl.abilist
index 795a5abd45..5f81d13a21 100644
--- a/sysdeps/unix/sysv/linux/i386/libdl.abilist
+++ b/sysdeps/unix/sysv/linux/i386/libdl.abilist
@@ -1,6 +1,5 @@ 
 GLIBC_2.0 dlopen F
 GLIBC_2.1 dlopen F
 GLIBC_2.1 dlvsym F
-GLIBC_2.3.3 dladdr1 F
 GLIBC_2.3.3 dlinfo F
 GLIBC_2.3.4 __libdl_version_placeholder F
diff --git a/sysdeps/unix/sysv/linux/ia64/libc.abilist b/sysdeps/unix/sysv/linux/ia64/libc.abilist
index 704fe57ca2..a2fd7b6f0e 100644
--- a/sysdeps/unix/sysv/linux/ia64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/ia64/libc.abilist
@@ -2164,6 +2164,7 @@  GLIBC_2.3.3 __pthread_unregister_cancel F
 GLIBC_2.3.3 __pthread_unregister_cancel_restore F
 GLIBC_2.3.3 __pthread_unwind_next F
 GLIBC_2.3.3 _sys_siglist D 0x208
+GLIBC_2.3.3 dladdr1 F
 GLIBC_2.3.3 gnu_dev_major F
 GLIBC_2.3.3 gnu_dev_makedev F
 GLIBC_2.3.3 gnu_dev_minor F
@@ -2280,6 +2281,7 @@  GLIBC_2.34 cnd_signal F
 GLIBC_2.34 cnd_timedwait F
 GLIBC_2.34 cnd_wait F
 GLIBC_2.34 dladdr F
+GLIBC_2.34 dladdr1 F
 GLIBC_2.34 dlclose F
 GLIBC_2.34 dlerror F
 GLIBC_2.34 dlmopen F
diff --git a/sysdeps/unix/sysv/linux/ia64/libdl.abilist b/sysdeps/unix/sysv/linux/ia64/libdl.abilist
index 795a5abd45..5f81d13a21 100644
--- a/sysdeps/unix/sysv/linux/ia64/libdl.abilist
+++ b/sysdeps/unix/sysv/linux/ia64/libdl.abilist
@@ -1,6 +1,5 @@ 
 GLIBC_2.0 dlopen F
 GLIBC_2.1 dlopen F
 GLIBC_2.1 dlvsym F
-GLIBC_2.3.3 dladdr1 F
 GLIBC_2.3.3 dlinfo F
 GLIBC_2.3.4 __libdl_version_placeholder F
diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist
index dc32b7561b..ec0f948a22 100644
--- a/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist
+++ b/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist
@@ -209,6 +209,7 @@  GLIBC_2.34 cnd_signal F
 GLIBC_2.34 cnd_timedwait F
 GLIBC_2.34 cnd_wait F
 GLIBC_2.34 dladdr F
+GLIBC_2.34 dladdr1 F
 GLIBC_2.34 dlclose F
 GLIBC_2.34 dlerror F
 GLIBC_2.34 dlmopen F
@@ -1012,6 +1013,7 @@  GLIBC_2.4 dirname F
 GLIBC_2.4 div F
 GLIBC_2.4 dl_iterate_phdr F
 GLIBC_2.4 dladdr F
+GLIBC_2.4 dladdr1 F
 GLIBC_2.4 dlclose F
 GLIBC_2.4 dlerror F
 GLIBC_2.4 dlmopen F
diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/libdl.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/libdl.abilist
index 22691633fb..c24e10d9c5 100644
--- a/sysdeps/unix/sysv/linux/m68k/coldfire/libdl.abilist
+++ b/sysdeps/unix/sysv/linux/m68k/coldfire/libdl.abilist
@@ -1,4 +1,3 @@ 
-GLIBC_2.4 dladdr1 F
 GLIBC_2.4 dlinfo F
 GLIBC_2.4 dlopen F
 GLIBC_2.4 dlvsym F
diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist
index 0ad41be521..2d69d956a1 100644
--- a/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist
+++ b/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist
@@ -2255,6 +2255,7 @@  GLIBC_2.3.3 __pthread_unregister_cancel F
 GLIBC_2.3.3 __pthread_unregister_cancel_restore F
 GLIBC_2.3.3 __pthread_unwind_next F
 GLIBC_2.3.3 _sys_siglist D 0x104
+GLIBC_2.3.3 dladdr1 F
 GLIBC_2.3.3 gnu_dev_major F
 GLIBC_2.3.3 gnu_dev_makedev F
 GLIBC_2.3.3 gnu_dev_minor F
@@ -2371,6 +2372,7 @@  GLIBC_2.34 cnd_signal F
 GLIBC_2.34 cnd_timedwait F
 GLIBC_2.34 cnd_wait F
 GLIBC_2.34 dladdr F
+GLIBC_2.34 dladdr1 F
 GLIBC_2.34 dlclose F
 GLIBC_2.34 dlerror F
 GLIBC_2.34 dlmopen F
diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/libdl.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/libdl.abilist
index 795a5abd45..5f81d13a21 100644
--- a/sysdeps/unix/sysv/linux/m68k/m680x0/libdl.abilist
+++ b/sysdeps/unix/sysv/linux/m68k/m680x0/libdl.abilist
@@ -1,6 +1,5 @@ 
 GLIBC_2.0 dlopen F
 GLIBC_2.1 dlopen F
 GLIBC_2.1 dlvsym F
-GLIBC_2.3.3 dladdr1 F
 GLIBC_2.3.3 dlinfo F
 GLIBC_2.3.4 __libdl_version_placeholder F
diff --git a/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist b/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist
index ea61742cf2..7e6a7b1645 100644
--- a/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist
+++ b/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist
@@ -721,6 +721,7 @@  GLIBC_2.18 dirname F
 GLIBC_2.18 div F
 GLIBC_2.18 dl_iterate_phdr F
 GLIBC_2.18 dladdr F
+GLIBC_2.18 dladdr1 F
 GLIBC_2.18 dlclose F
 GLIBC_2.18 dlerror F
 GLIBC_2.18 dlmopen F
@@ -2342,6 +2343,7 @@  GLIBC_2.34 cnd_signal F
 GLIBC_2.34 cnd_timedwait F
 GLIBC_2.34 cnd_wait F
 GLIBC_2.34 dladdr F
+GLIBC_2.34 dladdr1 F
 GLIBC_2.34 dlclose F
 GLIBC_2.34 dlerror F
 GLIBC_2.34 dlmopen F
diff --git a/sysdeps/unix/sysv/linux/microblaze/be/libdl.abilist b/sysdeps/unix/sysv/linux/microblaze/be/libdl.abilist
index 409e59cf21..c042c043d6 100644
--- a/sysdeps/unix/sysv/linux/microblaze/be/libdl.abilist
+++ b/sysdeps/unix/sysv/linux/microblaze/be/libdl.abilist
@@ -1,4 +1,3 @@ 
-GLIBC_2.18 dladdr1 F
 GLIBC_2.18 dlinfo F
 GLIBC_2.18 dlopen F
 GLIBC_2.18 dlvsym F
diff --git a/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist b/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist
index 3b09b44dd8..01bc9594bb 100644
--- a/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist
+++ b/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist
@@ -721,6 +721,7 @@  GLIBC_2.18 dirname F
 GLIBC_2.18 div F
 GLIBC_2.18 dl_iterate_phdr F
 GLIBC_2.18 dladdr F
+GLIBC_2.18 dladdr1 F
 GLIBC_2.18 dlclose F
 GLIBC_2.18 dlerror F
 GLIBC_2.18 dlmopen F
@@ -2339,6 +2340,7 @@  GLIBC_2.34 cnd_signal F
 GLIBC_2.34 cnd_timedwait F
 GLIBC_2.34 cnd_wait F
 GLIBC_2.34 dladdr F
+GLIBC_2.34 dladdr1 F
 GLIBC_2.34 dlclose F
 GLIBC_2.34 dlerror F
 GLIBC_2.34 dlmopen F
diff --git a/sysdeps/unix/sysv/linux/microblaze/le/libdl.abilist b/sysdeps/unix/sysv/linux/microblaze/le/libdl.abilist
index 409e59cf21..c042c043d6 100644
--- a/sysdeps/unix/sysv/linux/microblaze/le/libdl.abilist
+++ b/sysdeps/unix/sysv/linux/microblaze/le/libdl.abilist
@@ -1,4 +1,3 @@ 
-GLIBC_2.18 dladdr1 F
 GLIBC_2.18 dlinfo F
 GLIBC_2.18 dlopen F
 GLIBC_2.18 dlvsym F
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
index adde44be66..b13544403e 100644
--- a/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
@@ -2221,6 +2221,7 @@  GLIBC_2.3.3 __pthread_unregister_cancel F
 GLIBC_2.3.3 __pthread_unregister_cancel_restore F
 GLIBC_2.3.3 __pthread_unwind_next F
 GLIBC_2.3.3 _sys_siglist D 0x200
+GLIBC_2.3.3 dladdr1 F
 GLIBC_2.3.3 gnu_dev_major F
 GLIBC_2.3.3 gnu_dev_makedev F
 GLIBC_2.3.3 gnu_dev_minor F
@@ -2336,6 +2337,7 @@  GLIBC_2.34 cnd_signal F
 GLIBC_2.34 cnd_timedwait F
 GLIBC_2.34 cnd_wait F
 GLIBC_2.34 dladdr F
+GLIBC_2.34 dladdr1 F
 GLIBC_2.34 dlclose F
 GLIBC_2.34 dlerror F
 GLIBC_2.34 dlmopen F
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/libdl.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libdl.abilist
index 04aca378ef..cb7bf28178 100644
--- a/sysdeps/unix/sysv/linux/mips/mips32/libdl.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips32/libdl.abilist
@@ -1,6 +1,5 @@ 
 GLIBC_2.0 dlopen F
 GLIBC_2.2 dlopen F
 GLIBC_2.2 dlvsym F
-GLIBC_2.3.3 dladdr1 F
 GLIBC_2.3.3 dlinfo F
 GLIBC_2.3.4 __libdl_version_placeholder F
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
index a4c9a17e9e..e76cbe2a87 100644
--- a/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
@@ -2219,6 +2219,7 @@  GLIBC_2.3.3 __pthread_unregister_cancel F
 GLIBC_2.3.3 __pthread_unregister_cancel_restore F
 GLIBC_2.3.3 __pthread_unwind_next F
 GLIBC_2.3.3 _sys_siglist D 0x200
+GLIBC_2.3.3 dladdr1 F
 GLIBC_2.3.3 gnu_dev_major F
 GLIBC_2.3.3 gnu_dev_makedev F
 GLIBC_2.3.3 gnu_dev_minor F
@@ -2334,6 +2335,7 @@  GLIBC_2.34 cnd_signal F
 GLIBC_2.34 cnd_timedwait F
 GLIBC_2.34 cnd_wait F
 GLIBC_2.34 dladdr F
+GLIBC_2.34 dladdr1 F
 GLIBC_2.34 dlclose F
 GLIBC_2.34 dlerror F
 GLIBC_2.34 dlmopen F
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/libdl.abilist b/sysdeps/unix/sysv/linux/mips/mips64/libdl.abilist
index 04aca378ef..cb7bf28178 100644
--- a/sysdeps/unix/sysv/linux/mips/mips64/libdl.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips64/libdl.abilist
@@ -1,6 +1,5 @@ 
 GLIBC_2.0 dlopen F
 GLIBC_2.2 dlopen F
 GLIBC_2.2 dlvsym F
-GLIBC_2.3.3 dladdr1 F
 GLIBC_2.3.3 dlinfo F
 GLIBC_2.3.4 __libdl_version_placeholder F
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
index 214e0db752..5ac0d47413 100644
--- a/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
@@ -2227,6 +2227,7 @@  GLIBC_2.3.3 __pthread_unregister_cancel F
 GLIBC_2.3.3 __pthread_unregister_cancel_restore F
 GLIBC_2.3.3 __pthread_unwind_next F
 GLIBC_2.3.3 _sys_siglist D 0x200
+GLIBC_2.3.3 dladdr1 F
 GLIBC_2.3.3 gnu_dev_major F
 GLIBC_2.3.3 gnu_dev_makedev F
 GLIBC_2.3.3 gnu_dev_minor F
@@ -2342,6 +2343,7 @@  GLIBC_2.34 cnd_signal F
 GLIBC_2.34 cnd_timedwait F
 GLIBC_2.34 cnd_wait F
 GLIBC_2.34 dladdr F
+GLIBC_2.34 dladdr1 F
 GLIBC_2.34 dlclose F
 GLIBC_2.34 dlerror F
 GLIBC_2.34 dlmopen F
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
index b09d4058a2..07d121d225 100644
--- a/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
@@ -2220,6 +2220,7 @@  GLIBC_2.3.3 __pthread_unregister_cancel F
 GLIBC_2.3.3 __pthread_unregister_cancel_restore F
 GLIBC_2.3.3 __pthread_unwind_next F
 GLIBC_2.3.3 _sys_siglist D 0x400
+GLIBC_2.3.3 dladdr1 F
 GLIBC_2.3.3 gnu_dev_major F
 GLIBC_2.3.3 gnu_dev_makedev F
 GLIBC_2.3.3 gnu_dev_minor F
@@ -2336,6 +2337,7 @@  GLIBC_2.34 cnd_signal F
 GLIBC_2.34 cnd_timedwait F
 GLIBC_2.34 cnd_wait F
 GLIBC_2.34 dladdr F
+GLIBC_2.34 dladdr1 F
 GLIBC_2.34 dlclose F
 GLIBC_2.34 dlerror F
 GLIBC_2.34 dlmopen F
diff --git a/sysdeps/unix/sysv/linux/nios2/libc.abilist b/sysdeps/unix/sysv/linux/nios2/libc.abilist
index 748f12c254..a27cb9cf18 100644
--- a/sysdeps/unix/sysv/linux/nios2/libc.abilist
+++ b/sysdeps/unix/sysv/linux/nios2/libc.abilist
@@ -764,6 +764,7 @@  GLIBC_2.21 dirname F
 GLIBC_2.21 div F
 GLIBC_2.21 dl_iterate_phdr F
 GLIBC_2.21 dladdr F
+GLIBC_2.21 dladdr1 F
 GLIBC_2.21 dlclose F
 GLIBC_2.21 dlerror F
 GLIBC_2.21 dlmopen F
@@ -2381,6 +2382,7 @@  GLIBC_2.34 cnd_signal F
 GLIBC_2.34 cnd_timedwait F
 GLIBC_2.34 cnd_wait F
 GLIBC_2.34 dladdr F
+GLIBC_2.34 dladdr1 F
 GLIBC_2.34 dlclose F
 GLIBC_2.34 dlerror F
 GLIBC_2.34 dlmopen F
diff --git a/sysdeps/unix/sysv/linux/nios2/libdl.abilist b/sysdeps/unix/sysv/linux/nios2/libdl.abilist
index 90aaa0b49b..9acd54fa38 100644
--- a/sysdeps/unix/sysv/linux/nios2/libdl.abilist
+++ b/sysdeps/unix/sysv/linux/nios2/libdl.abilist
@@ -1,4 +1,3 @@ 
-GLIBC_2.21 dladdr1 F
 GLIBC_2.21 dlinfo F
 GLIBC_2.21 dlopen F
 GLIBC_2.21 dlvsym F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
index 4134f7ed41..1a1cbb94ce 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
@@ -2259,6 +2259,7 @@  GLIBC_2.3.3 __pthread_unregister_cancel F
 GLIBC_2.3.3 __pthread_unregister_cancel_restore F
 GLIBC_2.3.3 __pthread_unwind_next F
 GLIBC_2.3.3 _sys_siglist D 0x104
+GLIBC_2.3.3 dladdr1 F
 GLIBC_2.3.3 getcontext F
 GLIBC_2.3.3 gnu_dev_major F
 GLIBC_2.3.3 gnu_dev_makedev F
@@ -2398,6 +2399,7 @@  GLIBC_2.34 cnd_signal F
 GLIBC_2.34 cnd_timedwait F
 GLIBC_2.34 cnd_wait F
 GLIBC_2.34 dladdr F
+GLIBC_2.34 dladdr1 F
 GLIBC_2.34 dlclose F
 GLIBC_2.34 dlerror F
 GLIBC_2.34 dlmopen F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libdl.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libdl.abilist
index 795a5abd45..5f81d13a21 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libdl.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libdl.abilist
@@ -1,6 +1,5 @@ 
 GLIBC_2.0 dlopen F
 GLIBC_2.1 dlopen F
 GLIBC_2.1 dlvsym F
-GLIBC_2.3.3 dladdr1 F
 GLIBC_2.3.3 dlinfo F
 GLIBC_2.3.4 __libdl_version_placeholder F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
index 43baf50dca..9b9dc9ef3a 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
@@ -2292,6 +2292,7 @@  GLIBC_2.3.3 __pthread_unregister_cancel F
 GLIBC_2.3.3 __pthread_unregister_cancel_restore F
 GLIBC_2.3.3 __pthread_unwind_next F
 GLIBC_2.3.3 _sys_siglist D 0x104
+GLIBC_2.3.3 dladdr1 F
 GLIBC_2.3.3 getcontext F
 GLIBC_2.3.3 gnu_dev_major F
 GLIBC_2.3.3 gnu_dev_makedev F
@@ -2431,6 +2432,7 @@  GLIBC_2.34 cnd_signal F
 GLIBC_2.34 cnd_timedwait F
 GLIBC_2.34 cnd_wait F
 GLIBC_2.34 dladdr F
+GLIBC_2.34 dladdr1 F
 GLIBC_2.34 dlclose F
 GLIBC_2.34 dlerror F
 GLIBC_2.34 dlmopen F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist
index b3d27c2678..aad3704047 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist
@@ -2111,6 +2111,7 @@  GLIBC_2.3.3 __pthread_unregister_cancel F
 GLIBC_2.3.3 __pthread_unregister_cancel_restore F
 GLIBC_2.3.3 __pthread_unwind_next F
 GLIBC_2.3.3 _sys_siglist D 0x208
+GLIBC_2.3.3 dladdr1 F
 GLIBC_2.3.3 gnu_dev_major F
 GLIBC_2.3.3 gnu_dev_makedev F
 GLIBC_2.3.3 gnu_dev_minor F
@@ -2245,6 +2246,7 @@  GLIBC_2.34 cnd_signal F
 GLIBC_2.34 cnd_timedwait F
 GLIBC_2.34 cnd_wait F
 GLIBC_2.34 dladdr F
+GLIBC_2.34 dladdr1 F
 GLIBC_2.34 dlclose F
 GLIBC_2.34 dlerror F
 GLIBC_2.34 dlmopen F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libdl.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libdl.abilist
index 8e709e5bc4..c27f19ac95 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libdl.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libdl.abilist
@@ -1,5 +1,4 @@ 
 GLIBC_2.3 dlopen F
 GLIBC_2.3 dlvsym F
-GLIBC_2.3.3 dladdr1 F
 GLIBC_2.3.3 dlinfo F
 GLIBC_2.3.4 __libdl_version_placeholder F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist
index 60a6327f37..64a45a1c48 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist
@@ -807,6 +807,7 @@  GLIBC_2.17 dirname F
 GLIBC_2.17 div F
 GLIBC_2.17 dl_iterate_phdr F
 GLIBC_2.17 dladdr F
+GLIBC_2.17 dladdr1 F
 GLIBC_2.17 dlclose F
 GLIBC_2.17 dlerror F
 GLIBC_2.17 dlmopen F
@@ -2544,6 +2545,7 @@  GLIBC_2.34 cnd_signal F
 GLIBC_2.34 cnd_timedwait F
 GLIBC_2.34 cnd_wait F
 GLIBC_2.34 dladdr F
+GLIBC_2.34 dladdr1 F
 GLIBC_2.34 dlclose F
 GLIBC_2.34 dlerror F
 GLIBC_2.34 dlmopen F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libdl.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libdl.abilist
index 391b72c100..05eeace024 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libdl.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libdl.abilist
@@ -1,4 +1,3 @@ 
-GLIBC_2.17 dladdr1 F
 GLIBC_2.17 dlinfo F
 GLIBC_2.17 dlopen F
 GLIBC_2.17 dlvsym F
diff --git a/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist b/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist
index dccdf14b63..94c3bcf6e2 100644
--- a/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist
+++ b/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist
@@ -657,6 +657,7 @@  GLIBC_2.33 dirname F
 GLIBC_2.33 div F
 GLIBC_2.33 dl_iterate_phdr F
 GLIBC_2.33 dladdr F
+GLIBC_2.33 dladdr1 F
 GLIBC_2.33 dlclose F
 GLIBC_2.33 dlerror F
 GLIBC_2.33 dlmopen F
@@ -2109,6 +2110,7 @@  GLIBC_2.34 cnd_signal F
 GLIBC_2.34 cnd_timedwait F
 GLIBC_2.34 cnd_wait F
 GLIBC_2.34 dladdr F
+GLIBC_2.34 dladdr1 F
 GLIBC_2.34 dlclose F
 GLIBC_2.34 dlerror F
 GLIBC_2.34 dlmopen F
diff --git a/sysdeps/unix/sysv/linux/riscv/rv32/libdl.abilist b/sysdeps/unix/sysv/linux/riscv/rv32/libdl.abilist
index 2710b64293..2b91d9886c 100644
--- a/sysdeps/unix/sysv/linux/riscv/rv32/libdl.abilist
+++ b/sysdeps/unix/sysv/linux/riscv/rv32/libdl.abilist
@@ -1,4 +1,3 @@ 
-GLIBC_2.33 dladdr1 F
 GLIBC_2.33 dlinfo F
 GLIBC_2.33 dlopen F
 GLIBC_2.33 dlvsym F
diff --git a/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist b/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist
index 2acb8db062..d2cde862c3 100644
--- a/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist
@@ -698,6 +698,7 @@  GLIBC_2.27 dirname F
 GLIBC_2.27 div F
 GLIBC_2.27 dl_iterate_phdr F
 GLIBC_2.27 dladdr F
+GLIBC_2.27 dladdr1 F
 GLIBC_2.27 dlclose F
 GLIBC_2.27 dlerror F
 GLIBC_2.27 dlmopen F
@@ -2309,6 +2310,7 @@  GLIBC_2.34 cnd_signal F
 GLIBC_2.34 cnd_timedwait F
 GLIBC_2.34 cnd_wait F
 GLIBC_2.34 dladdr F
+GLIBC_2.34 dladdr1 F
 GLIBC_2.34 dlclose F
 GLIBC_2.34 dlerror F
 GLIBC_2.34 dlmopen F
diff --git a/sysdeps/unix/sysv/linux/riscv/rv64/libdl.abilist b/sysdeps/unix/sysv/linux/riscv/rv64/libdl.abilist
index c0d8307937..8e30134591 100644
--- a/sysdeps/unix/sysv/linux/riscv/rv64/libdl.abilist
+++ b/sysdeps/unix/sysv/linux/riscv/rv64/libdl.abilist
@@ -1,4 +1,3 @@ 
-GLIBC_2.27 dladdr1 F
 GLIBC_2.27 dlinfo F
 GLIBC_2.27 dlopen F
 GLIBC_2.27 dlvsym F
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
index b2666bd723..30a533b622 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
+++ b/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
@@ -2268,6 +2268,7 @@  GLIBC_2.3.3 __pthread_unregister_cancel F
 GLIBC_2.3.3 __pthread_unregister_cancel_restore F
 GLIBC_2.3.3 __pthread_unwind_next F
 GLIBC_2.3.3 _sys_siglist D 0x104
+GLIBC_2.3.3 dladdr1 F
 GLIBC_2.3.3 gnu_dev_major F
 GLIBC_2.3.3 gnu_dev_makedev F
 GLIBC_2.3.3 gnu_dev_minor F
@@ -2396,6 +2397,7 @@  GLIBC_2.34 cnd_signal F
 GLIBC_2.34 cnd_timedwait F
 GLIBC_2.34 cnd_wait F
 GLIBC_2.34 dladdr F
+GLIBC_2.34 dladdr1 F
 GLIBC_2.34 dlclose F
 GLIBC_2.34 dlerror F
 GLIBC_2.34 dlmopen F
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/libdl.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libdl.abilist
index 795a5abd45..5f81d13a21 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-32/libdl.abilist
+++ b/sysdeps/unix/sysv/linux/s390/s390-32/libdl.abilist
@@ -1,6 +1,5 @@ 
 GLIBC_2.0 dlopen F
 GLIBC_2.1 dlopen F
 GLIBC_2.1 dlvsym F
-GLIBC_2.3.3 dladdr1 F
 GLIBC_2.3.3 dlinfo F
 GLIBC_2.3.4 __libdl_version_placeholder F
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
index 6ea55ebcdf..77b21973db 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
@@ -2157,6 +2157,7 @@  GLIBC_2.3.3 __pthread_unregister_cancel F
 GLIBC_2.3.3 __pthread_unregister_cancel_restore F
 GLIBC_2.3.3 __pthread_unwind_next F
 GLIBC_2.3.3 _sys_siglist D 0x208
+GLIBC_2.3.3 dladdr1 F
 GLIBC_2.3.3 gnu_dev_major F
 GLIBC_2.3.3 gnu_dev_makedev F
 GLIBC_2.3.3 gnu_dev_minor F
@@ -2282,6 +2283,7 @@  GLIBC_2.34 cnd_signal F
 GLIBC_2.34 cnd_timedwait F
 GLIBC_2.34 cnd_wait F
 GLIBC_2.34 dladdr F
+GLIBC_2.34 dladdr1 F
 GLIBC_2.34 dlclose F
 GLIBC_2.34 dlerror F
 GLIBC_2.34 dlmopen F
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/libdl.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libdl.abilist
index 45decb94f9..f882403fe2 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-64/libdl.abilist
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/libdl.abilist
@@ -1,5 +1,4 @@ 
 GLIBC_2.2 dlopen F
 GLIBC_2.2 dlvsym F
-GLIBC_2.3.3 dladdr1 F
 GLIBC_2.3.3 dlinfo F
 GLIBC_2.3.4 __libdl_version_placeholder F
diff --git a/sysdeps/unix/sysv/linux/sh/be/libc.abilist b/sysdeps/unix/sysv/linux/sh/be/libc.abilist
index 7d3680520a..2700b6bf98 100644
--- a/sysdeps/unix/sysv/linux/sh/be/libc.abilist
+++ b/sysdeps/unix/sysv/linux/sh/be/libc.abilist
@@ -2135,6 +2135,7 @@  GLIBC_2.3.3 __pthread_unregister_cancel F
 GLIBC_2.3.3 __pthread_unregister_cancel_restore F
 GLIBC_2.3.3 __pthread_unwind_next F
 GLIBC_2.3.3 _sys_siglist D 0x104
+GLIBC_2.3.3 dladdr1 F
 GLIBC_2.3.3 gnu_dev_major F
 GLIBC_2.3.3 gnu_dev_makedev F
 GLIBC_2.3.3 gnu_dev_minor F
@@ -2251,6 +2252,7 @@  GLIBC_2.34 cnd_signal F
 GLIBC_2.34 cnd_timedwait F
 GLIBC_2.34 cnd_wait F
 GLIBC_2.34 dladdr F
+GLIBC_2.34 dladdr1 F
 GLIBC_2.34 dlclose F
 GLIBC_2.34 dlerror F
 GLIBC_2.34 dlmopen F
diff --git a/sysdeps/unix/sysv/linux/sh/be/libdl.abilist b/sysdeps/unix/sysv/linux/sh/be/libdl.abilist
index 795a5abd45..5f81d13a21 100644
--- a/sysdeps/unix/sysv/linux/sh/be/libdl.abilist
+++ b/sysdeps/unix/sysv/linux/sh/be/libdl.abilist
@@ -1,6 +1,5 @@ 
 GLIBC_2.0 dlopen F
 GLIBC_2.1 dlopen F
 GLIBC_2.1 dlvsym F
-GLIBC_2.3.3 dladdr1 F
 GLIBC_2.3.3 dlinfo F
 GLIBC_2.3.4 __libdl_version_placeholder F
diff --git a/sysdeps/unix/sysv/linux/sh/le/libc.abilist b/sysdeps/unix/sysv/linux/sh/le/libc.abilist
index 51a77c9553..de6251d508 100644
--- a/sysdeps/unix/sysv/linux/sh/le/libc.abilist
+++ b/sysdeps/unix/sysv/linux/sh/le/libc.abilist
@@ -2135,6 +2135,7 @@  GLIBC_2.3.3 __pthread_unregister_cancel F
 GLIBC_2.3.3 __pthread_unregister_cancel_restore F
 GLIBC_2.3.3 __pthread_unwind_next F
 GLIBC_2.3.3 _sys_siglist D 0x104
+GLIBC_2.3.3 dladdr1 F
 GLIBC_2.3.3 gnu_dev_major F
 GLIBC_2.3.3 gnu_dev_makedev F
 GLIBC_2.3.3 gnu_dev_minor F
@@ -2248,6 +2249,7 @@  GLIBC_2.34 cnd_signal F
 GLIBC_2.34 cnd_timedwait F
 GLIBC_2.34 cnd_wait F
 GLIBC_2.34 dladdr F
+GLIBC_2.34 dladdr1 F
 GLIBC_2.34 dlclose F
 GLIBC_2.34 dlerror F
 GLIBC_2.34 dlmopen F
diff --git a/sysdeps/unix/sysv/linux/sh/le/libdl.abilist b/sysdeps/unix/sysv/linux/sh/le/libdl.abilist
index 795a5abd45..5f81d13a21 100644
--- a/sysdeps/unix/sysv/linux/sh/le/libdl.abilist
+++ b/sysdeps/unix/sysv/linux/sh/le/libdl.abilist
@@ -1,6 +1,5 @@ 
 GLIBC_2.0 dlopen F
 GLIBC_2.1 dlopen F
 GLIBC_2.1 dlvsym F
-GLIBC_2.3.3 dladdr1 F
 GLIBC_2.3.3 dlinfo F
 GLIBC_2.3.4 __libdl_version_placeholder F
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist
index 45053a171a..7ada64410a 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist
+++ b/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist
@@ -2262,6 +2262,7 @@  GLIBC_2.3.3 __pthread_unregister_cancel F
 GLIBC_2.3.3 __pthread_unregister_cancel_restore F
 GLIBC_2.3.3 __pthread_unwind_next F
 GLIBC_2.3.3 _sys_siglist D 0x104
+GLIBC_2.3.3 dladdr1 F
 GLIBC_2.3.3 gnu_dev_major F
 GLIBC_2.3.3 gnu_dev_makedev F
 GLIBC_2.3.3 gnu_dev_minor F
@@ -2389,6 +2390,7 @@  GLIBC_2.34 cnd_signal F
 GLIBC_2.34 cnd_timedwait F
 GLIBC_2.34 cnd_wait F
 GLIBC_2.34 dladdr F
+GLIBC_2.34 dladdr1 F
 GLIBC_2.34 dlclose F
 GLIBC_2.34 dlerror F
 GLIBC_2.34 dlmopen F
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/libdl.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libdl.abilist
index 795a5abd45..5f81d13a21 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc32/libdl.abilist
+++ b/sysdeps/unix/sysv/linux/sparc/sparc32/libdl.abilist
@@ -1,6 +1,5 @@ 
 GLIBC_2.0 dlopen F
 GLIBC_2.1 dlopen F
 GLIBC_2.1 dlvsym F
-GLIBC_2.3.3 dladdr1 F
 GLIBC_2.3.3 dlinfo F
 GLIBC_2.3.4 __libdl_version_placeholder F
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist
index 30e7e6baa0..75fb6e4bbe 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist
@@ -2186,6 +2186,7 @@  GLIBC_2.3.3 __pthread_unregister_cancel F
 GLIBC_2.3.3 __pthread_unregister_cancel_restore F
 GLIBC_2.3.3 __pthread_unwind_next F
 GLIBC_2.3.3 _sys_siglist D 0x208
+GLIBC_2.3.3 dladdr1 F
 GLIBC_2.3.3 gnu_dev_major F
 GLIBC_2.3.3 gnu_dev_makedev F
 GLIBC_2.3.3 gnu_dev_minor F
@@ -2301,6 +2302,7 @@  GLIBC_2.34 cnd_signal F
 GLIBC_2.34 cnd_timedwait F
 GLIBC_2.34 cnd_wait F
 GLIBC_2.34 dladdr F
+GLIBC_2.34 dladdr1 F
 GLIBC_2.34 dlclose F
 GLIBC_2.34 dlerror F
 GLIBC_2.34 dlmopen F
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/libdl.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/libdl.abilist
index 795a5abd45..5f81d13a21 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/libdl.abilist
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libdl.abilist
@@ -1,6 +1,5 @@ 
 GLIBC_2.0 dlopen F
 GLIBC_2.1 dlopen F
 GLIBC_2.1 dlvsym F
-GLIBC_2.3.3 dladdr1 F
 GLIBC_2.3.3 dlinfo F
 GLIBC_2.3.4 __libdl_version_placeholder F
diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
index abaf3ee9de..d94135174a 100644
--- a/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
@@ -2145,6 +2145,7 @@  GLIBC_2.3.3 __pthread_unregister_cancel F
 GLIBC_2.3.3 __pthread_unregister_cancel_restore F
 GLIBC_2.3.3 __pthread_unwind_next F
 GLIBC_2.3.3 _sys_siglist D 0x208
+GLIBC_2.3.3 dladdr1 F
 GLIBC_2.3.3 gnu_dev_major F
 GLIBC_2.3.3 gnu_dev_makedev F
 GLIBC_2.3.3 gnu_dev_minor F
@@ -2260,6 +2261,7 @@  GLIBC_2.34 cnd_signal F
 GLIBC_2.34 cnd_timedwait F
 GLIBC_2.34 cnd_wait F
 GLIBC_2.34 dladdr F
+GLIBC_2.34 dladdr1 F
 GLIBC_2.34 dlclose F
 GLIBC_2.34 dlerror F
 GLIBC_2.34 dlmopen F
diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libdl.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libdl.abilist
index 91f878e859..6b11f673cc 100644
--- a/sysdeps/unix/sysv/linux/x86_64/64/libdl.abilist
+++ b/sysdeps/unix/sysv/linux/x86_64/64/libdl.abilist
@@ -1,5 +1,4 @@ 
 GLIBC_2.2.5 dlopen F
 GLIBC_2.2.5 dlvsym F
-GLIBC_2.3.3 dladdr1 F
 GLIBC_2.3.3 dlinfo F
 GLIBC_2.3.4 __libdl_version_placeholder F
diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist
index b30feb4888..989f276480 100644
--- a/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist
+++ b/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist
@@ -723,6 +723,7 @@  GLIBC_2.16 dirname F
 GLIBC_2.16 div F
 GLIBC_2.16 dl_iterate_phdr F
 GLIBC_2.16 dladdr F
+GLIBC_2.16 dladdr1 F
 GLIBC_2.16 dlclose F
 GLIBC_2.16 dlerror F
 GLIBC_2.16 dlmopen F
@@ -2363,6 +2364,7 @@  GLIBC_2.34 cnd_signal F
 GLIBC_2.34 cnd_timedwait F
 GLIBC_2.34 cnd_wait F
 GLIBC_2.34 dladdr F
+GLIBC_2.34 dladdr1 F
 GLIBC_2.34 dlclose F
 GLIBC_2.34 dlerror F
 GLIBC_2.34 dlmopen F
diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libdl.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libdl.abilist
index b37e9ff78c..fe8858d4ec 100644
--- a/sysdeps/unix/sysv/linux/x86_64/x32/libdl.abilist
+++ b/sysdeps/unix/sysv/linux/x86_64/x32/libdl.abilist
@@ -1,4 +1,3 @@ 
-GLIBC_2.16 dladdr1 F
 GLIBC_2.16 dlinfo F
 GLIBC_2.16 dlopen F
 GLIBC_2.16 dlvsym F