From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-3.9 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 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 dcvr.yhbt.net (Postfix) with ESMTPS id 2C3E31F45E for ; Fri, 14 Feb 2020 17:55:46 +0000 (UTC) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:subject:to:references:from:message-id:date :mime-version:in-reply-to:content-type :content-transfer-encoding; q=dns; s=default; b=ZEtShVujmc7PIFyt tHRS9k5AzINDEN8OJI4Wd6kKSce7UEDZg7s5YzXsMsBUbJtQFNjM5FxyexEdLVMO x8bbIfVlClK/MXtG4keKwxRxB9BrKlDabkLMXmbtIjkWf7q4DjPrgxEQWv4/MBWK QxqE2GbYazTn9SfXHoXr9XfS5MU= 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:subject:to:references:from:message-id:date :mime-version:in-reply-to:content-type :content-transfer-encoding; s=default; bh=y/CavcNnopaGNHhUbNSsuw 6OA5k=; b=DaurEg+63Cdpkyep6hZczR+HguVW3bv49ELigWgLaoIBxMDw7yt6cX 9Pn1++VKqFtXYDEc3PQjuG5Y1PKXZeRieZaB949e9j1RWKbkff7uWUm5TWsyBFPX ZfPXTAnKPM6QKy3asotN9FIywuFIOTD7+rWzJ7TyXJRnhLvyLsXE0= Received: (qmail 123988 invoked by alias); 14 Feb 2020 17:55:43 -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 Received: (qmail 123975 invoked by uid 89); 14 Feb 2020 17:55:42 -0000 Authentication-Results: sourceware.org; auth=none X-HELO: mail-qt1-f195.google.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=subject:to:references:from:autocrypt:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=mKpDVrUo91G0f6pEz0ntEkOXtW4hdDCD8C3p9PMqU3g=; b=yRia1HkeqnxzxLLPqznPuPF6DFpYC7Li9GBqSkXAVr2oXe8mXS1lVBYTcWkm9vx7kH 6tH3Fv+dBf7Ef17XkF4bNsYVpI0V2EQkMrcZN1JdGoj623wps9vMt9o45se+WOHR9asE 8I9jAMqhN4VfrAeaVbIeI7P4O7c645CDRVHCJF3GT7/FMtCbZh27JuxSGYMzeZk4olRd oyh92+cbEPB3QV7bGtcq3aX8OGGqzS5nBHa2clTbZGOMCRNe2t+8YaB8r5upIC9BkSDe tCQPfTx3QXUTmDEQYyt9BqVCDFQzC4Ei/lxEn6fBc4LjGutWGqbv2we+sTUagtiv5Hla f1dg== Subject: Re: [PATCH] tst-clone3: Use __NR_futex_time64 if we don't have __NR_futex To: libc-alpha@sourceware.org References: <20200131170354.25539-1-alistair.francis@wdc.com> From: Adhemerval Zanella Message-ID: Date: Fri, 14 Feb 2020 14:55:36 -0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.4.1 MIME-Version: 1.0 In-Reply-To: <20200131170354.25539-1-alistair.francis@wdc.com> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit On 31/01/2020 14:03, Alistair Francis wrote: > 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. LGTM, thanks. Reviewed-by: Adhemerval Zanella > --- > 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 400eb89a5b..613cb4a811 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 >