From patchwork Tue Nov 12 17:36:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 1193730 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-106956-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=wdc.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="ak3V/A+9"; dkim=pass (2048-bit key; unprotected) header.d=wdc.com header.i=@wdc.com header.b="gwlE1YDm"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47CFSN0czsz9sPc for ; Wed, 13 Nov 2019 04:42:27 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; q=dns; s=default; b=gn7 yG3S8n8ISNxjGeSh2qV0rgjsO3zRtN8Y9czpv/iEuMGnjN31u3gJ11ZizV5kMW1w jp0sFIPOQFj2zM029DHWLYnbH/C+k3kGoo75m7Kg0AdXG8iuX4bczR6nsfW/BcuY Uy8uX+B2wAJzmXvjQQKP7leV81P7DgracZYLfsy4= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; s=default; bh=u5+hQeIjp cle6eFZdIbBADCRnlA=; b=ak3V/A+9w6KD1kwDh8Oow3yhAbMN/IFsfZeGwG8bA P6GpfdIfHmaP3T0B2Y99gBfi7Euf/3Xmfzqhs8piA/9VquU8eAPt/LB6f0mDD2u+ NmfP9BuaDnMKnsIWcu+ov2fPiNi8N1GZtxvt1v0aEb3dTR4cpAFNxNtcIoF1VLks TU= Received: (qmail 62548 invoked by alias); 12 Nov 2019 17:42:22 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 62509 invoked by uid 89); 12 Nov 2019 17:42:22 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.7 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3 autolearn=ham version=3.3.1 spammy=HX-Languages-Length:975, HContent-Transfer-Encoding:8bit X-HELO: esa6.hgst.iphmx.com DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1573580541; x=1605116541; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=RW5aAzY957TN4I2woiV+MqUX1DkdwczQ2M981dEkoUE=; b=gwlE1YDm5u6gU3J4VP7Ez7uVWYWE2Kpv+NwDIaubRPbLqpOcgzn3hGG8 M9UC+riX9UtLCfCXV8suc5JQkF/Q/a991fOqh9BmkD4wKBzCZBXqM2STf JO/kAghmcEih5rraPG8ODdEs/hwyKUX7ArMepKFsPQG9TwXsi4s0ApUIl /ZwCeXPKOd9WibfQq5nBsoBqCBTyCfRcs8M3cY+IryiHNfl8C8hfx+tEd wtvMh40JqJQiN81nFBC0i39EVomC77FT9IodRKD3/4Rmi33GafgX50p1k b0EhI46+hhkmLAkfeWSop+8ee6dU8hS67PtVq/Auhn2N8IjM9d46iBhTY w==; IronPort-SDR: Wj7g0N+e9pI+q8ga2fpWNZ/PWyGw6EV6z82FJ+fXOWpwB8SZNKt7MlF4IrTKlz0ibDNYicoxtR 1pNwL7Jm3ULZE8tEpmBJVsvdcUomQxRp4t+YtAlDuzeB01IDmeW0CRVfAoMQf4VSXAfrN2VN5a atzix127e0zMqmvVaoLIGRs3g8p5WW6K+V+Wow9rmF0z+7ZzF18QiyiOJn5xD+rEk3U1jOZq7D oszZtqTpqtQ5TpEoROqGadD5CWviJFWcb1ptrN3Qi8lfSoggMy9Dom6/a100Trr8QCxHVUWv6V hB4= IronPort-SDR: ktYZLsU4qEdiNzM9Sv1YUQQ/7NsJPTA6TlJidXV21D9H/tcHGWwdzqL1RTDicnN0ks3Vm3b0Fr tY8UTW6cS/YaDDY0t7N5Z6tUcAbO3hH75Lx2/zoJIIreAyl+mmKeob9AB0NHXwY5a7AcqLtIXf E/XD8IG++OmjTX3O56+spaEGyoXhFrRHF1whY7u9dm3RmjncYnQWk6mZmTQN4+8hzHyu4CPtkO O4ynAnhkoRG+miDLnkwji7z+ilD/MqFludE6ibK888XF4RQoQqNdT/GvFfKjku4sz4YKYiamQb pfxnLslpCfXzxHqpLWrxYBEQ IronPort-SDR: CJbHHjbX3x+H2tTjBSLnCNgyluq2baYsGhmQTpfLfOe3rMUscXLs0GdVOVd4sQ4q3+18LmrVXs XsCorbkI3DuZa+1bFkh1p8vV05DdELVz06VTKC+b5Q3KAYsWGbpYwQ+rhJOoeihBiSEuOf7Sxc fSffXK5KrfnBwww9PiDYv7jz1L+lkUhQr9u10AxdClopXcFht7HVGXX49KI7q6Vl0Q8pGdMzc2 HDP5aBaCbcsRmt8dvusC+Qd7j/maMIqqXGAB4kFcx4VUtURcoffYeTAzhJhXLabedcNKXgOKJu ZgA= WDCIronportException: Internal From: Alistair Francis To: libc-alpha@sourceware.org Cc: alistair23@gmail.com, Alistair Francis Subject: [PATCH] tst-clone3: Use __NR_futex_time64 if we don't have __NR_futex Date: Tue, 12 Nov 2019 09:36:54 -0800 Message-Id: <20191112173654.19842-1-alistair.francis@wdc.com> MIME-Version: 1.0 We can't include sysdep.h in the test case (it introduces lots of strange failures) so __NR_futex isn't redifined to __NR_futex_time64 by 64-bit time_t 32-bit archs (y2038 safe). To allow the test to pass let's just do the __NR_futex_time64 syscall if we don't have __NR_futex defined. Signed-off-by: Alistair Francis --- sysdeps/unix/sysv/linux/tst-clone3.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sysdeps/unix/sysv/linux/tst-clone3.c b/sysdeps/unix/sysv/linux/tst-clone3.c index 76f8b08a692..c211445e77f 100644 --- a/sysdeps/unix/sysv/linux/tst-clone3.c +++ b/sysdeps/unix/sysv/linux/tst-clone3.c @@ -56,7 +56,11 @@ f (void *a) static inline int futex_wait (int *futexp, int val) { +#ifdef __NR_futex return syscall (__NR_futex, futexp, FUTEX_WAIT, val); +#else + return syscall (__NR_futex_time64, futexp, FUTEX_WAIT, val); +#endif } static int