From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id 2BE123858D32; Mon, 10 Jul 2023 18:57:24 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2BE123858D32 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1689015444; bh=R7DrrnjbiXy1k10WE+RwpCN1PcbGrOeBt7JhSkBuGMw=; h=From:To:Subject:Date:From; b=p7er1FuS3eSiQ+Q3ZQEWApbBdL2fbniLld1uOML39UIf1rGX9kMPCKK8tx35CFble BXmcxgrjsN0Ay/QlbvQQn/wfqh8VILsvPossAa7kJSALj9gQxLo1/R7CTtcXgP0h4E 5pjowuoXcSbGxhnlgqXSGzjCS6F0e6aDXY14idoY= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Adhemerval Zanella To: glibc-cvs@sourceware.org Subject: [glibc/release/2.37/master] nptl: Fix tst-cancel30 on sparc64 X-Act-Checkin: glibc X-Git-Author: Adhemerval Zanella X-Git-Refname: refs/heads/release/2.37/master X-Git-Oldrev: 3f4b4e2cdd529266ea5a2c6c5e0c66bab81bfd0e X-Git-Newrev: 260d4b742bc36744aa2282421547f1a7b483d2f8 Message-Id: <20230710185724.2BE123858D32@sourceware.org> Date: Mon, 10 Jul 2023 18:57:24 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=260d4b742bc36744aa2282421547f1a7b483d2f8 commit 260d4b742bc36744aa2282421547f1a7b483d2f8 Author: Adhemerval Zanella Date: Mon Apr 3 14:18:14 2023 -0300 nptl: Fix tst-cancel30 on sparc64 As indicated by sparc kernel-features.h, even though sparc64 defines __NR_pause, it is not supported (ENOSYS). Always use ppoll or the 64 bit time_t variant instead. (cherry picked from commit 370da8a121c3ba9eeb2f13da15fc0f21f4136b25) Diff: --- sysdeps/pthread/tst-cancel30.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sysdeps/pthread/tst-cancel30.c b/sysdeps/pthread/tst-cancel30.c index 6eb4eb5b42..ff803386be 100644 --- a/sysdeps/pthread/tst-cancel30.c +++ b/sysdeps/pthread/tst-cancel30.c @@ -46,9 +46,7 @@ tf (void *arg) /* Wait indefinitely for cancellation, which only works if asynchronous cancellation is enabled. */ -#ifdef SYS_pause - syscall (SYS_pause); -#elif defined SYS_ppoll || defined SYS_ppoll_time64 +#if defined SYS_ppoll || defined SYS_ppoll_time64 # ifndef SYS_ppoll_time64 # define SYS_ppoll_time64 SYS_ppoll # endif