From 1f17da01e64efba97c0d39e2b3d01c8034b6db5a Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella Date: Fri, 31 Dec 2021 10:58:13 -0300 Subject: time: Refactor timesize.h for some ABIs 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 +++----- sysdeps/unix/sysv/linux/powerpc/bits/timesize.h | 22 ++++++++++++++++++++++ .../sysv/linux/powerpc/powerpc32/bits/timesize.h | 20 -------------------- sysdeps/unix/sysv/linux/s390/bits/timesize.h | 22 ++++++++++++++++++++++ .../unix/sysv/linux/s390/s390-32/bits/timesize.h | 20 -------------------- sysdeps/unix/sysv/linux/sparc/bits/timesize.h | 22 ++++++++++++++++++++++ .../unix/sysv/linux/sparc/sparc32/bits/timesize.h | 20 -------------------- 7 files changed, 69 insertions(+), 65 deletions(-) create mode 100644 sysdeps/unix/sysv/linux/powerpc/bits/timesize.h delete mode 100644 sysdeps/unix/sysv/linux/powerpc/powerpc32/bits/timesize.h create mode 100644 sysdeps/unix/sysv/linux/s390/bits/timesize.h delete mode 100644 sysdeps/unix/sysv/linux/s390/s390-32/bits/timesize.h create mode 100644 sysdeps/unix/sysv/linux/sparc/bits/timesize.h delete mode 100644 sysdeps/unix/sysv/linux/sparc/sparc32/bits/timesize.h (limited to 'sysdeps/unix/sysv/linux') 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/bits/timesize.h b/sysdeps/unix/sysv/linux/powerpc/bits/timesize.h new file mode 100644 index 0000000000..ace12f9c84 --- /dev/null +++ b/sysdeps/unix/sysv/linux/powerpc/bits/timesize.h @@ -0,0 +1,22 @@ +/* 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. + + 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 + +/* Size in bits of the 'time_t' type of the default ABI. */ +#define __TIMESIZE __WORDSIZE diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/bits/timesize.h b/sysdeps/unix/sysv/linux/powerpc/powerpc32/bits/timesize.h deleted file mode 100644 index 33a8bf9862..0000000000 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/bits/timesize.h +++ /dev/null @@ -1,20 +0,0 @@ -/* Bit size of the time_t type at glibc build time, Linux/PowerPC 32-bits. - Copyright (C) 2021 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 - . */ - -/* Size in bits of the 'time_t' type of the default ABI. */ -#define __TIMESIZE 32 diff --git a/sysdeps/unix/sysv/linux/s390/bits/timesize.h b/sysdeps/unix/sysv/linux/s390/bits/timesize.h new file mode 100644 index 0000000000..deb79c4af6 --- /dev/null +++ b/sysdeps/unix/sysv/linux/s390/bits/timesize.h @@ -0,0 +1,22 @@ +/* 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. + + 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 + +/* Size in bits of the 'time_t' type of the default ABI. */ +#define __TIMESIZE __WORDSIZE diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/bits/timesize.h b/sysdeps/unix/sysv/linux/s390/s390-32/bits/timesize.h deleted file mode 100644 index a3eb9455cd..0000000000 --- a/sysdeps/unix/sysv/linux/s390/s390-32/bits/timesize.h +++ /dev/null @@ -1,20 +0,0 @@ -/* Bit size of the time_t type at glibc build time, Linux/s390 32-bits. - Copyright (C) 2021 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 - . */ - -/* Size in bits of the 'time_t' type of the default ABI. */ -#define __TIMESIZE 32 diff --git a/sysdeps/unix/sysv/linux/sparc/bits/timesize.h b/sysdeps/unix/sysv/linux/sparc/bits/timesize.h new file mode 100644 index 0000000000..319d88b700 --- /dev/null +++ b/sysdeps/unix/sysv/linux/sparc/bits/timesize.h @@ -0,0 +1,22 @@ +/* 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. + + 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 + +/* Size in bits of the 'time_t' type of the default ABI. */ +#define __TIMESIZE __WORDSIZE diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/bits/timesize.h b/sysdeps/unix/sysv/linux/sparc/sparc32/bits/timesize.h deleted file mode 100644 index 586f4d9fdc..0000000000 --- a/sysdeps/unix/sysv/linux/sparc/sparc32/bits/timesize.h +++ /dev/null @@ -1,20 +0,0 @@ -/* Bit size of the time_t type at glibc build time, Linux/sparc 32-bits. - Copyright (C) 2021 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 - . */ - -/* Size in bits of the 'time_t' type of the default ABI. */ -#define __TIMESIZE 32 -- cgit 1.4.1