diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2025-08-18 09:06:48 -0700 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2025-08-20 15:11:09 -0700 |
| commit | 0769ad2cdd670d89c75eb6ac1cbc25f5c2d92ce5 (patch) | |
| tree | 1993da6b227738281c419c3fc8db7312e4bcd2b7 | |
| parent | 3f0dd818e54157d6042c4a03b07d93f05d1e492a (diff) | |
i386: Also add GLIBC_ABI_GNU2_TLS version [BZ #33129]
Since the GNU2 TLS run-time bug:
https://sourceware.org/bugzilla/show_bug.cgi?id=31372
affects both i386 and x86-64, also add GLIBC_ABI_GNU2_TLS version to i386
to indicate the working GNU2 TLS run-time. For x86-64, the additional
GNU2 TLS run-time bug fix is needed for
https://sourceware.org/bugzilla/show_bug.cgi?id=31501
Signed-off-by: H.J. Lu <hjl.tools@gmail.com>
Reviewed-by: Sam James <sam@gentoo.org>
(cherry picked from commit bd4628f3f18ac312408782eea450429c6f044860)
| -rw-r--r-- | sysdeps/x86/Makefile | 9 | ||||
| -rw-r--r-- | sysdeps/x86/Versions | 5 | ||||
| -rw-r--r-- | sysdeps/x86_64/Makefile | 9 | ||||
| -rw-r--r-- | sysdeps/x86_64/Versions | 5 |
4 files changed, 14 insertions, 14 deletions
diff --git a/sysdeps/x86/Makefile b/sysdeps/x86/Makefile index d39c2e8968..0ab42b14ba 100644 --- a/sysdeps/x86/Makefile +++ b/sysdeps/x86/Makefile @@ -125,6 +125,15 @@ LDFLAGS-tst-tls23 += -rdynamic tst-tls23-mod.so-no-z-defs = yes $(objpfx)tst-tls23-mod.so: $(libsupport) + +tests-special += $(objpfx)check-gnu2-tls.out + +$(objpfx)check-gnu2-tls.out: $(common-objpfx)libc.so + LC_ALL=C $(READELF) -V -W $< \ + | sed -ne '/.gnu.version_d/, /.gnu.version_r/ p' \ + | grep GLIBC_ABI_GNU2_TLS > $@; \ + $(evaluate-test) +generated += check-gnu2-tls.out endif ifeq ($(subdir),math) diff --git a/sysdeps/x86/Versions b/sysdeps/x86/Versions index 4b10c4b5d7..e8dcfccbe4 100644 --- a/sysdeps/x86/Versions +++ b/sysdeps/x86/Versions @@ -7,4 +7,9 @@ libc { GLIBC_2.33 { __x86_get_cpuid_feature_leaf; } + GLIBC_ABI_GNU2_TLS { + # This symbol is used only for empty version map and will be removed + # by scripts/versions.awk. + __placeholder_only_for_empty_version_map; + } } diff --git a/sysdeps/x86_64/Makefile b/sysdeps/x86_64/Makefile index 191cf7f5b0..d83109b632 100644 --- a/sysdeps/x86_64/Makefile +++ b/sysdeps/x86_64/Makefile @@ -180,15 +180,6 @@ $(objpfx)check-dt-x86-64-plt.out: $(common-objpfx)libc.so | grep GLIBC_ABI_DT_X86_64_PLT > $@; \ $(evaluate-test) generated += check-dt-x86-64-plt.out - -tests-special += $(objpfx)check-gnu2-tls.out - -$(objpfx)check-gnu2-tls.out: $(common-objpfx)libc.so - LC_ALL=C $(READELF) -V -W $< \ - | sed -ne '/.gnu.version_d/, /.gnu.version_r/ p' \ - | grep GLIBC_ABI_GNU2_TLS > $@; \ - $(evaluate-test) -generated += check-gnu2-tls.out endif # $(subdir) == elf ifeq ($(subdir),csu) diff --git a/sysdeps/x86_64/Versions b/sysdeps/x86_64/Versions index 0a759029e5..6a989ad3b3 100644 --- a/sysdeps/x86_64/Versions +++ b/sysdeps/x86_64/Versions @@ -5,11 +5,6 @@ libc { GLIBC_2.13 { __fentry__; } - GLIBC_ABI_GNU2_TLS { - # This symbol is used only for empty version map and will be removed - # by scripts/versions.awk. - __placeholder_only_for_empty_version_map; - } GLIBC_ABI_DT_X86_64_PLT { # This symbol is used only for empty version map and will be removed # by scripts/versions.awk. |