diff options
Diffstat (limited to 'sysdeps/unix/sysv/linux/x86')
| -rw-r--r-- | sysdeps/unix/sysv/linux/x86/bits/shm-pad.h | 30 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/x86/bits/timesize.h (renamed from sysdeps/unix/sysv/linux/x86/bits/msq-pad.h) | 15 |
2 files changed, 6 insertions, 39 deletions
diff --git a/sysdeps/unix/sysv/linux/x86/bits/shm-pad.h b/sysdeps/unix/sysv/linux/x86/bits/shm-pad.h deleted file mode 100644 index 277a70fe6c..0000000000 --- a/sysdeps/unix/sysv/linux/x86/bits/shm-pad.h +++ /dev/null @@ -1,30 +0,0 @@ -/* Define where padding goes in struct shmid_ds. x86 version. - Copyright (C) 2018 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 - <http://www.gnu.org/licenses/>. */ - -#ifndef _SYS_SHM_H -# error "Never use <bits/shm-pad.h> directly; include <sys/shm.h> instead." -#endif - -#ifdef __x86_64__ -# define __SHM_PAD_AFTER_TIME 0 -#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 diff --git a/sysdeps/unix/sysv/linux/x86/bits/msq-pad.h b/sysdeps/unix/sysv/linux/x86/bits/timesize.h index 5d46956c77..8b88ab84b0 100644 --- a/sysdeps/unix/sysv/linux/x86/bits/msq-pad.h +++ b/sysdeps/unix/sysv/linux/x86/bits/timesize.h @@ -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. This file is part of the GNU C Library. @@ -16,13 +16,10 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#ifndef _SYS_MSG_H -# error "Never use <bits/msq-pad.h> directly; include <sys/msg.h> instead." -#endif - -#ifdef __x86_64__ -# define __MSQ_PAD_AFTER_TIME 0 +#if defined __x86_64__ && defined __ILP32__ +/* For x32, time is 64-bit even though word size is 32-bit. */ +# define __TIMESIZE 64 #else -# define __MSQ_PAD_AFTER_TIME 1 +/* For others, time size is word size. */ +# define __TIMESIZE __WORDSIZE #endif -#define __MSQ_PAD_BEFORE_TIME 0 |