diff options
| author | Florian Weimer <fweimer@redhat.com> | 2022-01-27 16:03:58 +0100 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2022-01-27 18:52:05 +0100 |
| commit | af121ae3e7cd12628c91ecfc46a9d65313a6e972 (patch) | |
| tree | bf0667b0fd62ccd05c866ecb520a598be12c4aeb /elf | |
| parent | 501246c5e2dfcc278f0ebbdb72345cdd239521c7 (diff) | |
| download | glibc-af121ae3e7cd12628c91ecfc46a9d65313a6e972.zip glibc-af121ae3e7cd12628c91ecfc46a9d65313a6e972.tar.gz glibc-af121ae3e7cd12628c91ecfc46a9d65313a6e972.tar.bz2 | |
Fix glibc 2.34 ABI omission (missing GLIBC_2.34 in dynamic loader)
The glibc 2.34 release really should have added a GLIBC_2.34
symbol to the dynamic loader. With it, we could move functions such
as dlopen or pthread_key_create that work on process-global state
into the dynamic loader (once we have fixed a longstanding issue
with static linking). Without the GLIBC_2.34 symbol, yet another
new symbol version would be needed because old glibc will fail to
load binaries due to the missing symbol version in ld.so that newly
linked programs will require.
Reviewed-by: H.J. Lu <hjl.tools@gmail.com>
Diffstat (limited to 'elf')
| -rw-r--r-- | elf/Makefile | 1 | ||||
| -rw-r--r-- | elf/Versions | 3 | ||||
| -rw-r--r-- | elf/dl-compat.c | 35 |
3 files changed, 39 insertions, 0 deletions
diff --git a/elf/Makefile b/elf/Makefile index 775c755..718e826 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -126,6 +126,7 @@ shared-only-routines = libc-dl_find_object rtld-routines = \ $(all-dl-routines) \ dl-audit \ + dl-compat \ dl-conflict \ dl-diagnostics \ dl-diagnostics-cpu \ diff --git a/elf/Versions b/elf/Versions index a4f1e76..8bed855 100644 --- a/elf/Versions +++ b/elf/Versions @@ -51,6 +51,9 @@ ld { # stack canary __stack_chk_guard; } + GLIBC_2.34 { + __rtld_version_placeholder; + } GLIBC_PRIVATE { # Those are in the dynamic linker, but used by libc.so. __libc_enable_secure; diff --git a/elf/dl-compat.c b/elf/dl-compat.c new file mode 100644 index 0000000..05c986a --- /dev/null +++ b/elf/dl-compat.c @@ -0,0 +1,35 @@ +/* Placeholder compatibility symbols. + Copyright (C) 2022 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 <shlib-compat.h> +#include <sys/cdefs.h> + +/* The GLIBC_2.35 symbol version is present naturally for later ports. + Use OTHER_SHLIB_COMPAT because the module is called rtld, but the + ABI version uses ld. */ +#if OTHER_SHLIB_COMPAT (ld, GLIBC_2_0, GLIBC_2_35) +void +attribute_compat_text_section +__attribute_used__ +__rtld_version_placeholder_1 (void) +{ +} + +compat_symbol (ld, __rtld_version_placeholder_1, + __rtld_version_placeholder, GLIBC_2_34); +#endif |