[COMMITTED] S390: Define SINGLE_THREAD_BY_GLOBAL only on s390x

Message ID 20220714114042.28071-1-stli@linux.ibm.com
State Committed
Commit dd31f42e39206bc69f4a60e47ee117f6c968138c
Headers
Series [COMMITTED] S390: Define SINGLE_THREAD_BY_GLOBAL only on s390x |

Commit Message

Stefan Liebler July 14, 2022, 11:40 a.m. UTC
  Starting with commit e070501d12b47e88c1ff8c313f887976fb578938
"Replace __libc_multiple_threads with __libc_single_threaded"
the testcases nptl/tst-cancel-self and
nptl/tst-cancel-self-cancelstate are failing.

This is fixed by only defining SINGLE_THREAD_BY_GLOBAL on s390x,
but not on s390.

Starting with commit 09c76a74099826f4c6e1c4c431d7659f78112862
"Linux: Consolidate {RTLD_}SINGLE_THREAD_P definition",
SINGLE_THREAD_BY_GLOBAL was defined in
sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h.

Lateron the commit 9a973da617772eff1f351989f8995f4305a2e63c
"s390: Consolidate Linux syscall definition" consolidates the sysdep.h files
from s390-32/s390-64 subdirectories.  Unfortunately the macro is now always
defined instead of only on s390-64.

As information:
TLS_MULTIPLE_THREADS_IN_TCB is also only defined for s390.
See: sysdeps/s390/nptl/tls.h
---
 sysdeps/unix/sysv/linux/s390/{ => s390-64}/single-thread.h | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename sysdeps/unix/sysv/linux/s390/{ => s390-64}/single-thread.h (100%)
  

Patch

diff --git a/sysdeps/unix/sysv/linux/s390/single-thread.h b/sysdeps/unix/sysv/linux/s390/s390-64/single-thread.h
similarity index 100%
rename from sysdeps/unix/sysv/linux/s390/single-thread.h
rename to sysdeps/unix/sysv/linux/s390/s390-64/single-thread.h