diff options
| author | Florian Weimer <fweimer@redhat.com> | 2021-06-03 08:26:04 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2021-06-03 08:26:04 +0200 |
| commit | 0c1c3a771eceec46e66ce1183cf988e2303bd373 (patch) | |
| tree | addf888256dd2498bcc2f220339b981e7e096d87 /dlfcn/dlfcn.c | |
| parent | add8d7ea01d5a22c2d7d184240dda6a7767e54e8 (diff) | |
| download | glibc-0c1c3a771eceec46e66ce1183cf988e2303bd373.tar.gz glibc-0c1c3a771eceec46e66ce1183cf988e2303bd373.tar.xz glibc-0c1c3a771eceec46e66ce1183cf988e2303bd373.zip | |
dlfcn: Move dlopen into libc
The symbol was moved using scripts/move-symbol-to-libc.py. Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Diffstat (limited to 'dlfcn/dlfcn.c')
| -rw-r--r-- | dlfcn/dlfcn.c | 16 |
1 files changed, 12 insertions, 4 deletions
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 |