From patchwork Tue Feb 28 13:37:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 65767 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 B19523858D3C for ; Tue, 28 Feb 2023 13:37:54 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B19523858D3C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1677591474; bh=0Rf94E4VmBl2mW7reBPj5hoGm2TENwKEHOZIM7APMmo=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=hdQqawK8B5i0MQGDlNkSBkyk8g5kGNo5d8h/SbEcipzwhoAE0MeccgxOeR0E8W/RR D+k3dr+FI1f7vXm0FoWFIrYax1Zq/+/f66e1dteLLaNEwX4opcqEKS9CSJacKidboR Bc8c1UC4oBo17g1XBB4LfsGvavYkCfFGNvwcg4OE= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-oi1-x232.google.com (mail-oi1-x232.google.com [IPv6:2607:f8b0:4864:20::232]) by sourceware.org (Postfix) with ESMTPS id 759C93858401 for ; Tue, 28 Feb 2023 13:37:30 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 759C93858401 Received: by mail-oi1-x232.google.com with SMTP id bm20so7988527oib.7 for ; Tue, 28 Feb 2023 05:37:30 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677591449; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=0Rf94E4VmBl2mW7reBPj5hoGm2TENwKEHOZIM7APMmo=; b=xVirMbqJYpIJn2jpODGCEHO2jQ55JbwoZQGVjShqmNUax48vRYThLwMWKJcYOIkXSE q6+gBcU8Y3Q64VT2iFboYJiwU/bZ2PURr6YxEC1u1GulsZZ7rcY3BQPz1OliXLeZrVHl DLje7BAsLc3nN9gSqHemy3FiDTKyQRPk8wP1uEPqqk6t+ew6Q62JVFkAUutwOKt0znw7 9vJ0hDigglNg68GmlqvTNviLmEpEQ/gbShlTk1GXUM735S9FNnBR0zABJUOh2zGHnXS6 p/vYOWTqQGGfDGlOqej2ZXeMtvAuBtatovL9Ec/5LtIWYZYCigDy7eiCxDRWG/F/yREI 2GgA== X-Gm-Message-State: AO0yUKW3ABqiERHsMrpaWK2T5dhw7amuOOTX5KGRgIVT1eXsaBLCSLfG ilaEKEnzwkqxrwcheW03TtuvzxhP3nFsykdl9x4= X-Google-Smtp-Source: AK7set9UbpPl59osHfW9R22o5gLkA3UiKphPGj/T7RWCDlHtZZ+ivR9cApZbfo44OWkUN29DrlNpqg== X-Received: by 2002:a05:6808:2798:b0:384:3750:ef08 with SMTP id es24-20020a056808279800b003843750ef08mr1422772oib.8.1677591449061; Tue, 28 Feb 2023 05:37:29 -0800 (PST) Received: from mandiga.. ([2804:1b3:a7c3:d849:7299:419:6fb3:7a8]) by smtp.gmail.com with ESMTPSA id i5-20020acaea05000000b00383b8084203sm4367636oih.26.2023.02.28.05.37.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Feb 2023 05:37:28 -0800 (PST) To: libc-alpha@sourceware.org Cc: Andreas Schwab Subject: [PATCH v2] support: use 64-bit time_t (bug 30111) Date: Tue, 28 Feb 2023 10:37:18 -0300 Message-Id: <20230228133718.237612-1-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-12.9 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.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) 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+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" From: Andreas Schwab Ensure to use 64-bit time_t in the test infrastructure. Changes from v1: - Added delayed_exit.c, shell-container.c, support_process_state.c, support_process_state.c, xmkdirp.c, and temp_file.c. --- support/Makefile | 18 ++++++++++++++++++ support/shell-container.c | 2 -- support/support_can_chroot.c | 4 ++-- support/support_copy_file.c | 2 +- support/support_descriptor_supports_holes.c | 2 +- support/test-container.c | 2 -- 6 files changed, 22 insertions(+), 8 deletions(-) diff --git a/support/Makefile b/support/Makefile index b29b7eb505..a304c5cdc0 100644 --- a/support/Makefile +++ b/support/Makefile @@ -238,6 +238,24 @@ CFLAGS-support_paths.c = \ CFLAGS-timespec.c += -fexcess-precision=standard CFLAGS-timespec-time64.c += -fexcess-precision=standard +# Ensure that general support files use 64-bit time_t +CFLAGS-delayed_exit.c += -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64 +CFLAGS-shell-container.c += -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64 +CFLAGS-support_can_chroot.c += -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64 +CFLAGS-support_copy_file.c += -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64 +CFLAGS-support_copy_file_range.c += -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64 +CFLAGS-support_descriptor_supports_holes.c += -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64 +CFLAGS-support_descriptors.c += -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64 +CFLAGS-support_process_state.c += -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64 +CFLAGS-support_stat_nanoseconds.c += -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64 +CFLAGS-support_subprocess.c += -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64 +CFLAGS-support_test_main.c += -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64 +CFLAGS-test-container.c += -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64 +CFLAGS-xmkdirp.c += -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64 +# This is required to get an mkstemp which can create large files on some +# 32-bit platforms. +CFLAGS-temp_file.c += -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64 + ifeq (,$(CXX)) LINKS_DSO_PROGRAM = links-dso-program-c else diff --git a/support/shell-container.c b/support/shell-container.c index e9ac9b6d04..ffa3378b5e 100644 --- a/support/shell-container.c +++ b/support/shell-container.c @@ -16,8 +16,6 @@ License along with the GNU C Library; if not, see . */ -#define _FILE_OFFSET_BITS 64 - #include #include #include diff --git a/support/support_can_chroot.c b/support/support_can_chroot.c index 7d9f91205d..7b4f491b53 100644 --- a/support/support_can_chroot.c +++ b/support/support_can_chroot.c @@ -29,14 +29,14 @@ static void callback (void *closure) { int *result = closure; - struct stat64 before; + struct stat before; xstat ("/dev", &before); if (chroot ("/dev") != 0) { *result = errno; return; } - struct stat64 after; + struct stat after; xstat ("/", &after); TEST_VERIFY (before.st_dev == after.st_dev); TEST_VERIFY (before.st_ino == after.st_ino); diff --git a/support/support_copy_file.c b/support/support_copy_file.c index 50ff87b9f1..f3e0a2d1b7 100644 --- a/support/support_copy_file.c +++ b/support/support_copy_file.c @@ -24,7 +24,7 @@ void support_copy_file (const char *from, const char *to) { - struct stat64 st; + struct stat st; xstat (from, &st); int fd_from = xopen (from, O_RDONLY, 0); mode_t mode = st.st_mode & 0777; diff --git a/support/support_descriptor_supports_holes.c b/support/support_descriptor_supports_holes.c index 7af5934808..91db216bf0 100644 --- a/support/support_descriptor_supports_holes.c +++ b/support/support_descriptor_supports_holes.c @@ -40,7 +40,7 @@ support_descriptor_supports_holes (int fd) block_headroom = 32, }; - struct stat64 st; + struct stat st; xfstat (fd, &st); if (!S_ISREG (st.st_mode)) FAIL_EXIT1 ("descriptor %d does not refer to a regular file", fd); diff --git a/support/test-container.c b/support/test-container.c index f1a68b224a..e68f16eecf 100644 --- a/support/test-container.c +++ b/support/test-container.c @@ -16,8 +16,6 @@ License along with the GNU C Library; if not, see . */ -#define _FILE_OFFSET_BITS 64 - #include #include #include