From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1962) id 7565B3857363; Thu, 14 Jul 2022 11:39:56 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7565B3857363 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Stefan Liebler To: glibc-cvs@sourceware.org Subject: [glibc] S390: Define SINGLE_THREAD_BY_GLOBAL only on s390x X-Act-Checkin: glibc X-Git-Author: Stefan Liebler X-Git-Refname: refs/heads/master X-Git-Oldrev: 7c8ca1789393323541719df4b636e4853284ff47 X-Git-Newrev: 779aa039fc4151bdc0d79ef2e141604863856a60 Message-Id: <20220714113956.7565B3857363@sourceware.org> Date: Thu, 14 Jul 2022 11:39:56 +0000 (GMT) X-BeenThere: glibc-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Glibc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Jul 2022 11:39:56 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=779aa039fc4151bdc0d79ef2e141604863856a60 commit 779aa039fc4151bdc0d79ef2e141604863856a60 Author: Stefan Liebler Date: Thu Jul 14 13:39:09 2022 +0200 S390: Define SINGLE_THREAD_BY_GLOBAL only on s390x 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 Diff: --- sysdeps/unix/sysv/linux/s390/{ => s390-64}/single-thread.h | 0 1 file changed, 0 insertions(+), 0 deletions(-) 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