diff options
| author | Florian Weimer <fweimer@redhat.com> | 2022-01-27 16:03:58 +0100 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2022-01-31 14:58:02 +0100 |
| commit | 948ebc098ed3cd928ea10997f990115e7770bda3 (patch) | |
| tree | 13b91d6efc2e09dba6adfc66718984514985fd9e /elf | |
| parent | de6cdd68753ed126a3ecf105d98e8c0ee8cb6ec4 (diff) | |
| download | glibc-948ebc098ed3cd928ea10997f990115e7770bda3.tar.xz glibc-948ebc098ed3cd928ea10997f990115e7770bda3.zip | |
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>
(cherry picked from commit af121ae3e7cd12628c91ecfc46a9d65313a6e972)
Diffstat (limited to 'elf')
| -rw-r--r-- | elf/Makefile | 1 | ||||
| -rw-r--r-- | elf/Versions | 3 | ||||
| -rw-r--r-- | elf/dl-compat.c | 32 |
3 files changed, 36 insertions, 0 deletions
diff --git a/elf/Makefile b/elf/Makefile index f930e04e27..af4ccb978c 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -115,6 +115,7 @@ elide-routines.os = \ # interpreter and operating independent of libc. rtld-routines = \ $(all-dl-routines) \ + dl-compat \ dl-conflict \ dl-diagnostics \ dl-diagnostics-cpu \ diff --git a/elf/Versions b/elf/Versions index 775aab62af..2af210b8f7 100644 --- a/elf/Versions +++ b/elf/Versions @@ -48,6 +48,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 0000000000..cc560c5159 --- /dev/null +++ b/elf/dl-compat.c @@ -0,0 +1,32 @@ +/* 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> + +/* GLIBC_2.34 placeholder for future symbol moves. */ + +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); |