diff options
author | Florian Weimer <fweimer@redhat.com> | 2021-06-03 08:26:04 +0200 |
---|---|---|
committer | Florian Weimer <fweimer@redhat.com> | 2021-06-03 09:11:45 +0200 |
commit | 6f1c701026287f6928d3bdd1aea7359308635abe (patch) | |
tree | 8dcf3b5a755f131435a912f7629478deaff74264 /dlfcn/dlfcn.c | |
parent | 0c1c3a771eceec46e66ce1183cf988e2303bd373 (diff) | |
download | glibc-6f1c701026287f6928d3bdd1aea7359308635abe.tar.gz glibc-6f1c701026287f6928d3bdd1aea7359308635abe.tar.xz glibc-6f1c701026287f6928d3bdd1aea7359308635abe.zip |
dlfcn: Cleanups after -ldl is no longer required
This commit removes the ELF constructor and internal variables from dlfcn/dlfcn.c. The file now serves the same purpose as nptl/libpthread-compat.c, so it is renamed to dlfcn/libdl-compat.c. The use of libdl-shared-only-routines ensures that libdl.a is empty. This commit adjusts the test suite not to use $(libdl). The libdl.so symbolic link is no longer installed. Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Diffstat (limited to 'dlfcn/dlfcn.c')
-rw-r--r-- | dlfcn/dlfcn.c | 69 |
1 files changed, 0 insertions, 69 deletions
diff --git a/dlfcn/dlfcn.c b/dlfcn/dlfcn.c deleted file mode 100644 index ef750bc27a..0000000000 --- a/dlfcn/dlfcn.c +++ /dev/null @@ -1,69 +0,0 @@ -/* Load a shared object at run time. - Copyright (C) 2005-2021 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - <https://www.gnu.org/licenses/>. */ - -#include <dlfcn.h> -#include <shlib-compat.h> - -int __dlfcn_argc attribute_hidden; -char **__dlfcn_argv attribute_hidden; - - -static void -init (int argc, char *argv[]) -{ - __dlfcn_argc = argc; - __dlfcn_argv = argv; -} - -static void (*const init_array []) (int argc, char *argv[]) - __attribute__ ((section (".init_array"), aligned (sizeof (void *)))) - __attribute_used__ = -{ - 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_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) -compat_symbol (libdl, __libdl_version_placeholder_1, - __libdl_version_placeholder, GLIBC_2_3_4); -#endif |