1
0
mirror of https://sourceware.org/git/glibc.git synced 2025-08-07 06:43:00 +03:00

Y2038: provide size of default time_t for target architecture

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

View File

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

View File

@@ -20,7 +20,7 @@
# error "Never use <bits/sem-pad.h> directly; include <sys/sem.h> instead."
#endif
#include <bits/wordsize.h>
#include <bits/timesize.h>
/* On most architectures, padding goes after time fields for 32-bit
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
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

View File

@@ -20,7 +20,7 @@
# error "Never use <bits/shm-pad.h> directly; include <sys/shm.h> instead."
#endif
#include <bits/wordsize.h>
#include <bits/timesize.h>
/* On most architectures, padding goes after time fields for 32-bit
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
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_SEGSZ_AFTER_TIME 0
#define __SHM_PAD_BETWEEN_TIME_AND_SEGSZ 0