From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-io1-xd43.google.com (mail-io1-xd43.google.com [IPv6:2607:f8b0:4864:20::d43]) by sourceware.org (Postfix) with ESMTPS id 1A48B386196E for ; Wed, 16 Sep 2020 15:41:19 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 1A48B386196E Received: by mail-io1-xd43.google.com with SMTP id m17so8798845ioo.1 for ; Wed, 16 Sep 2020 08:41:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=B3M8eamThH7mgrbmVSdiPoQtyGwGKW8knIt0FPe5XEQ=; b=DTR9dp9UkFWcDCUDqMBPjpq5RJf9cHYsmxhlRxJLpib+VKsqVpHooMve/Edd3bgmNc 5JWiIKh+9zH0On1Z0IT+WfMEPt9Hsak51EXLcDP6lT47d2pq/HRBfbljzYspWATYLW+u v/U8Y9VcV4q5lSQx3Lw89rRkLSRDlkD6LrsZ3JqHsvag6pVd0lh1y8lkfPgFTRf/djwW Zgp2MhGA/C3Fe02qKFTbfjn/esL1RCotUnX/Zkt+nRrHK+4xXYdQ2ncSqdgDvRHlKMzE EL9U3STWUZM328LfluR+pqHVQVQQaKC9Fr4UIR9J3bxjZsPuNBDld/Xp3IfMnKdguXrS 2+vA== X-Gm-Message-State: AOAM531YOaXQwWd+PNufqiCYjf0fLmTe79ZGQES3Mnd+oDErtFlwidPD mDZrbKGlGzRaBTBxM/Bj984IKyYPZclGfy0Y83Y= X-Google-Smtp-Source: ABdhPJztC1W9sts6MWoYRb8pBwZqakC6xrOKsnkHbkIAr8Tc1fM6dSl/QnBrf67BXPs+DR2bnzc+VEeFsfT7I2y60ko= X-Received: by 2002:a02:a615:: with SMTP id c21mr22591768jam.106.1600270878478; Wed, 16 Sep 2020 08:41:18 -0700 (PDT) MIME-Version: 1.0 References: <20200908145738.640039-1-adhemerval.zanella@linaro.org> <20200908145738.640039-8-adhemerval.zanella@linaro.org> In-Reply-To: <20200908145738.640039-8-adhemerval.zanella@linaro.org> From: Alistair Francis Date: Wed, 16 Sep 2020 08:30:08 -0700 Message-ID: Subject: Re: [PATCH v2 08/14] linux: Consolidate utimes To: Adhemerval Zanella Cc: GNU C Library Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-9.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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-List-Received-Date: Wed, 16 Sep 2020 15:41:21 -0000 On Tue, Sep 8, 2020 at 8:00 AM Adhemerval Zanella via Libc-alpha wrote: > > The generic version does not have time64 support and Linux default > uses utimensat. With hppa version gone, __ASSUME_UTIMES is not used > anymore. > > Checked on x86_64-linux-gnu and i686-linux-gnu (on 5.4 and on 4.15 > kernel). Reviewed-by: Alistair Francis Alistair > --- > sysdeps/unix/sysv/linux/generic/utimes.c | 46 ------------------- > .../unix/sysv/linux/hppa/kernel-features.h | 5 -- > sysdeps/unix/sysv/linux/hppa/utimes.c | 30 ------------ > 3 files changed, 81 deletions(-) > delete mode 100644 sysdeps/unix/sysv/linux/generic/utimes.c > delete mode 100644 sysdeps/unix/sysv/linux/hppa/utimes.c > > diff --git a/sysdeps/unix/sysv/linux/generic/utimes.c b/sysdeps/unix/sysv/linux/generic/utimes.c > deleted file mode 100644 > index 0a8100e1b8..0000000000 > --- a/sysdeps/unix/sysv/linux/generic/utimes.c > +++ /dev/null > @@ -1,46 +0,0 @@ > -/* utimes -- Change access and modification times of file. Linux version. > - Copyright (C) 2011-2020 Free Software Foundation, Inc. > - This file is part of the GNU C Library. > - Contributed by Chris Metcalf , 2011. > - > - The GNU C Library is free software; you can redistribute it and/or > - modify it under the terms of the GNU Lesser General Public > - License as published by the Free Software Foundation; either > - version 2.1 of the License, or (at your option) any later version. > - > - The GNU C Library is distributed in the hope that it will be useful, > - but WITHOUT ANY WARRANTY; without even the implied warranty of > - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > - Lesser General Public License for more details. > - > - You should have received a copy of the GNU Lesser General Public > - License along with the GNU C Library. If not, see > - . */ > - > -#include > -#include > -#include > -#include > -#include > -#include > - > - > -/* Change the access time of FILE to TVP[0] and > - the modification time of FILE to TVP[1]. */ > -int > -__utimes (const char *file, const struct timeval tvp[2]) > -{ > - struct timespec ts[2]; > - struct timespec *tsp = NULL; > - > - if (tvp) > - { > - TIMEVAL_TO_TIMESPEC (&tvp[0], &ts[0]); > - TIMEVAL_TO_TIMESPEC (&tvp[1], &ts[1]); > - tsp = &ts[0]; > - } > - > - return INLINE_SYSCALL (utimensat, 4, AT_FDCWD, file, tsp, 0); > -} > - > -weak_alias (__utimes, utimes) > diff --git a/sysdeps/unix/sysv/linux/hppa/kernel-features.h b/sysdeps/unix/sysv/linux/hppa/kernel-features.h > index 8548b5c258..80eec02314 100644 > --- a/sysdeps/unix/sysv/linux/hppa/kernel-features.h > +++ b/sysdeps/unix/sysv/linux/hppa/kernel-features.h > @@ -18,11 +18,6 @@ > . */ > > > -/* Support for the utimes syscall was added in 3.14. */ > -#if __LINUX_KERNEL_VERSION >= 0x030e00 > -# define __ASSUME_UTIMES 1 > -#endif > - > #include_next > > #define __ASSUME_RECV_SYSCALL 1 > diff --git a/sysdeps/unix/sysv/linux/hppa/utimes.c b/sysdeps/unix/sysv/linux/hppa/utimes.c > deleted file mode 100644 > index a9c4a7ff45..0000000000 > --- a/sysdeps/unix/sysv/linux/hppa/utimes.c > +++ /dev/null > @@ -1,30 +0,0 @@ > -/* Implement utimes for hppa. > - Copyright (C) 2014-2020 Free Software Foundation, Inc. > - This file is part of the GNU C Library. > - > - The GNU C Library is free software; you can redistribute it and/or > - modify it under the terms of the GNU Lesser General Public > - License as published by the Free Software Foundation; either > - version 2.1 of the License, or (at your option) any later version. > - > - The GNU C Library is distributed in the hope that it will be useful, > - but WITHOUT ANY WARRANTY; without even the implied warranty of > - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > - Lesser General Public License for more details. > - > - You should have received a copy of the GNU Lesser General Public > - License along with the GNU C Library; if not, see > - . */ > - > -/* hppa has the utimensat syscall in all supported kernel versions but > - gained the utimes syscall later, so use the linux-generic > - implementation of utimes in terms of the utimensat syscall unless > - the utimes syscall is known to be available. */ > - > -#include > - > -#ifdef __ASSUME_UTIMES > -# include > -#else > -# include > -#endif > -- > 2.25.1 >