From 0c1c3a771eceec46e66ce1183cf988e2303bd373 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Thu, 3 Jun 2021 08:26:04 +0200 Subject: dlfcn: Move dlopen into libc The symbol was moved using scripts/move-symbol-to-libc.py. Reviewed-by: Adhemerval Zanella --- dlfcn/dlfcn.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'dlfcn/dlfcn.c') diff --git a/dlfcn/dlfcn.c b/dlfcn/dlfcn.c index 55ecfcabbe..ef750bc27a 100644 --- a/dlfcn/dlfcn.c +++ b/dlfcn/dlfcn.c @@ -48,14 +48,22 @@ __libdl_version_placeholder_1 (void) { } -#if SHLIB_COMPAT (libdl, GLIBC_2_3_3, GLIBC_2_34) \ - && ABI_libdl_GLIBC_2_3_3 != ABI_libdl_GLIBC_2_1 +#if SHLIB_COMPAT (libdl, GLIBC_2_0, GLIBC_2_34) +compat_symbol (libdl, __libdl_version_placeholder_1, + __libdl_version_placeholder, GLIBC_2_0); +#endif + +#if SHLIB_COMPAT (libdl, GLIBC_2_1, GLIBC_2_34) +compat_symbol (libdl, __libdl_version_placeholder_1, + __libdl_version_placeholder, GLIBC_2_1); +#endif + +#if SHLIB_COMPAT (libdl, GLIBC_2_3_3, GLIBC_2_34) compat_symbol (libdl, __libdl_version_placeholder_1, __libdl_version_placeholder, GLIBC_2_3_3); #endif -#if SHLIB_COMPAT (libdl, GLIBC_2_3_4, GLIBC_2_34) \ - && ABI_libdl_GLIBC_2_3_4 != ABI_libdl_GLIBC_2_1 +#if SHLIB_COMPAT (libdl, GLIBC_2_3_4, GLIBC_2_34) compat_symbol (libdl, __libdl_version_placeholder_1, __libdl_version_placeholder, GLIBC_2_3_4); #endif -- cgit 1.4.1