Andreas Schwab
33757a03c5
OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=755
48 lines
1.9 KiB
Diff
48 lines
1.9 KiB
Diff
From 8dbaecbe92ac7ab73b7d0aae84626af59131e41b Mon Sep 17 00:00:00 2001
|
|
From: Jens Remus <jremus@linux.ibm.com>
|
|
Date: Fri, 25 Jul 2025 15:40:03 +0200
|
|
Subject: [PATCH] Use TLS initial-exec model for __libc_tsd_CTYPE_* thread
|
|
variables [BZ #33234]
|
|
|
|
Commit 10a66a8e421b ("Remove <libc-tsd.h>") removed the TLS initial-exec
|
|
(IE) model attribute from the __libc_tsd_CTYPE_* thread variable declarations
|
|
and definitions. Commit a894f04d8776 ("Optimize __libc_tsd_* thread
|
|
variable access") restored it on declarations.
|
|
|
|
Restore the TLS initial-exec model attribute on __libc_tsd_CTYPE_* thread
|
|
variable definitions.
|
|
|
|
This resolves test tst-locale1 failure on s390 32-bit, when using a
|
|
GNU linker without the fix from GNU binutils commit aefebe82dc89
|
|
("IBM zSystems: Fix offset relative to static TLS").
|
|
|
|
Reviewed-by: Florian Weimer <fweimer@redhat.com>
|
|
(cherry picked from commit e5363e6f460c2d58809bf10fc96d70fd1ef8b5b2)
|
|
---
|
|
NEWS | 1 +
|
|
ctype/ctype-info.c | 6 +++---
|
|
2 files changed, 4 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/ctype/ctype-info.c b/ctype/ctype-info.c
|
|
index b7d3422726..fb5acf9419 100644
|
|
--- a/ctype/ctype-info.c
|
|
+++ b/ctype/ctype-info.c
|
|
@@ -24,11 +24,11 @@
|
|
__ctype_init before user code runs, but this does not happen for
|
|
threads in secondary namespaces. With the initializers, secondary
|
|
namespaces at least get locale data from the C locale. */
|
|
-__thread const uint16_t * __libc_tsd_CTYPE_B
|
|
+__thread const uint16_t * __libc_tsd_CTYPE_B attribute_tls_model_ie
|
|
= (const uint16_t *) _nl_C_LC_CTYPE_class + 128;
|
|
-__thread const int32_t * __libc_tsd_CTYPE_TOLOWER
|
|
+__thread const int32_t * __libc_tsd_CTYPE_TOLOWER attribute_tls_model_ie
|
|
= (const int32_t *) _nl_C_LC_CTYPE_tolower + 128;
|
|
-__thread const int32_t * __libc_tsd_CTYPE_TOUPPER
|
|
+__thread const int32_t * __libc_tsd_CTYPE_TOUPPER attribute_tls_model_ie
|
|
= (const int32_t *) _nl_C_LC_CTYPE_toupper + 128;
|
|
|
|
|
|
--
|
|
2.51.0
|
|
|