lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-29 11:41:21 +03:00
Code Activity

Y2038: provide size of default time_t for target architecture

Browse Source 
To determine whether the default time_t interfaces are 32-bit
    and so need conversions, or are 64-bit and so are compatible
    with the internal 64-bit type without conversions, a macro
    giving the size of the  default time_t is also required.
    This macro is called __TIMESIZE.

    This macro can then be used instead of __WORDSIZE in msq-pad.h
    and shm-pad.h files, which in turn allows removing their x86
    variants, and in sem-pad.h files but keeping the x86 variant.

    This patch was tested by running 'make check' on branch master
    then applying this patch and running 'make check' again, and
    checking that both 'make check' yield identical results.
    This was done on x86_64-linux-gnu and i686-linux-gnu.

	* bits/timesize.h: New file.
	* stdlib/Makefile (headers): Add bits/timesize.h.
	* sysdeps/unix/sysv/linux/bits/msq-pad.h
	(__MSQ_PAD_AFTER_TIME): Use __TIMESIZE instead of __WORDSIZE.
	* sysdeps/unix/sysv/linux/bits/sem-pad.h
	(__SEM_PAD_AFTER_TIME): Likewise.
	* sysdeps/unix/sysv/linux/bits/shm-pad.h
	(__SHM_PAD_AFTER_TIME): Likewise.
	* sysdeps/unix/sysv/linux/hppa/bits/msq-pad.h
	(__MSQ_PAD_BEFORE_TIME): Likewise.
	* sysdeps/unix/sysv/linux/hppa/bits/sem-pad.h
	(__SEM_PAD_BEFORE_TIME): Likewise.
	* sysdeps/unix/sysv/linux/hppa/bits/shm-pad.h
	(__SHM_PAD_BEFORE_TIME, __SHM_PAD_BETWEEN_TIME_AND_SEGSZ): Likewise.
	* sysdeps/unix/sysv/linux/mips/bits/msq-pad.h
        (__MSQ_PAD_AFTER_TIME, __MSQ_PAD_BEFORE_TIME): Likewise.
        * sysdeps/unix/sysv/linux/powerpc/bits/msq-pad.h
        (__MSQ_PAD_BEFORE_TIME): Likewise.
	* sysdeps/unix/sysv/linux/powerpc/bits/sem-pad.h
	(__SEM_PAD_BEFORE_TIME): Likewise.
	* sysdeps/unix/sysv/linux/powerpc/bits/shm-pad.h
	(__SHM_PAD_BEFORE_TIME, __SHM_PAD_BETWEEN_TIME_AND_SEGSZ): Likewise.
	* sysdeps/unix/sysv/linux/sparc/bits/msq-pad.h
	(__MSQ_PAD_BEFORE_TIME): Likewise.
	* sysdeps/unix/sysv/linux/sparc/bits/sem-pad.h
	(__SEM_PAD_BEFORE_TIME): Likewise.
	* sysdeps/unix/sysv/linux/sparc/bits/shm-pad.h
	(__SHM_PAD_BEFORE_TIME): Likewise.
	* sysdeps/unix/sysv/linux/x86/bits/msq-pad.h: Delete file.
	* sysdeps/unix/sysv/linux/x86/bits/shm-pad.h: Likewise.
	* sysdeps/unix/sysv/linux/x86/bits/timesize.h: New file.
This commit is contained in:
Albert ARIBAUD (3ADEV)
2018-10-24 11:34:26 +02:00
parent 7cc65773f0
commit a27a4f4721
17 changed files with 74 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
ChangeLog
View File

@ -1,3 +1,37 @@
2018-10-24 Albert ARIBAUD <albert.aribaud@3adev.fr>
* bits/timesize.h: New file.
* stdlib/Makefile (headers): Add bits/timesize.h.
* sysdeps/unix/sysv/linux/bits/msq-pad.h
(__MSQ_PAD_AFTER_TIME): Use __TIMESIZE instead of __WORDSIZE.
* sysdeps/unix/sysv/linux/bits/sem-pad.h
(__SEM_PAD_AFTER_TIME): Likewise.
* sysdeps/unix/sysv/linux/bits/shm-pad.h
(__SHM_PAD_AFTER_TIME): Likewise.
* sysdeps/unix/sysv/linux/hppa/bits/msq-pad.h
(__MSQ_PAD_BEFORE_TIME): Likewise.
* sysdeps/unix/sysv/linux/hppa/bits/sem-pad.h
(__SEM_PAD_BEFORE_TIME): Likewise.
* sysdeps/unix/sysv/linux/hppa/bits/shm-pad.h
(__SHM_PAD_BEFORE_TIME, __SHM_PAD_BETWEEN_TIME_AND_SEGSZ): Likewise.
* sysdeps/unix/sysv/linux/mips/bits/msq-pad.h
(__MSQ_PAD_AFTER_TIME, __MSQ_PAD_BEFORE_TIME): Likewise.
* sysdeps/unix/sysv/linux/powerpc/bits/msq-pad.h
(__MSQ_PAD_BEFORE_TIME): Likewise.
* sysdeps/unix/sysv/linux/powerpc/bits/sem-pad.h
(__SEM_PAD_BEFORE_TIME): Likewise.
* sysdeps/unix/sysv/linux/powerpc/bits/shm-pad.h
(__SHM_PAD_BEFORE_TIME, __SHM_PAD_BETWEEN_TIME_AND_SEGSZ): Likewise.
* sysdeps/unix/sysv/linux/sparc/bits/msq-pad.h
(__MSQ_PAD_BEFORE_TIME): Likewise.
* sysdeps/unix/sysv/linux/sparc/bits/sem-pad.h
(__SEM_PAD_BEFORE_TIME): Likewise.
* sysdeps/unix/sysv/linux/sparc/bits/shm-pad.h
(__SHM_PAD_BEFORE_TIME): Likewise.
* sysdeps/unix/sysv/linux/x86/bits/msq-pad.h: Delete file.
* sysdeps/unix/sysv/linux/x86/bits/shm-pad.h: Likewise.
* sysdeps/unix/sysv/linux/x86/bits/timesize.h: New file.
2018-10-24 H.J. Lu <hongjiu.lu@intel.com> 2018-10-24 H.J. Lu <hongjiu.lu@intel.com>
* benchtests/Makefile (CPPFLAGS-nonlib): Add -DUSE_RDTSCP if * benchtests/Makefile (CPPFLAGS-nonlib): Add -DUSE_RDTSCP if

16
sysdeps/unix/sysv/linux/x86/bits/shm-pad.h → bits/timesize.h
View File

@ -1,4 +1,4 @@
/* Define where padding goes in struct shmid_ds. x86 version. /* Bit size of the time_t type at glibc build time, general case.
Copyright (C) 2018 Free Software Foundation, Inc. Copyright (C) 2018 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
@ -16,15 +16,7 @@
License along with the GNU C Library; if not, see License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */ <http://www.gnu.org/licenses/>. */
#ifndef _SYS_SHM_H #include <bits/wordsize.h>
# error "Never use <bits/shm-pad.h> directly; include <sys/shm.h> instead."
#endif
#ifdef __x86_64__ /* Size in bits of the 'time_t' type of the default ABI. */
# define __SHM_PAD_AFTER_TIME 0 #define __TIMESIZE __WORDSIZE
#else
# define __SHM_PAD_AFTER_TIME 1
#endif
#define __SHM_PAD_BEFORE_TIME 0
#define __SHM_SEGSZ_AFTER_TIME 0
#define __SHM_PAD_BETWEEN_TIME_AND_SEGSZ 0

2
stdlib/Makefile
View File

@ -24,7 +24,7 @@ include ../Makeconfig
headers := stdlib.h bits/stdlib.h bits/stdlib-ldbl.h bits/stdlib-float.h \ headers := stdlib.h bits/stdlib.h bits/stdlib-ldbl.h bits/stdlib-float.h \
monetary.h bits/monetary-ldbl.h \ monetary.h bits/monetary-ldbl.h \
inttypes.h stdint.h bits/wordsize.h \ inttypes.h stdint.h bits/wordsize.h bits/timesize.h \
errno.h sys/errno.h bits/errno.h bits/types/error_t.h \ errno.h sys/errno.h bits/errno.h bits/types/error_t.h \
ucontext.h sys/ucontext.h bits/indirect-return.h \ ucontext.h sys/ucontext.h bits/indirect-return.h \
alloca.h fmtmsg.h \ alloca.h fmtmsg.h \

4
sysdeps/unix/sysv/linux/bits/msq-pad.h
View File

@ -20,12 +20,12 @@
# error "Never use <bits/msq-pad.h> directly; include <sys/msg.h> instead." # error "Never use <bits/msq-pad.h> directly; include <sys/msg.h> instead."
#endif #endif
#include <bits/wordsize.h> #include <bits/timesize.h>
/* On most architectures, padding goes after time fields for 32-bit /* On most architectures, padding goes after time fields for 32-bit
systems and is omitted for 64-bit systems. Some architectures pad systems and is omitted for 64-bit systems. Some architectures pad
before time fields instead, or omit padding despite being before time fields instead, or omit padding despite being
32-bit. */ 32-bit. */
#define __MSQ_PAD_AFTER_TIME (__WORDSIZE == 32) #define __MSQ_PAD_AFTER_TIME (__TIMESIZE == 32)
#define __MSQ_PAD_BEFORE_TIME 0 #define __MSQ_PAD_BEFORE_TIME 0

4
sysdeps/unix/sysv/linux/bits/sem-pad.h
View File

@ -20,7 +20,7 @@
# error "Never use <bits/sem-pad.h> directly; include <sys/sem.h> instead." # error "Never use <bits/sem-pad.h> directly; include <sys/sem.h> instead."
#endif #endif
#include <bits/wordsize.h> #include <bits/timesize.h>
/* On most architectures, padding goes after time fields for 32-bit /* On most architectures, padding goes after time fields for 32-bit
systems and is omitted for 64-bit systems. Some architectures pad systems and is omitted for 64-bit systems. Some architectures pad
@ -29,5 +29,5 @@
used for struct semid64_ds in <asm/sembuf.h>, as glibc does not do used for struct semid64_ds in <asm/sembuf.h>, as glibc does not do
layout conversions for this structure. */ layout conversions for this structure. */
#define __SEM_PAD_AFTER_TIME (__WORDSIZE == 32) #define __SEM_PAD_AFTER_TIME (__TIMESIZE == 32)
#define __SEM_PAD_BEFORE_TIME 0 #define __SEM_PAD_BEFORE_TIME 0

4
sysdeps/unix/sysv/linux/bits/shm-pad.h
View File

@ -20,7 +20,7 @@
# error "Never use <bits/shm-pad.h> directly; include <sys/shm.h> instead." # error "Never use <bits/shm-pad.h> directly; include <sys/shm.h> instead."
#endif #endif
#include <bits/wordsize.h> #include <bits/timesize.h>
/* On most architectures, padding goes after time fields for 32-bit /* On most architectures, padding goes after time fields for 32-bit
systems and is omitted for 64-bit systems. Some architectures pad systems and is omitted for 64-bit systems. Some architectures pad
@ -31,7 +31,7 @@
layout used for struct shmid64_ds in <asm/shmbuf.h>, as glibc does layout used for struct shmid64_ds in <asm/shmbuf.h>, as glibc does
not do layout conversions for this structure. */ not do layout conversions for this structure. */
#define __SHM_PAD_AFTER_TIME (__WORDSIZE == 32) #define __SHM_PAD_AFTER_TIME (__TIMESIZE == 32)
#define __SHM_PAD_BEFORE_TIME 0 #define __SHM_PAD_BEFORE_TIME 0
#define __SHM_SEGSZ_AFTER_TIME 0 #define __SHM_SEGSZ_AFTER_TIME 0
#define __SHM_PAD_BETWEEN_TIME_AND_SEGSZ 0 #define __SHM_PAD_BETWEEN_TIME_AND_SEGSZ 0

4
sysdeps/unix/sysv/linux/hppa/bits/msq-pad.h
View File

@ -20,7 +20,7 @@
# error "Never use <bits/msq-pad.h> directly; include <sys/msg.h> instead." # error "Never use <bits/msq-pad.h> directly; include <sys/msg.h> instead."
#endif #endif
#include <bits/wordsize.h> #include <bits/timesize.h>
#define __MSQ_PAD_AFTER_TIME 0 #define __MSQ_PAD_AFTER_TIME 0
#define __MSQ_PAD_BEFORE_TIME (__WORDSIZE == 32) #define __MSQ_PAD_BEFORE_TIME (__TIMESIZE == 32)

4
sysdeps/unix/sysv/linux/hppa/bits/sem-pad.h
View File

@ -20,7 +20,7 @@
# error "Never use <bits/sem-pad.h> directly; include <sys/sem.h> instead." # error "Never use <bits/sem-pad.h> directly; include <sys/sem.h> instead."
#endif #endif
#include <bits/wordsize.h> #include <bits/timesize.h>
#define __SEM_PAD_AFTER_TIME 0 #define __SEM_PAD_AFTER_TIME 0
#define __SEM_PAD_BEFORE_TIME (__WORDSIZE == 32) #define __SEM_PAD_BEFORE_TIME (__TIMESIZE == 32)

6
sysdeps/unix/sysv/linux/hppa/bits/shm-pad.h
View File

@ -20,9 +20,9 @@
# error "Never use <bits/shm-pad.h> directly; include <sys/shm.h> instead." # error "Never use <bits/shm-pad.h> directly; include <sys/shm.h> instead."
#endif #endif
#include <bits/wordsize.h> #include <bits/timesize.h>
#define __SHM_PAD_AFTER_TIME 0 #define __SHM_PAD_AFTER_TIME 0
#define __SHM_PAD_BEFORE_TIME (__WORDSIZE == 32) #define __SHM_PAD_BEFORE_TIME (__TIMESIZE == 32)
#define __SHM_SEGSZ_AFTER_TIME 1 #define __SHM_SEGSZ_AFTER_TIME 1
#define __SHM_PAD_BETWEEN_TIME_AND_SEGSZ (__WORDSIZE == 32) #define __SHM_PAD_BETWEEN_TIME_AND_SEGSZ (__TIMESIZE == 32)

6
sysdeps/unix/sysv/linux/mips/bits/msq-pad.h
View File

@ -20,12 +20,12 @@
# error "Never use <bits/msq-pad.h> directly; include <sys/msg.h> instead." # error "Never use <bits/msq-pad.h> directly; include <sys/msg.h> instead."
#endif #endif
#include <bits/wordsize.h> #include <bits/timesize.h>
#ifdef __MIPSEL__ #ifdef __MIPSEL__
# define __MSQ_PAD_AFTER_TIME (__WORDSIZE == 32) # define __MSQ_PAD_AFTER_TIME (__TIMESIZE == 32)
# define __MSQ_PAD_BEFORE_TIME 0 # define __MSQ_PAD_BEFORE_TIME 0
#else #else
# define __MSQ_PAD_AFTER_TIME 0 # define __MSQ_PAD_AFTER_TIME 0
# define __MSQ_PAD_BEFORE_TIME (__WORDSIZE == 32) # define __MSQ_PAD_BEFORE_TIME (__TIMESIZE == 32)
#endif #endif

4
sysdeps/unix/sysv/linux/powerpc/bits/msq-pad.h
View File

@ -20,7 +20,7 @@
# error "Never use <bits/msq-pad.h> directly; include <sys/msg.h> instead." # error "Never use <bits/msq-pad.h> directly; include <sys/msg.h> instead."
#endif #endif
#include <bits/wordsize.h> #include <bits/timesize.h>
#define __MSQ_PAD_AFTER_TIME 0 #define __MSQ_PAD_AFTER_TIME 0
#define __MSQ_PAD_BEFORE_TIME (__WORDSIZE == 32) #define __MSQ_PAD_BEFORE_TIME (__TIMESIZE == 32)

4
sysdeps/unix/sysv/linux/powerpc/bits/sem-pad.h
View File

@ -20,7 +20,7 @@
# error "Never use <bits/sem-pad.h> directly; include <sys/sem.h> instead." # error "Never use <bits/sem-pad.h> directly; include <sys/sem.h> instead."
#endif #endif
#include <bits/wordsize.h> #include <bits/timesize.h>
#define __SEM_PAD_AFTER_TIME 0 #define __SEM_PAD_AFTER_TIME 0
#define __SEM_PAD_BEFORE_TIME (__WORDSIZE == 32) #define __SEM_PAD_BEFORE_TIME (__TIMESIZE == 32)

6
sysdeps/unix/sysv/linux/powerpc/bits/shm-pad.h
View File

@ -20,9 +20,9 @@
# error "Never use <bits/shm-pad.h> directly; include <sys/shm.h> instead." # error "Never use <bits/shm-pad.h> directly; include <sys/shm.h> instead."
#endif #endif
#include <bits/wordsize.h> #include <bits/timesize.h>
#define __SHM_PAD_AFTER_TIME 0 #define __SHM_PAD_AFTER_TIME 0
#define __SHM_PAD_BEFORE_TIME (__WORDSIZE == 32) #define __SHM_PAD_BEFORE_TIME (__TIMESIZE == 32)
#define __SHM_SEGSZ_AFTER_TIME 1 #define __SHM_SEGSZ_AFTER_TIME 1
#define __SHM_PAD_BETWEEN_TIME_AND_SEGSZ (__WORDSIZE == 32) #define __SHM_PAD_BETWEEN_TIME_AND_SEGSZ (__TIMESIZE == 32)

4
sysdeps/unix/sysv/linux/sparc/bits/msq-pad.h
View File

@ -20,7 +20,7 @@
# error "Never use <bits/msq-pad.h> directly; include <sys/msg.h> instead." # error "Never use <bits/msq-pad.h> directly; include <sys/msg.h> instead."
#endif #endif
#include <bits/wordsize.h> #include <bits/timesize.h>
#define __MSQ_PAD_AFTER_TIME 0 #define __MSQ_PAD_AFTER_TIME 0
#define __MSQ_PAD_BEFORE_TIME (__WORDSIZE == 32) #define __MSQ_PAD_BEFORE_TIME (__TIMESIZE == 32)

4
sysdeps/unix/sysv/linux/sparc/bits/sem-pad.h
View File

@ -20,7 +20,7 @@
# error "Never use <bits/sem-pad.h> directly; include <sys/sem.h> instead." # error "Never use <bits/sem-pad.h> directly; include <sys/sem.h> instead."
#endif #endif
#include <bits/wordsize.h> #include <bits/timesize.h>
#define __SEM_PAD_AFTER_TIME 0 #define __SEM_PAD_AFTER_TIME 0
#define __SEM_PAD_BEFORE_TIME (__WORDSIZE == 32) #define __SEM_PAD_BEFORE_TIME (__TIMESIZE == 32)

4
sysdeps/unix/sysv/linux/sparc/bits/shm-pad.h
View File

@ -20,9 +20,9 @@
# error "Never use <bits/shm-pad.h> directly; include <sys/shm.h> instead." # error "Never use <bits/shm-pad.h> directly; include <sys/shm.h> instead."
#endif #endif
#include <bits/wordsize.h> #include <bits/timesize.h>
#define __SHM_PAD_AFTER_TIME 0 #define __SHM_PAD_AFTER_TIME 0
#define __SHM_PAD_BEFORE_TIME (__WORDSIZE == 32) #define __SHM_PAD_BEFORE_TIME (__TIMESIZE == 32)
#define __SHM_SEGSZ_AFTER_TIME 1 #define __SHM_SEGSZ_AFTER_TIME 1
#define __SHM_PAD_BETWEEN_TIME_AND_SEGSZ 0 #define __SHM_PAD_BETWEEN_TIME_AND_SEGSZ 0

15
sysdeps/unix/sysv/linux/x86/bits/msq-pad.h → sysdeps/unix/sysv/linux/x86/bits/timesize.h
View File

@ -1,4 +1,4 @@
/* Define where padding goes in struct msqid_ds. x86 version. /* Bit size of the time_t type at glibc build time, x86-64 and x32 case.
Copyright (C) 2018 Free Software Foundation, Inc. Copyright (C) 2018 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
@ -16,13 +16,10 @@
License along with the GNU C Library; if not, see License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */ <http://www.gnu.org/licenses/>. */
#ifndef _SYS_MSG_H #if defined __x86_64__ && defined __ILP32__
# error "Never use <bits/msq-pad.h> directly; include <sys/msg.h> instead." /* For x32, time is 64-bit even though word size is 32-bit. */
#endif # define __TIMESIZE 64
#ifdef __x86_64__
# define __MSQ_PAD_AFTER_TIME 0
#else #else
# define __MSQ_PAD_AFTER_TIME 1 /* For others, time size is word size. */
# define __TIMESIZE __WORDSIZE
#endif #endif
#define __MSQ_PAD_BEFORE_TIME 0