From patchwork Fri Dec 31 14:10:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 49438 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 07757385800A for ; Fri, 31 Dec 2021 14:10:42 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 07757385800A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1640959842; bh=g6ktDDgeV1HK2hGFUERJidc+urTDv/b6YvmVTC4DpgQ=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=YBWIqxSw79rFgqXRUoTRO2QteVOzk/d/ok6Mu57yoWoll5zah1I8yFo19i86EPK0F 9bruzugM2oRT8cvx9DXZ414fjGCZ49egCxeQLoaZQXLwp+BiCawAaVOz5a42TvYc2b tIRHMoZC3wPYze/MXzbOlctu0xpf05YyvWxIeAmc= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qv1-xf30.google.com (mail-qv1-xf30.google.com [IPv6:2607:f8b0:4864:20::f30]) by sourceware.org (Postfix) with ESMTPS id 5667A3858C3A for ; Fri, 31 Dec 2021 14:10:20 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 5667A3858C3A Received: by mail-qv1-xf30.google.com with SMTP id fq10so24771588qvb.10 for ; Fri, 31 Dec 2021 06:10:20 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=g6ktDDgeV1HK2hGFUERJidc+urTDv/b6YvmVTC4DpgQ=; b=Mh7Zu1+58HxxU1aKXBtOxa7Ml8xnVh8xA64gXoZQTfp0yu6+kT/lmUd91RrA0r+lLW di9+lOljAKpeK1CRedWL49iXAoxAg5xknRgSnfcGkkpc/RklvPbfiWEUlC95r7el6nms k4Jn3pRWNUnVfXH+QrD0zyhdblUDP7MdKmy6mEzRQtdL7kwmR6xW1p/jwJvid4RdGJbg kydfyAsR3p4MOuNxdMb0nYGqPwk2Pcc0fJ0X2DrGPYiX4N+zZfvKeWJWQsMa+72VWi3S Pwv87vudCWVck2I+9TAI7wl5WP7DPcHgsbF21LQQhvnkTTq0UYbjPnkojnB0I720tRiw bCYA== X-Gm-Message-State: AOAM5316wYtxRbyw687W19I5/flgIXyECpB9UQgYbWMR46PYBldhxMiC /08bo9ExcnoItZwNR4jXilniqC2HvvUE/Q== X-Google-Smtp-Source: ABdhPJxqJjZVqjDz/p5aFjPUizqxIwqcTc98TE4D73pZKk9A3SanZdktPc4OnRBMcuODZi2bv1NB3Q== X-Received: by 2002:a05:6214:c83:: with SMTP id r3mr32280934qvr.109.1640959819427; Fri, 31 Dec 2021 06:10:19 -0800 (PST) Received: from birita.. ([2804:431:c7ca:a350:5a10:7e58:36eb:1d06]) by smtp.gmail.com with ESMTPSA id y14sm16883900qkp.27.2021.12.31.06.10.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Dec 2021 06:10:18 -0800 (PST) To: libc-alpha@sourceware.org Subject: [COMMITTED] time: Refactor timesize.h for some ABIs Date: Fri, 31 Dec 2021 11:10:15 -0300 Message-Id: <20211231141015.2014473-1-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 X-Spam-Status: No, score=-12.6 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.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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 Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" Commit a4b413135535c83a changed default __TIMESIZE to 64, however it added sub-architecture timesize.h for powerpc, s390, and sparc. Also simplify mips by removing _MIPS_SIM usage (which would require to add sgidefs inclusion. --- sysdeps/unix/sysv/linux/mips/bits/timesize.h | 8 +++----- .../sysv/linux/powerpc/{powerpc32 => }/bits/timesize.h | 6 ++++-- .../unix/sysv/linux/s390/{s390-32 => }/bits/timesize.h | 6 ++++-- .../unix/sysv/linux/sparc/{sparc32 => }/bits/timesize.h | 6 ++++-- 4 files changed, 15 insertions(+), 11 deletions(-) rename sysdeps/unix/sysv/linux/powerpc/{powerpc32 => }/bits/timesize.h (93%) rename sysdeps/unix/sysv/linux/s390/{s390-32 => }/bits/timesize.h (87%) rename sysdeps/unix/sysv/linux/sparc/{sparc32 => }/bits/timesize.h (87%) diff --git a/sysdeps/unix/sysv/linux/mips/bits/timesize.h b/sysdeps/unix/sysv/linux/mips/bits/timesize.h index 95a27ad5b6..8497a6be7d 100644 --- a/sysdeps/unix/sysv/linux/mips/bits/timesize.h +++ b/sysdeps/unix/sysv/linux/mips/bits/timesize.h @@ -16,9 +16,7 @@ License along with the GNU C Library; if not, see . */ +#include + /* Size in bits of the 'time_t' type of the default ABI. */ -#if _MIPS_SIM == _ABI64 -# define __TIMESIZE 64 -#else -# define __TIMESIZE 32 -#endif +#define __TIMESIZE __WORDSIZE diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/bits/timesize.h b/sysdeps/unix/sysv/linux/powerpc/bits/timesize.h similarity index 93% rename from sysdeps/unix/sysv/linux/powerpc/powerpc32/bits/timesize.h rename to sysdeps/unix/sysv/linux/powerpc/bits/timesize.h index 33a8bf9862..ace12f9c84 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/bits/timesize.h +++ b/sysdeps/unix/sysv/linux/powerpc/bits/timesize.h @@ -1,4 +1,4 @@ -/* Bit size of the time_t type at glibc build time, Linux/PowerPC 32-bits. +/* Bit size of the time_t type at glibc build time, Linux/PowerPC. Copyright (C) 2021 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -16,5 +16,7 @@ License along with the GNU C Library; if not, see . */ +#include + /* Size in bits of the 'time_t' type of the default ABI. */ -#define __TIMESIZE 32 +#define __TIMESIZE __WORDSIZE diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/bits/timesize.h b/sysdeps/unix/sysv/linux/s390/bits/timesize.h similarity index 87% rename from sysdeps/unix/sysv/linux/s390/s390-32/bits/timesize.h rename to sysdeps/unix/sysv/linux/s390/bits/timesize.h index a3eb9455cd..deb79c4af6 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-32/bits/timesize.h +++ b/sysdeps/unix/sysv/linux/s390/bits/timesize.h @@ -1,4 +1,4 @@ -/* Bit size of the time_t type at glibc build time, Linux/s390 32-bits. +/* Bit size of the time_t type at glibc build time, Linux/s390. Copyright (C) 2021 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -16,5 +16,7 @@ License along with the GNU C Library; if not, see . */ +#include + /* Size in bits of the 'time_t' type of the default ABI. */ -#define __TIMESIZE 32 +#define __TIMESIZE __WORDSIZE diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/bits/timesize.h b/sysdeps/unix/sysv/linux/sparc/bits/timesize.h similarity index 87% rename from sysdeps/unix/sysv/linux/sparc/sparc32/bits/timesize.h rename to sysdeps/unix/sysv/linux/sparc/bits/timesize.h index 586f4d9fdc..319d88b700 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc32/bits/timesize.h +++ b/sysdeps/unix/sysv/linux/sparc/bits/timesize.h @@ -1,4 +1,4 @@ -/* Bit size of the time_t type at glibc build time, Linux/sparc 32-bits. +/* Bit size of the time_t type at glibc build time, Linux/sparc. Copyright (C) 2021 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -16,5 +16,7 @@ License along with the GNU C Library; if not, see . */ +#include + /* Size in bits of the 'time_t' type of the default ABI. */ -#define __TIMESIZE 32 +#define __TIMESIZE __WORDSIZE