about summary refs log tree commit diff
path: root/dlfcn/dlfcn.c
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2021-06-03 08:26:04 +0200
committerFlorian Weimer <fweimer@redhat.com>2021-06-03 08:26:04 +0200
commit6a1ed32789eaec6e1cd4345552e7342b5b18da5f (patch)
treecb2adb82af54f07d6d086d8b91c42d6d5fec23ac /dlfcn/dlfcn.c
parent77f876c0e3ac08a98daa60fbad44061d4e4c3d14 (diff)
downloadglibc-6a1ed32789eaec6e1cd4345552e7342b5b18da5f.tar.gz
glibc-6a1ed32789eaec6e1cd4345552e7342b5b18da5f.tar.xz
glibc-6a1ed32789eaec6e1cd4345552e7342b5b18da5f.zip
dlfcn: Move dlmopen 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.c19
1 files changed, 18 insertions, 1 deletions
diff --git a/dlfcn/dlfcn.c b/dlfcn/dlfcn.c
index 8f85308b5f..90cdee0903 100644
--- a/dlfcn/dlfcn.c
+++ b/dlfcn/dlfcn.c
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <dlfcn.h>
-
+#include <shlib-compat.h>
 
 int __dlfcn_argc attribute_hidden;
 char **__dlfcn_argv attribute_hidden;
@@ -36,3 +36,20 @@ static void (*const init_array []) (int argc, char *argv[])
 {
   init
 };
+
+/* The remainder of this file is used to keep specific symbol versions
+   occupied, so that ld does not generate weak symbol version
+   definitions.  */
+
+void
+attribute_compat_text_section
+__attribute_used__
+__libdl_version_placeholder_1 (void)
+{
+}
+
+#if SHLIB_COMPAT (libdl, GLIBC_2_3_4, GLIBC_2_34) \
+  && ABI_libdl_GLIBC_2_3_4 != ABI_libdl_GLIBC_2_1
+compat_symbol (libdl, __libdl_version_placeholder_1,
+               __libdl_version_placeholder, GLIBC_2_3_4);
+#endif