commit e5363e6f460c2d58809bf10fc96d70fd1ef8b5b2 Author: Jens Remus Date: Fri Jul 25 15:40:03 2025 +0200 Use TLS initial-exec model for __libc_tsd_CTYPE_* thread variables [BZ #33234] Commit 10a66a8e421b ("Remove ") 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 diff --git a/ctype/ctype-info.c b/ctype/ctype-info.c index e0752b4a1af6df15..315cedcfaa357ead 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;