[v2,2/2] time: Add padding for the timespec if required
Commit Message
If we are running on a 32-bit system with a 64-bit time_t we need to
ensure there is padding around the tv_nsec variable. This is requried as
the timespec is #defined to the __timespec64 struct.
2019-09-20 Alistair Francis <alistair.francis@wdc.com>
* time/bits/types/struct_timespec.h: Add padding for the timespec if
required.
---
v2:
- Fix style issues
time/bits/types/struct_timespec.h | 13 +++++++++++++
1 file changed, 13 insertions(+)
Comments
On Fri, 27 Sep 2019, Alistair Francis wrote:
> If we are running on a 32-bit system with a 64-bit time_t we need to
> ensure there is padding around the tv_nsec variable. This is requried as
> the timespec is #defined to the __timespec64 struct.
>
> 2019-09-20 Alistair Francis <alistair.francis@wdc.com>
>
> * time/bits/types/struct_timespec.h: Add padding for the timespec if
> required.
> ---
> v2:
> - Fix style issues
This patch is OK once the endian changes are in.
@@ -3,13 +3,26 @@
#define _STRUCT_TIMESPEC 1
#include <bits/types.h>
+#include <bits/endian.h>
/* POSIX.1b structure for a time value. This is like a `struct timeval' but
has nanoseconds instead of microseconds. */
struct timespec
{
__time_t tv_sec; /* Seconds. */
+#if __WORDSIZE == 64 \
+ || (defined __SYSCALL_WORDSIZE && __SYSCALL_WORDSIZE == 64) \
+ || __TIMESIZE == 32
__syscall_slong_t tv_nsec; /* Nanoseconds. */
+#else
+# if __BYTE_ORDER == __BIG_ENDIAN
+ int: 32; /* Padding. */
+ long int tv_nsec; /* Nanoseconds. */
+# else
+ long int tv_nsec; /* Nanoseconds. */
+ int: 32; /* Padding. */
+# endif
+#endif
};
#endif