From patchwork Mon Jul 13 17:10:03 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: 40066 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 4F4A9388C02F; Mon, 13 Jul 2020 17:10:33 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4F4A9388C02F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1594660233; bh=ry5OCoQItser1KRmKmMaqu9ZY8dq3SteT7Nh0Vx2KuI=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=TsE7jIiH7A48CjW3EsKS0S6MhEU2PlevFBeKHZpbzPLhbMU6Nh9CVR+9FTRxS+cfL 5bctXGb5Zl7xmaXirYuLkfFiIPSFi+xynP2c31zSNg1ahe0QQgypyUL42xyNljGr3j 2rAOBHnNoZ9m8vvnIg+Jm0gNsOzXOzvKoFH6Uc/E= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qt1-x842.google.com (mail-qt1-x842.google.com [IPv6:2607:f8b0:4864:20::842]) by sourceware.org (Postfix) with ESMTPS id D23FD3865C10 for ; Mon, 13 Jul 2020 17:10:30 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org D23FD3865C10 Received: by mail-qt1-x842.google.com with SMTP id b25so10536543qto.2 for ; Mon, 13 Jul 2020 10:10:30 -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:mime-version :content-transfer-encoding; bh=ry5OCoQItser1KRmKmMaqu9ZY8dq3SteT7Nh0Vx2KuI=; b=CvgOQFbySyvwL86R8aEKobOA5MrgX5NjkQPsc6tuABoK/wym3rCq+Jlbzsbrbmb/yd entaCmc+QtLqF6Ivcdi13iK5SzZFF4YBfO1Uq8bj2sneJuhg/iQB09d749PKEz2+zLPc sjlGNQzrPugvulrPOjkbvUE8Q5blPfWz/S3t+lXVH86UuVr01J/AGnMPNrGQBMHUZYnJ pZn9uKrDqYoZkdd3e+ygPEt5WvlrQnySEghQ4MbT4TwN8Xo/sOuNatGhZ8XMQe1XikNG O9dmc+aB5lo/wCWvbpENSU4pHxU+sca9jzPmQhYWWAfrQnidthPateoRawRrL8NB2+uD /u3Q== X-Gm-Message-State: AOAM530uyQ0xVhPAgmb4X3RLJAY0mRs5SwgPefaZxe/9snsHj6zLPsks SjB3qiQvkjeeeUAqGCBBYO+7Ij+48jM= X-Google-Smtp-Source: ABdhPJyM4C/nkAWHC6ukCekTrwFHwpca3s7QOSK+DZig9Ily78B7/eKOFQFjRqg+Mz7RvYLB18FfdA== X-Received: by 2002:ac8:305d:: with SMTP id g29mr318222qte.115.1594660230187; Mon, 13 Jul 2020 10:10:30 -0700 (PDT) Received: from localhost.localdomain ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id v10sm19767919qtk.14.2020.07.13.10.10.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jul 2020 10:10:29 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH 01/23] linux: Simplify clock_adjtime Date: Mon, 13 Jul 2020 14:10:03 -0300 Message-Id: <20200713171025.3661832-1-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.25.1 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, 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" With arch-syscall.h it can now assumes the existance of either __NR_clock_adjtime or __NR_clock_adjtime_time64. The 32-bit time_t support is now only build for !__ASSUME_TIME64_SYSCALLS. Checked on x86_64-linux-gnu and i686-linux-gnu (on 5.4 and on 4.15 kernel). Reviewed-by: Alistair Francis Reviewed-by: Lukasz Majewski --- sysdeps/unix/sysv/linux/clock_adjtime.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/sysdeps/unix/sysv/linux/clock_adjtime.c b/sysdeps/unix/sysv/linux/clock_adjtime.c index 764a60b9bf..4caff2ad05 100644 --- a/sysdeps/unix/sysv/linux/clock_adjtime.c +++ b/sysdeps/unix/sysv/linux/clock_adjtime.c @@ -26,15 +26,13 @@ int __clock_adjtime64 (const clockid_t clock_id, struct __timex64 *tx64) { -#ifdef __ASSUME_TIME64_SYSCALLS -# ifndef __NR_clock_adjtime64 -# define __NR_clock_adjtime64 __NR_clock_adjtime -# endif - return INLINE_SYSCALL_CALL (clock_adjtime64, clock_id, tx64); -#else - int ret = INLINE_SYSCALL_CALL (clock_adjtime64, clock_id, tx64); - if (errno != ENOSYS) - return ret; +#ifndef __NR_clock_adjtime64 +# define __NR_clock_adjtime64 __NR_clock_adjtime +#endif + int r = INLINE_SYSCALL_CALL (clock_adjtime64, clock_id, tx64); +#ifndef __ASSUME_TIME64_SYSCALLS + if (r >= 0 || errno != ENOSYS) + return r; if (tx64->modes & ADJ_SETOFFSET && ! in_time_t_range (tx64->time.tv_sec)) @@ -44,12 +42,11 @@ __clock_adjtime64 (const clockid_t clock_id, struct __timex64 *tx64) } struct timex tx32 = valid_timex64_to_timex (*tx64); - int retval = INLINE_SYSCALL_CALL (clock_adjtime, clock_id, &tx32); - if (retval >= 0) + r = INLINE_SYSCALL_CALL (clock_adjtime, clock_id, &tx32); + if (r >= 0) *tx64 = valid_timex_to_timex64 (tx32); - - return retval; #endif + return r; } #if __TIMESIZE != 64