From patchwork Tue Apr 4 12:31:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 1764866 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha256 header.s=default header.b=hKNLrdZK; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PrRvk1wW5z1yYn for ; Tue, 4 Apr 2023 22:31:30 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 0D4F9385841A for ; Tue, 4 Apr 2023 12:31:28 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0D4F9385841A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1680611488; bh=RxBwHIzGj4D8pck8C0qXyG3Nz0A4kJJT7svzg3iZm50=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=hKNLrdZKM+mdjhilOA+kUgSJnatoRsF/iSBQH6qhSH/ZHYRDF9uyXfldA7Lz+rLPA 82Uf49Zu0W9R8AA+XdI2tYlpGqmcAY6UFUaDFI78Up4Ce/8vuJQdzaOHlTFRtl9hrT 6nz38UxwPg1baKvEYdUyg0zP0tBTLDz3NuHzR23E= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-oa1-x2b.google.com (mail-oa1-x2b.google.com [IPv6:2001:4860:4864:20::2b]) by sourceware.org (Postfix) with ESMTPS id 958963858D1E for ; Tue, 4 Apr 2023 12:31:12 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 958963858D1E Received: by mail-oa1-x2b.google.com with SMTP id 586e51a60fabf-17683b570b8so34274738fac.13 for ; Tue, 04 Apr 2023 05:31:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680611471; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=RxBwHIzGj4D8pck8C0qXyG3Nz0A4kJJT7svzg3iZm50=; b=yU94WFCU0gYt9ljOrs7Wgo39u0k5xxbaTmIPDD4f+on1tiDXaJeMFU/MMlFeSWVay4 gNWwNHoxcuZ03LBzQgSFu6grF0N4Ooq5cIAoq/qGBiUFZKXIBwGUZSgj7FsOiucBs16G w1H3uVQqSpwVGb96Xtryf4qpL5UXYQVJoqYTV2m4p4r/8J77FZ8768SLjVBowahCVsTj ct88sAdLJu/nbsyVsxwKb5wuVJW/3FSnktWRDWohOJO6c/WR6wwQCdu7XsxsNvucsvAd 21+DkQlBdSUG1DJ8akS31WPRw8LRBGM3F5rTXydbRlZsnZQiWlVhcDxNtc2bg18x9Ki6 PfnQ== X-Gm-Message-State: AAQBX9e642+Z6SsmoLjDIs703KLkEGDE11iGU0nmKJAiz7ufpZrmtcFo 44Tku/15470Dy7YWw8gq2i1Q411Dfj0zUIqrwfhYKg== X-Google-Smtp-Source: AKy350YEWMGPCqRI/NOH4de06hukyF05ttojYeGPlyCPWNlwIKa43NOP8vMZR+GuX74Svqglw6VY0g== X-Received: by 2002:a05:6870:e30c:b0:172:2d00:99f7 with SMTP id z12-20020a056870e30c00b001722d0099f7mr1378850oad.20.1680611471388; Tue, 04 Apr 2023 05:31:11 -0700 (PDT) Received: from mandiga.. ([2804:1b3:a7c1:e5a5:9f18:8489:6b06:184]) by smtp.gmail.com with ESMTPSA id j26-20020a9d7d9a000000b0068bd6cf405dsm5476109otn.1.2023.04.04.05.31.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Apr 2023 05:31:10 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [COMMITTED] nptl: Fix tst-cancel30 on sparc64 Date: Tue, 4 Apr 2023 09:31:07 -0300 Message-Id: <20230404123107.1260124-1-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-12.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_NUMSUBJECT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Netto Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org Sender: "Libc-alpha" 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. --- 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