From patchwork Wed Jul 29 20:51:17 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: 40190 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 B8B403851C17; Wed, 29 Jul 2020 20:51:32 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B8B403851C17 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1596055892; bh=TGklAwlHZtRA1kSNIv2iMcvXYxVb+HtNdDBP3ELjwdw=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=VylJlVQzcISEG2jlywfX2k1vWJESZxILni/NNGzDPU5PPIfhJPa1Jzaa84Cz7Hk++ SohwsgQb8tawGcdUiqI/BYdezhSWd2BV05hBX2lQ9wjTZIIZWYvWV8js9BgaQcAOyi yjcQz9gjBdzAbj4qA0vvTvrU3xPp3RoAWr7svSt0= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qt1-x830.google.com (mail-qt1-x830.google.com [IPv6:2607:f8b0:4864:20::830]) by sourceware.org (Postfix) with ESMTPS id 99F6C3851C31 for ; Wed, 29 Jul 2020 20:51:29 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 99F6C3851C31 Received: by mail-qt1-x830.google.com with SMTP id e5so4719464qth.5 for ; Wed, 29 Jul 2020 13:51:29 -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=TGklAwlHZtRA1kSNIv2iMcvXYxVb+HtNdDBP3ELjwdw=; b=CaOLLbI5Lsab4RBZJgJYYsEKnZnEbcKrRa1vGDsMwICjz6SATtZYaQrrvYGI03ll3U 6cSuaxxHFKe+1znrb5aSJI+gl9uJ48T+p4e798S2PmB0uduBZTo5RDPDSCpV1AKGlE1d jRcGvN7vX2YrJ1qu6nlmX02xmG5+qtRmqxkXw/RlkzANTO/ejrW4ALW2kPCevLJES3MV mvOGUdcx6p77tcjU2ZD8iMkDC57FyQemimL9126Uuy/cjV84rFhIa+YPyqoh8dxP7YYA NA1Is9VlhO5Mx4Wev29RpKS1ZBFdVPLJxueGZyA7izvyFDfnDtrFkJ3GZK6Q1TgjbmWu iTLg== X-Gm-Message-State: AOAM530cBXqmrr6CbJfSR/8yn95CmPaYAFNawFQ9cbDZhAg43ZIxCCyj orgVb4eYz0BRFjI7+++70wJIi82iwOk= X-Google-Smtp-Source: ABdhPJwiQ/S9G2/llAN0AM3rwqa3XYVX4cLEZcVVqqvD0L2zSYu4qY7WEXnfY2woJgG0K1+bH1PKYw== X-Received: by 2002:aed:2a82:: with SMTP id t2mr249439qtd.280.1596055888835; Wed, 29 Jul 2020 13:51:28 -0700 (PDT) Received: from localhost.localdomain ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id v58sm2827230qtj.56.2020.07.29.13.51.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Jul 2020 13:51:28 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH 5/5] Remove __WORDSIZE_TIME64_COMPAT32 Date: Wed, 29 Jul 2020 17:51:17 -0300 Message-Id: <20200729205117.2925113-5-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200729205117.2925113-1-adhemerval.zanella@linaro.org> References: <20200729205117.2925113-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-13.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_NUMSUBJECT, 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 Cc: Alistair Francis Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" With 'struct utmpx', 'struct utmp', and 'struct lastlog' using 64-bit time unconditionally this macro is not used anymore. Reviewed-by: Lukasz Majewski --- bits/wordsize.h | 6 ------ sysdeps/aarch64/bits/wordsize.h | 2 -- sysdeps/mips/bits/wordsize.h | 6 ------ sysdeps/powerpc/powerpc32/bits/wordsize.h | 2 -- sysdeps/powerpc/powerpc64/bits/wordsize.h | 2 -- sysdeps/riscv/bits/wordsize.h | 6 ------ sysdeps/s390/s390-32/bits/wordsize.h | 2 -- sysdeps/s390/s390-64/bits/wordsize.h | 2 -- sysdeps/sparc/sparc32/bits/wordsize.h | 2 -- sysdeps/sparc/sparc64/bits/wordsize.h | 2 -- sysdeps/unix/sysv/linux/alpha/bits/wordsize.h | 1 - sysdeps/unix/sysv/linux/powerpc/bits/wordsize.h | 2 -- sysdeps/unix/sysv/linux/sparc/bits/wordsize.h | 2 -- sysdeps/wordsize-32/bits/wordsize.h | 1 - sysdeps/wordsize-64/bits/wordsize.h | 1 - sysdeps/x86/bits/wordsize.h | 3 --- 16 files changed, 42 deletions(-) diff --git a/bits/wordsize.h b/bits/wordsize.h index 14edae3a11..e20fd2e4c2 100644 --- a/bits/wordsize.h +++ b/bits/wordsize.h @@ -19,9 +19,3 @@ __WORDSIZE is 32 and ptrdiff_t is type 'int' and leave undefined if __WORDSIZE is 64. */ #define __WORDSIZE32_PTRDIFF_LONG - -/* Set to 1 in order to force time types to be 32 bits instead of 64 bits in - struct lastlog and struct utmp{,x} on 64-bit ports. This may be done in - order to make 64-bit ports compatible with 32-bit ports. Set to 0 for - 64-bit ports where the time types are 64-bits or for any 32-bit ports. */ -#define __WORDSIZE_TIME64_COMPAT32 diff --git a/sysdeps/aarch64/bits/wordsize.h b/sysdeps/aarch64/bits/wordsize.h index ee01841773..adc083d662 100644 --- a/sysdeps/aarch64/bits/wordsize.h +++ b/sysdeps/aarch64/bits/wordsize.h @@ -24,5 +24,3 @@ # define __WORDSIZE32_SIZE_ULONG 1 # define __WORDSIZE32_PTRDIFF_LONG 1 #endif - -#define __WORDSIZE_TIME64_COMPAT32 0 diff --git a/sysdeps/mips/bits/wordsize.h b/sysdeps/mips/bits/wordsize.h index d14f497895..3af04daea6 100644 --- a/sysdeps/mips/bits/wordsize.h +++ b/sysdeps/mips/bits/wordsize.h @@ -19,12 +19,6 @@ #define __WORDSIZE _MIPS_SZPTR -#if _MIPS_SIM == _ABI64 -# define __WORDSIZE_TIME64_COMPAT32 1 -#else -# define __WORDSIZE_TIME64_COMPAT32 0 -#endif - #if __WORDSIZE == 32 #define __WORDSIZE32_SIZE_ULONG 0 #define __WORDSIZE32_PTRDIFF_LONG 0 diff --git a/sysdeps/powerpc/powerpc32/bits/wordsize.h b/sysdeps/powerpc/powerpc32/bits/wordsize.h index 04ca9debf0..df1aa27244 100644 --- a/sysdeps/powerpc/powerpc32/bits/wordsize.h +++ b/sysdeps/powerpc/powerpc32/bits/wordsize.h @@ -2,10 +2,8 @@ #if defined __powerpc64__ # define __WORDSIZE 64 -# define __WORDSIZE_TIME64_COMPAT32 1 #else # define __WORDSIZE 32 -# define __WORDSIZE_TIME64_COMPAT32 0 # define __WORDSIZE32_SIZE_ULONG 0 # define __WORDSIZE32_PTRDIFF_LONG 0 #endif diff --git a/sysdeps/powerpc/powerpc64/bits/wordsize.h b/sysdeps/powerpc/powerpc64/bits/wordsize.h index 04ca9debf0..df1aa27244 100644 --- a/sysdeps/powerpc/powerpc64/bits/wordsize.h +++ b/sysdeps/powerpc/powerpc64/bits/wordsize.h @@ -2,10 +2,8 @@ #if defined __powerpc64__ # define __WORDSIZE 64 -# define __WORDSIZE_TIME64_COMPAT32 1 #else # define __WORDSIZE 32 -# define __WORDSIZE_TIME64_COMPAT32 0 # define __WORDSIZE32_SIZE_ULONG 0 # define __WORDSIZE32_PTRDIFF_LONG 0 #endif diff --git a/sysdeps/riscv/bits/wordsize.h b/sysdeps/riscv/bits/wordsize.h index faccc71828..182e3d33a6 100644 --- a/sysdeps/riscv/bits/wordsize.h +++ b/sysdeps/riscv/bits/wordsize.h @@ -21,9 +21,3 @@ #else # error unsupported ABI #endif - -#if __riscv_xlen == 64 -# define __WORDSIZE_TIME64_COMPAT32 1 -#else -# error "rv32i-based targets are not supported" -#endif diff --git a/sysdeps/s390/s390-32/bits/wordsize.h b/sysdeps/s390/s390-32/bits/wordsize.h index 129e47182b..755050861e 100644 --- a/sysdeps/s390/s390-32/bits/wordsize.h +++ b/sysdeps/s390/s390-32/bits/wordsize.h @@ -7,5 +7,3 @@ # define __WORDSIZE32_SIZE_ULONG 1 # define __WORDSIZE32_PTRDIFF_LONG 0 #endif - -#define __WORDSIZE_TIME64_COMPAT32 0 diff --git a/sysdeps/s390/s390-64/bits/wordsize.h b/sysdeps/s390/s390-64/bits/wordsize.h index 00e88b0628..01245a5b71 100644 --- a/sysdeps/s390/s390-64/bits/wordsize.h +++ b/sysdeps/s390/s390-64/bits/wordsize.h @@ -7,5 +7,3 @@ # define __WORDSIZE32_SIZE_ULONG 1 # define __WORDSIZE32_PTRDIFF_LONG 0 #endif - -#define __WORDSIZE_TIME64_COMPAT32 0 diff --git a/sysdeps/sparc/sparc32/bits/wordsize.h b/sysdeps/sparc/sparc32/bits/wordsize.h index 2f66f10d72..10b73267f0 100644 --- a/sysdeps/sparc/sparc32/bits/wordsize.h +++ b/sysdeps/sparc/sparc32/bits/wordsize.h @@ -2,10 +2,8 @@ #if defined __arch64__ || defined __sparcv9 # define __WORDSIZE 64 -# define __WORDSIZE_TIME64_COMPAT32 1 #else # define __WORDSIZE 32 -# define __WORDSIZE_TIME64_COMPAT32 0 # define __WORDSIZE32_SIZE_ULONG 0 # define __WORDSIZE32_PTRDIFF_LONG 0 #endif diff --git a/sysdeps/sparc/sparc64/bits/wordsize.h b/sysdeps/sparc/sparc64/bits/wordsize.h index 2f66f10d72..10b73267f0 100644 --- a/sysdeps/sparc/sparc64/bits/wordsize.h +++ b/sysdeps/sparc/sparc64/bits/wordsize.h @@ -2,10 +2,8 @@ #if defined __arch64__ || defined __sparcv9 # define __WORDSIZE 64 -# define __WORDSIZE_TIME64_COMPAT32 1 #else # define __WORDSIZE 32 -# define __WORDSIZE_TIME64_COMPAT32 0 # define __WORDSIZE32_SIZE_ULONG 0 # define __WORDSIZE32_PTRDIFF_LONG 0 #endif diff --git a/sysdeps/unix/sysv/linux/alpha/bits/wordsize.h b/sysdeps/unix/sysv/linux/alpha/bits/wordsize.h index 74289c244a..6d955a9f27 100644 --- a/sysdeps/unix/sysv/linux/alpha/bits/wordsize.h +++ b/sysdeps/unix/sysv/linux/alpha/bits/wordsize.h @@ -16,4 +16,3 @@ . */ #define __WORDSIZE 64 -#define __WORDSIZE_TIME64_COMPAT32 0 diff --git a/sysdeps/unix/sysv/linux/powerpc/bits/wordsize.h b/sysdeps/unix/sysv/linux/powerpc/bits/wordsize.h index 04ca9debf0..df1aa27244 100644 --- a/sysdeps/unix/sysv/linux/powerpc/bits/wordsize.h +++ b/sysdeps/unix/sysv/linux/powerpc/bits/wordsize.h @@ -2,10 +2,8 @@ #if defined __powerpc64__ # define __WORDSIZE 64 -# define __WORDSIZE_TIME64_COMPAT32 1 #else # define __WORDSIZE 32 -# define __WORDSIZE_TIME64_COMPAT32 0 # define __WORDSIZE32_SIZE_ULONG 0 # define __WORDSIZE32_PTRDIFF_LONG 0 #endif diff --git a/sysdeps/unix/sysv/linux/sparc/bits/wordsize.h b/sysdeps/unix/sysv/linux/sparc/bits/wordsize.h index 7562875ee2..10b73267f0 100644 --- a/sysdeps/unix/sysv/linux/sparc/bits/wordsize.h +++ b/sysdeps/unix/sysv/linux/sparc/bits/wordsize.h @@ -2,10 +2,8 @@ #if defined __arch64__ || defined __sparcv9 # define __WORDSIZE 64 -# define __WORDSIZE_TIME64_COMPAT32 1 #else # define __WORDSIZE 32 # define __WORDSIZE32_SIZE_ULONG 0 # define __WORDSIZE32_PTRDIFF_LONG 0 -# define __WORDSIZE_TIME64_COMPAT32 0 #endif diff --git a/sysdeps/wordsize-32/bits/wordsize.h b/sysdeps/wordsize-32/bits/wordsize.h index 759906a08d..869a7ab2aa 100644 --- a/sysdeps/wordsize-32/bits/wordsize.h +++ b/sysdeps/wordsize-32/bits/wordsize.h @@ -16,6 +16,5 @@ . */ #define __WORDSIZE 32 -#define __WORDSIZE_TIME64_COMPAT32 0 #define __WORDSIZE32_SIZE_ULONG 0 #define __WORDSIZE32_PTRDIFF_LONG 0 diff --git a/sysdeps/wordsize-64/bits/wordsize.h b/sysdeps/wordsize-64/bits/wordsize.h index 44b9725814..8613a6cb3c 100644 --- a/sysdeps/wordsize-64/bits/wordsize.h +++ b/sysdeps/wordsize-64/bits/wordsize.h @@ -16,4 +16,3 @@ . */ #define __WORDSIZE 64 -#define __WORDSIZE_TIME64_COMPAT32 0 diff --git a/sysdeps/x86/bits/wordsize.h b/sysdeps/x86/bits/wordsize.h index 70f652bca1..cf250cc6df 100644 --- a/sysdeps/x86/bits/wordsize.h +++ b/sysdeps/x86/bits/wordsize.h @@ -9,9 +9,6 @@ #endif #ifdef __x86_64__ -# define __WORDSIZE_TIME64_COMPAT32 1 /* Both x86-64 and x32 use the 64-bit system call interface. */ # define __SYSCALL_WORDSIZE 64 -#else -# define __WORDSIZE_TIME64_COMPAT32 0 #endif