Upstream commit: fffc2df8a3e2c8cda2991063d23086360268b777 - i386: Provide GLIBC_ABI_GNU_TLS symbol version [BZ #33221] - i386: Update ___tls_get_addr to preserve vector registers - Extend struct r_debug to support multiple namespaces (RHEL-101985) - Fix a potential crash in the dynamic loader when processing specific symbol versions (RHEL-109683) - Signal la_objopen for ld.so with dlmopen (RHEL-109693) - Switch to main malloc after final ld.so self-relocation (RHEL-109703) - Prevent ld.so from asserting and crashing during audited library loads (RHEL-109702) - x86-64: Provide GLIBC_ABI_DT_X86_64_PLT symbol version (RHEL-109621) - x86-64, i386: Provide GLIBC_ABI_GNU2_TLS symbol version (RHEL-109625) - Ensure fallback initialization of ctype TLS data pointers to fix segfaults in programs using dlmopen or auditors (RHEL-72018) - Handle load segment gaps in _dl_find_object (RHEL-104854) - AArch64: Improve codegen in SVE log1p - AArch64: Optimize inverse trig functions - AArch64: Avoid memset ifunc in cpu-features.c [BZ #33112] Resolves: RHEL-109536 Resolves: RHEL-72018 Resolves: RHEL-101985 Resolves: RHEL-104854 Resolves: RHEL-109621 Resolves: RHEL-109625 Resolves: RHEL-109683 Resolves: RHEL-109693 Resolves: RHEL-109702 Resolves: RHEL-109703
61 lines
2.1 KiB
Diff
61 lines
2.1 KiB
Diff
commit 83340b35ccb24dcda8b709c4683ab9eade454bd7
|
|
Author: H.J. Lu <hjl.tools@gmail.com>
|
|
Date: Mon Jul 28 12:16:11 2025 -0700
|
|
|
|
i386: Add GLIBC_ABI_GNU_TLS version [BZ #33221]
|
|
|
|
On i386, programs and shared libraries with __thread usage may fail
|
|
silently at run-time against glibc without the TLS run-time fix for:
|
|
|
|
https://sourceware.org/bugzilla/show_bug.cgi?id=32996
|
|
|
|
Add GLIBC_ABI_GNU_TLS version to indicate that glibc has the working
|
|
GNU TLS run-time. Linker can add the GLIBC_ABI_GNU_TLS version to
|
|
binaries which depend on the working TLS run-time so that such programs
|
|
and shared libraries will fail to load and run at run-time against
|
|
libc.so without the GLIBC_ABI_GNU_TLS version, instead of fail silently
|
|
at random.
|
|
|
|
This fixes BZ #33221.
|
|
|
|
Signed-off-by: H.J. Lu <hjl.tools@gmail.com>
|
|
Reviewed-by: Sam James <sam@gentoo.org>
|
|
(cherry picked from commit ed1b7a5a489ab555a27fad9c101ebe2e1c1ba881)
|
|
|
|
diff --git a/sysdeps/i386/Makefile b/sysdeps/i386/Makefile
|
|
index ee6470d78e856315..c0c017b899ebccbe 100644
|
|
--- a/sysdeps/i386/Makefile
|
|
+++ b/sysdeps/i386/Makefile
|
|
@@ -60,6 +60,15 @@ $(objpfx)tst-ld-sse-use.out: ../sysdeps/i386/tst-ld-sse-use.sh $(objpfx)ld.so
|
|
@echo "Checking ld.so for SSE register use. This will take a few seconds..."
|
|
$(BASH) $< $(objpfx) '$(NM)' '$(OBJDUMP)' '$(READELF)' > $@; \
|
|
$(evaluate-test)
|
|
+
|
|
+tests-special += $(objpfx)check-gnu-tls.out
|
|
+
|
|
+$(objpfx)check-gnu-tls.out: $(common-objpfx)libc.so
|
|
+ LC_ALL=C $(READELF) -V -W $< \
|
|
+ | sed -ne '/.gnu.version_d/, /.gnu.version_r/ p' \
|
|
+ | grep GLIBC_ABI_GNU_TLS > $@; \
|
|
+ $(evaluate-test)
|
|
+generated += check-gnu-tls.out
|
|
else
|
|
CFLAGS-.os += $(if $(filter rtld-%.os,$(@F)), $(rtld-CFLAGS))
|
|
endif
|
|
diff --git a/sysdeps/i386/Versions b/sysdeps/i386/Versions
|
|
index 36e23b466a622f43..9c84c8ef049eb18d 100644
|
|
--- a/sysdeps/i386/Versions
|
|
+++ b/sysdeps/i386/Versions
|
|
@@ -28,6 +28,11 @@ libc {
|
|
GLIBC_2.13 {
|
|
__fentry__;
|
|
}
|
|
+ GLIBC_ABI_GNU_TLS {
|
|
+ # This symbol is used only for empty version map and will be removed
|
|
+ # by scripts/versions.awk.
|
|
+ __placeholder_only_for_empty_version_map;
|
|
+ }
|
|
}
|
|
libm {
|
|
GLIBC_2.1 {
|