Skip to content

Commit 3814333

Browse files
richfelkerrichfelker
committed
switch all existing 32-bit archs to 64-bit time_t
this commit preserves ABI fully for existing interface boundaries between libc and libc consumers (applications or libraries), by retaining existing symbol names for the legacy 32-bit interfaces and redirecting sources compiled against the new headers to alternate symbol names. this does not necessarily, however, preserve the pairwise ABI of libc consumers with one another; where they use time_t-derived types in their interfaces with one another, it may be necessary to synchronize updates with each other. the intent is that ABI resulting from this commit already be stable and permanent, but it will not be officially so until a release is made. changes to some header-defined types that do not play any role in the ABI between libc and its consumers may still be subject to change. mechanically, the changes made by this commit for each 32-bit arch are as follows: - _REDIR_TIME64 is defined to activate the symbol redirections in public headers - COMPAT_SRC_DIRS is defined in arch.mak to activate build of ABI compat shims to serve as definitions for the original symbol names - time_t and suseconds_t definitions are changed to long long (64-bit) - IPC_STAT definition is changed to add the IPC_TIME64 bit (0x100), triggering conversion of semid_ds, shmid_ds, and msqid_ds split low/high time bits into new time_t members - structs semid_ds, shmid_ds, msqid_ds, and stat are modified to add new 64-bit time_t/timespec members at the end, maintaining existing layout of other members. - socket options (SO_*) and ioctl (sockios) command macros are redefined to use the kernel's "_NEW" values. in addition, on archs where vdso clock_gettime is used, the VDSO_CGT_SYM macro definition in syscall_arch.h is changed to use a new time64 vdso function if available, and a new VDSO_CGT32_SYM macro is added for use as fallback on kernels lacking time64.
1 parent 5127927 commit 3814333

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+420
-217
lines changed

‎arch/arm/arch.mak

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
COMPAT_SRC_DIRS = compat/time32

‎arch/arm/bits/alltypes.h.in

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#define _REDIR_TIME64 1
12
#define _Addr int
23
#define _Int64 long long
34
#define _Reg int
@@ -19,5 +20,5 @@ TYPEDEF double double_t;
1920

2021
TYPEDEF struct { long long __ll; long double __ld; } max_align_t;
2122

22-
TYPEDEF long time_t;
23-
TYPEDEF long suseconds_t;
23+
TYPEDEF long long time_t;
24+
TYPEDEF long long suseconds_t;

‎arch/arm/bits/ioctl_fix.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,7 @@
11
#undef FIOQSIZE
22
#define FIOQSIZE 0x545e
3+
4+
#undef SIOCGSTAMP
5+
#undef SIOCGSTAMPNS
6+
#define SIOCGSTAMP _IOR(0x89, 6, char[16])
7+
#define SIOCGSTAMPNS _IOR(0x89, 7, char[16])

‎arch/arm/bits/ipcstat.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
#define IPC_STAT 2
1+
#define IPC_STAT 0x102

‎arch/arm/bits/msg.h

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
11
struct msqid_ds {
22
struct ipc_perm msg_perm;
3-
time_t msg_stime;
4-
int __unused1;
5-
time_t msg_rtime;
6-
int __unused2;
7-
time_t msg_ctime;
8-
int __unused3;
3+
unsigned long __msg_stime_lo;
4+
unsigned long __msg_stime_hi;
5+
unsigned long __msg_rtime_lo;
6+
unsigned long __msg_rtime_hi;
7+
unsigned long __msg_ctime_lo;
8+
unsigned long __msg_ctime_hi;
99
unsigned long msg_cbytes;
1010
msgqnum_t msg_qnum;
1111
msglen_t msg_qbytes;
1212
pid_t msg_lspid;
1313
pid_t msg_lrpid;
1414
unsigned long __unused[2];
15+
time_t msg_stime;
16+
time_t msg_rtime;
17+
time_t msg_ctime;
1518
};

‎arch/arm/bits/sem.h

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
struct semid_ds {
22
struct ipc_perm sem_perm;
3-
time_t sem_otime;
4-
long __unused1;
5-
time_t sem_ctime;
6-
long __unused2;
3+
unsigned long __sem_otime_lo;
4+
unsigned long __sem_otime_hi;
5+
unsigned long __sem_ctime_lo;
6+
unsigned long __sem_ctime_hi;
77
#if __BYTE_ORDER == __LITTLE_ENDIAN
88
unsigned short sem_nsems;
99
char __sem_nsems_pad[sizeof(long)-sizeof(short)];
@@ -13,4 +13,6 @@ struct semid_ds {
1313
#endif
1414
long __unused3;
1515
long __unused4;
16+
time_t sem_otime;
17+
time_t sem_ctime;
1618
};

‎arch/arm/bits/shm.h

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,21 @@
33
struct shmid_ds {
44
struct ipc_perm shm_perm;
55
size_t shm_segsz;
6-
time_t shm_atime;
7-
int __unused1;
8-
time_t shm_dtime;
9-
int __unused2;
10-
time_t shm_ctime;
11-
int __unused3;
6+
unsigned long __shm_atime_lo;
7+
unsigned long __shm_atime_hi;
8+
unsigned long __shm_dtime_lo;
9+
unsigned long __shm_dtime_hi;
10+
unsigned long __shm_ctime_lo;
11+
unsigned long __shm_ctime_hi;
1212
pid_t shm_cpid;
1313
pid_t shm_lpid;
1414
unsigned long shm_nattch;
1515
unsigned long __pad1;
1616
unsigned long __pad2;
17+
unsigned long __pad3;
18+
time_t shm_atime;
19+
time_t shm_dtime;
20+
time_t shm_ctime;
1721
};
1822

1923
struct shminfo {

‎arch/arm/bits/socket.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#define SO_TIMESTAMP 63
2+
#define SO_TIMESTAMPNS 64
3+
#define SO_TIMESTAMPING 65
4+
#define SO_RCVTIMEO 66
5+
#define SO_SNDTIMEO 67

‎arch/arm/bits/stat.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,12 @@ struct stat {
1414
off_t st_size;
1515
blksize_t st_blksize;
1616
blkcnt_t st_blocks;
17+
struct {
18+
long tv_sec;
19+
long tv_nsec;
20+
} __st_atim32, __st_mtim32, __st_ctim32;
21+
ino_t st_ino;
1722
struct timespec st_atim;
1823
struct timespec st_mtim;
1924
struct timespec st_ctim;
20-
ino_t st_ino;
2125
};

‎arch/arm/syscall_arch.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,9 @@ static inline long __syscall6(long n, long a, long b, long c, long d, long e, lo
9999
}
100100

101101
#define VDSO_USEFUL
102-
#define VDSO_CGT_SYM "__vdso_clock_gettime"
102+
#define VDSO_CGT32_SYM "__vdso_clock_gettime"
103+
#define VDSO_CGT32_VER "LINUX_2.6"
104+
#define VDSO_CGT_SYM "__vdso_clock_gettime64"
103105
#define VDSO_CGT_VER "LINUX_2.6"
104106

105107
#define SYSCALL_FADVISE_6_ARG

‎arch/i386/arch.mak

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
COMPAT_SRC_DIRS = compat/time32

‎arch/i386/bits/alltypes.h.in

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#define _REDIR_TIME64 1
12
#define _Addr int
23
#define _Int64 long long
34
#define _Reg int
@@ -29,5 +30,5 @@ TYPEDEF struct { __attribute__((__aligned__(8))) long long __ll; long double __l
2930
TYPEDEF struct { alignas(8) long long __ll; long double __ld; } max_align_t;
3031
#endif
3132

32-
TYPEDEF long time_t;
33-
TYPEDEF long suseconds_t;
33+
TYPEDEF long long time_t;
34+
TYPEDEF long long suseconds_t;

‎arch/i386/bits/ioctl_fix.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#undef SIOCGSTAMP
2+
#undef SIOCGSTAMPNS
3+
#define SIOCGSTAMP _IOR(0x89, 6, char[16])
4+
#define SIOCGSTAMPNS _IOR(0x89, 7, char[16])

‎arch/i386/bits/ipcstat.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
#define IPC_STAT 2
1+
#define IPC_STAT 0x102

‎arch/i386/bits/msg.h

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
11
struct msqid_ds {
22
struct ipc_perm msg_perm;
3-
time_t msg_stime;
4-
int __unused1;
5-
time_t msg_rtime;
6-
int __unused2;
7-
time_t msg_ctime;
8-
int __unused3;
3+
unsigned long __msg_stime_lo;
4+
unsigned long __msg_stime_hi;
5+
unsigned long __msg_rtime_lo;
6+
unsigned long __msg_rtime_hi;
7+
unsigned long __msg_ctime_lo;
8+
unsigned long __msg_ctime_hi;
99
unsigned long msg_cbytes;
1010
msgqnum_t msg_qnum;
1111
msglen_t msg_qbytes;
1212
pid_t msg_lspid;
1313
pid_t msg_lrpid;
1414
unsigned long __unused[2];
15+
time_t msg_stime;
16+
time_t msg_rtime;
17+
time_t msg_ctime;
1518
};

‎arch/i386/bits/sem.h

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
struct semid_ds {
22
struct ipc_perm sem_perm;
3-
time_t sem_otime;
4-
long __unused1;
5-
time_t sem_ctime;
6-
long __unused2;
3+
unsigned long __sem_otime_lo;
4+
unsigned long __sem_otime_hi;
5+
unsigned long __sem_ctime_lo;
6+
unsigned long __sem_ctime_hi;
77
unsigned short sem_nsems;
88
char __sem_nsems_pad[sizeof(long)-sizeof(short)];
99
long __unused3;
1010
long __unused4;
11+
time_t sem_otime;
12+
time_t sem_ctime;
1113
};

‎arch/i386/bits/shm.h

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,21 @@
33
struct shmid_ds {
44
struct ipc_perm shm_perm;
55
size_t shm_segsz;
6-
time_t shm_atime;
7-
int __unused1;
8-
time_t shm_dtime;
9-
int __unused2;
10-
time_t shm_ctime;
11-
int __unused3;
6+
unsigned long __shm_atime_lo;
7+
unsigned long __shm_atime_hi;
8+
unsigned long __shm_dtime_lo;
9+
unsigned long __shm_dtime_hi;
10+
unsigned long __shm_ctime_lo;
11+
unsigned long __shm_ctime_hi;
1212
pid_t shm_cpid;
1313
pid_t shm_lpid;
1414
unsigned long shm_nattch;
1515
unsigned long __pad1;
1616
unsigned long __pad2;
17+
unsigned long __pad3;
18+
time_t shm_atime;
19+
time_t shm_dtime;
20+
time_t shm_ctime;
1721
};
1822

1923
struct shminfo {

‎arch/i386/bits/socket.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#define SO_TIMESTAMP 63
2+
#define SO_TIMESTAMPNS 64
3+
#define SO_TIMESTAMPING 65
4+
#define SO_RCVTIMEO 66
5+
#define SO_SNDTIMEO 67

‎arch/i386/bits/stat.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,12 @@ struct stat {
1414
off_t st_size;
1515
blksize_t st_blksize;
1616
blkcnt_t st_blocks;
17+
struct {
18+
long tv_sec;
19+
long tv_nsec;
20+
} __st_atim32, __st_mtim32, __st_ctim32;
21+
ino_t st_ino;
1722
struct timespec st_atim;
1823
struct timespec st_mtim;
1924
struct timespec st_ctim;
20-
ino_t st_ino;
2125
};

‎arch/i386/syscall_arch.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,9 @@ static inline long __syscall6(long n, long a1, long a2, long a3, long a4, long a
8383
}
8484

8585
#define VDSO_USEFUL
86-
#define VDSO_CGT_SYM "__vdso_clock_gettime"
86+
#define VDSO_CGT32_SYM "__vdso_clock_gettime"
87+
#define VDSO_CGT32_VER "LINUX_2.6"
88+
#define VDSO_CGT_SYM "__vdso_clock_gettime64"
8789
#define VDSO_CGT_VER "LINUX_2.6"
8890

8991
#define SYSCALL_USE_SOCKETCALL

‎arch/m68k/arch.mak

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
COMPAT_SRC_DIRS = compat/time32

‎arch/m68k/bits/alltypes.h.in

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#define _REDIR_TIME64 1
12
#define _Addr int
23
#define _Int64 long long
34
#define _Reg int
@@ -23,5 +24,5 @@ TYPEDEF long double double_t;
2324

2425
TYPEDEF struct { long long __ll; long double __ld; } max_align_t;
2526

26-
TYPEDEF long time_t;
27-
TYPEDEF long suseconds_t;
27+
TYPEDEF long long time_t;
28+
TYPEDEF long long suseconds_t;

‎arch/m68k/bits/ioctl_fix.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#undef SIOCGSTAMP
2+
#undef SIOCGSTAMPNS
3+
#define SIOCGSTAMP _IOR(0x89, 6, char[16])
4+
#define SIOCGSTAMPNS _IOR(0x89, 7, char[16])

‎arch/m68k/bits/ipcstat.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
#define IPC_STAT 2
1+
#define IPC_STAT 0x102

‎arch/m68k/bits/msg.h

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
11
struct msqid_ds {
22
struct ipc_perm msg_perm;
3-
time_t msg_stime;
4-
int __unused1;
5-
time_t msg_rtime;
6-
int __unused2;
7-
time_t msg_ctime;
8-
int __unused3;
3+
unsigned long __msg_stime_lo;
4+
unsigned long __msg_stime_hi;
5+
unsigned long __msg_rtime_lo;
6+
unsigned long __msg_rtime_hi;
7+
unsigned long __msg_ctime_lo;
8+
unsigned long __msg_ctime_hi;
99
unsigned long msg_cbytes;
1010
msgqnum_t msg_qnum;
1111
msglen_t msg_qbytes;
1212
pid_t msg_lspid;
1313
pid_t msg_lrpid;
1414
unsigned long __unused[2];
15+
time_t msg_stime;
16+
time_t msg_rtime;
17+
time_t msg_ctime;
1518
};

‎arch/m68k/bits/sem.h

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
struct semid_ds {
22
struct ipc_perm sem_perm;
3-
time_t sem_otime;
4-
long __unused1;
5-
time_t sem_ctime;
6-
long __unused2;
3+
unsigned long __sem_otime_lo;
4+
unsigned long __sem_otime_hi;
5+
unsigned long __sem_ctime_lo;
6+
unsigned long __sem_ctime_hi;
77
char __sem_nsems_pad[sizeof(long)-sizeof(short)];
88
unsigned short sem_nsems;
99
long __unused3;
1010
long __unused4;
11+
time_t sem_otime;
12+
time_t sem_ctime;
1113
};

‎arch/m68k/bits/shm.h

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,21 @@
33
struct shmid_ds {
44
struct ipc_perm shm_perm;
55
size_t shm_segsz;
6-
time_t shm_atime;
7-
int __unused1;
8-
time_t shm_dtime;
9-
int __unused2;
10-
time_t shm_ctime;
11-
int __unused3;
6+
unsigned long __shm_atime_lo;
7+
unsigned long __shm_atime_hi;
8+
unsigned long __shm_dtime_lo;
9+
unsigned long __shm_dtime_hi;
10+
unsigned long __shm_ctime_lo;
11+
unsigned long __shm_ctime_hi;
1212
pid_t shm_cpid;
1313
pid_t shm_lpid;
1414
unsigned long shm_nattch;
1515
unsigned long __pad1;
1616
unsigned long __pad2;
17+
unsigned long __pad3;
18+
time_t shm_atime;
19+
time_t shm_dtime;
20+
time_t shm_ctime;
1721
};
1822

1923
struct shminfo {

‎arch/m68k/bits/socket.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#define SO_TIMESTAMP 63
2+
#define SO_TIMESTAMPNS 64
3+
#define SO_TIMESTAMPING 65
4+
#define SO_RCVTIMEO 66
5+
#define SO_SNDTIMEO 67

‎arch/m68k/bits/stat.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,12 @@ struct stat {
1414
off_t st_size;
1515
blksize_t st_blksize;
1616
blkcnt_t st_blocks;
17+
struct {
18+
long tv_sec;
19+
long tv_nsec;
20+
} __st_atim32, __st_mtim32, __st_ctim32;
21+
ino_t st_ino;
1722
struct timespec st_atim;
1823
struct timespec st_mtim;
1924
struct timespec st_ctim;
20-
ino_t st_ino;
2125
};

‎arch/microblaze/arch.mak

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
COMPAT_SRC_DIRS = compat/time32

‎arch/microblaze/bits/alltypes.h.in

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#define _REDIR_TIME64 1
12
#define _Addr int
23
#define _Int64 long long
34
#define _Reg int
@@ -19,5 +20,5 @@ TYPEDEF double double_t;
1920

2021
TYPEDEF struct { long long __ll; long double __ld; } max_align_t;
2122

22-
TYPEDEF long time_t;
23-
TYPEDEF long suseconds_t;
23+
TYPEDEF long long time_t;
24+
TYPEDEF long long suseconds_t;

‎arch/microblaze/bits/ioctl_fix.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#undef SIOCGSTAMP
2+
#undef SIOCGSTAMPNS
3+
#define SIOCGSTAMP _IOR(0x89, 6, char[16])
4+
#define SIOCGSTAMPNS _IOR(0x89, 7, char[16])

‎arch/microblaze/bits/ipcstat.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
#define IPC_STAT 2
1+
#define IPC_STAT 0x102

0 commit comments

Comments
 (0)