From patchwork Mon Jul 13 17:10:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 40086 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 360E53938C2E; Mon, 13 Jul 2020 17:11:05 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 360E53938C2E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1594660265; bh=yI9Kx99hWXRMFMbwgXj6t6i2itCIBDqgK5icHOs4VZg=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=Gnv6ZKeFSgnzCWBAx69EDlZl/izrGH8s2tfdZseNnd0uIIIo7ME9PP5yKApaezQfv zNQ/s+Jw57vUbZ9fe7ilXRyWjKtfM8KTnd8tusbnVMiPQd34+I9irxX8didSExhPGo eGTxXpWArtLJMFirTQJjs2m13yhVZYh9E8EMXvE0= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qt1-x843.google.com (mail-qt1-x843.google.com [IPv6:2607:f8b0:4864:20::843]) by sourceware.org (Postfix) with ESMTPS id 603043938C39 for ; Mon, 13 Jul 2020 17:11:02 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 603043938C39 Received: by mail-qt1-x843.google.com with SMTP id 6so10532245qtt.0 for ; Mon, 13 Jul 2020 10:11:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=yI9Kx99hWXRMFMbwgXj6t6i2itCIBDqgK5icHOs4VZg=; b=YYuArL7E3sGPZPPCrUEPRR7Qu/WnYJU+gAy4wxgOm8BQuJnFIIKdQAjI6hdePJC9Bf rsQYhCzTHUSaZufNHliNj3YAMiQJ3fnOL2tabRMJOPCnyHkoxDDqZpIn5lqMero8k0wK bC7KoPQSMYp+axkBX2+39xtgz3Na42mfXtCq6mpwJh9FluF0xw2Y05JjLXXxDxpJ1cd7 a7YaEEl43j9EqvXkbHtnFpKRLqjeQXkPTl0+FbvigS2UuOlprRPy3IGfsFkvfssnSMP4 8xW/uoS9nCU55nfuC/kzqW/DSZOU1tMcekWQx0k1nbjRli6pMD5GtcTVxFBjQpdg+oLe 4pCQ== X-Gm-Message-State: AOAM5337jECNGcoqSu8qRdsBK8YLJ+nSPos6A6l9DREy+vRqPyrFgvC8 wJkbsyf2TL2uJjeuew7CqEykMvpKcWE= X-Google-Smtp-Source: ABdhPJzM/y74rN4UPFsjkP4opKK5TeklwtoTS5W8pl4gX7tR4orS7t665mzIfZsYsz2p/qjDx1e7Mw== X-Received: by 2002:ac8:4707:: with SMTP id f7mr378989qtp.22.1594660261068; Mon, 13 Jul 2020 10:11:01 -0700 (PDT) Received: from localhost.localdomain ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id v10sm19767919qtk.14.2020.07.13.10.10.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jul 2020 10:11:00 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH 21/23] linux: Consolidate utimes Date: Mon, 13 Jul 2020 14:10:23 -0300 Message-Id: <20200713171025.3661832-21-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200713171025.3661832-1-adhemerval.zanella@linaro.org> References: <20200713171025.3661832-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-14.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, 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-Patchwork-Original-From: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Netto Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" 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). --- 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