From patchwork Thu Sep 7 22:41:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Albert ARIBAUD (3ADEV)" X-Patchwork-Id: 811233 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-84350-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="d5CkF0ow"; 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 3xpFx14Fhmz9sDB for ; Fri, 8 Sep 2017 08:48:37 +1000 (AEST) 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:in-reply-to :references; q=dns; s=default; b=lnSe1ySk+W57byac12q+Ig5MWEDMjyj G85AzY4va3oH8F7O8B+U+1ZBBKlUb+lxkth+ckux5MwEiQa6Q5iQbGEDqAcexXFJ XqpiEri5c+eNxYzqI5gtPadkoCCtehx+yVnL4oqwysNiJNL7Gkfx44a1Y11EvgsP LxdxKlfjO/oQ= 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:in-reply-to :references; s=default; bh=eMUsO52gnF0X57ypMvMCIUpKe/o=; b=d5CkF 0owI2Pm9fV4ij4VRwVpOC68sLCuOiomr9W0t7/lpVbvADtAI4db292oaj1qbF97a KK9azllyEGQL9ksTf7NtunIpMdfrrAJXYwp2eeiCh/PHj8ndB+drrQA3rmTp8W/4 ZINucOs8JH78+GusXzbeXqjNwgYFYUZI+1m+YQ= Received: (qmail 93763 invoked by alias); 7 Sep 2017 22:44:45 -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 93635 invoked by uid 89); 7 Sep 2017 22:44:45 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.6 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_LAZY_DOMAIN_SECURITY, RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.2 spammy= X-HELO: smtp6-g21.free.fr From: "Albert ARIBAUD (3ADEV)" To: libc-alpha@sourceware.org Cc: "Albert ARIBAUD (3ADEV)" Subject: [RFC PATCH 32/52] Y2038: add function __settimeofday_t64 Date: Fri, 8 Sep 2017 00:41:59 +0200 Message-Id: <20170907224219.12483-33-albert.aribaud@3adev.fr> In-Reply-To: <20170907224219.12483-32-albert.aribaud@3adev.fr> References: <20170907224219.12483-1-albert.aribaud@3adev.fr> <20170907224219.12483-2-albert.aribaud@3adev.fr> <20170907224219.12483-3-albert.aribaud@3adev.fr> <20170907224219.12483-4-albert.aribaud@3adev.fr> <20170907224219.12483-5-albert.aribaud@3adev.fr> <20170907224219.12483-6-albert.aribaud@3adev.fr> <20170907224219.12483-7-albert.aribaud@3adev.fr> <20170907224219.12483-8-albert.aribaud@3adev.fr> <20170907224219.12483-9-albert.aribaud@3adev.fr> <20170907224219.12483-10-albert.aribaud@3adev.fr> <20170907224219.12483-11-albert.aribaud@3adev.fr> <20170907224219.12483-12-albert.aribaud@3adev.fr> <20170907224219.12483-13-albert.aribaud@3adev.fr> <20170907224219.12483-14-albert.aribaud@3adev.fr> <20170907224219.12483-15-albert.aribaud@3adev.fr> <20170907224219.12483-16-albert.aribaud@3adev.fr> <20170907224219.12483-17-albert.aribaud@3adev.fr> <20170907224219.12483-18-albert.aribaud@3adev.fr> <20170907224219.12483-19-albert.aribaud@3adev.fr> <20170907224219.12483-20-albert.aribaud@3adev.fr> <20170907224219.12483-21-albert.aribaud@3adev.fr> <20170907224219.12483-22-albert.aribaud@3adev.fr> <20170907224219.12483-23-albert.aribaud@3adev.fr> <20170907224219.12483-24-albert.aribaud@3adev.fr> <20170907224219.12483-25-albert.aribaud@3adev.fr> <20170907224219.12483-26-albert.aribaud@3adev.fr> <20170907224219.12483-27-albert.aribaud@3adev.fr> <20170907224219.12483-28-albert.aribaud@3adev.fr> <20170907224219.12483-29-albert.aribaud@3adev.fr> <20170907224219.12483-30-albert.aribaud@3adev.fr> <20170907224219.12483-31-albert.aribaud@3adev.fr> <20170907224219.12483-32-albert.aribaud@3adev.fr> Implementing a 64-bit settimeofday requires adding a new file to build under time/ and we cannot name that new file 'settimeofday.c' or it will break the 32-bit settimeofday symbol, so we call it 'settimeofday64.c'. Signed-off-by: Albert ARIBAUD (3ADEV) --- sysdeps/unix/sysv/linux/settimeofday64.c | 44 ++++++++++++++++++++++++++++++++ time/Makefile | 3 ++- time/Versions | 1 + time/settimeofday.c | 8 ++++++ 4 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 sysdeps/unix/sysv/linux/settimeofday64.c diff --git a/sysdeps/unix/sysv/linux/settimeofday64.c b/sysdeps/unix/sysv/linux/settimeofday64.c new file mode 100644 index 0000000000..7aaef1c613 --- /dev/null +++ b/sysdeps/unix/sysv/linux/settimeofday64.c @@ -0,0 +1,44 @@ +/* Copyright (C) 1991-2017 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 + . */ + +#include +#include +#include + +extern int __y2038_linux_support; + +int __settimeofday_t64(const struct __timeval64 *tv, + const struct timezone *tz) +{ + struct timeval tv32; + + if (__y2038_linux_support) + { + /* TODO: use 64-bit syscall */ + } + + if (tv && tv->tv_sec > INT_MAX) + { + __set_errno(EOVERFLOW); + return -1; + } + + tv32.tv_sec = tv->tv_sec; + tv32.tv_usec = tv->tv_usec; + + return settimeofday(&tv32, tz); +} diff --git a/time/Makefile b/time/Makefile index 317c4d8901..5fb26f6dbf 100644 --- a/time/Makefile +++ b/time/Makefile @@ -36,7 +36,8 @@ routines := offtime asctime clock ctime ctime_r difftime \ stime dysize timegm ftime \ getdate strptime strptime_l \ strftime wcsftime strftime_l wcsftime_l \ - timespec_get + timespec_get \ + settimeofday64 aux := era alt_digit lc-time-cleanup tests := test_time clocktest tst-posixtz tst-strptime tst_wcsftime \ diff --git a/time/Versions b/time/Versions index 7daf158a8b..d420770af3 100644 --- a/time/Versions +++ b/time/Versions @@ -74,5 +74,6 @@ libc { __time_t64; __stime_t64; __gettimeofday_t64; + __settimeofday_t64; } } diff --git a/time/settimeofday.c b/time/settimeofday.c index 317c93d35f..65db5ab6e5 100644 --- a/time/settimeofday.c +++ b/time/settimeofday.c @@ -29,3 +29,11 @@ __settimeofday (const struct timeval *tv, const struct timezone *tz) stub_warning (settimeofday) weak_alias (__settimeofday, settimeofday) + +int +__settimeofday_t64 (const struct timeval *tv, const struct timezone *tz) +{ + __set_errno (ENOSYS); + return -1; +} +stub_warning (__settimeofday_t64)