From 7019fbe103165b9b26a9391d5ecd4c7fcb6f3ec9 Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Tue, 7 May 2024 09:11:10 -0400 Subject: sys/user.h: derive __WORDSIZE from __LONG_MAX previously, only a few archs defined it here. this change makes the presence consistent across all archs, and reduces the amount of header duplication (and potential for future inconsistency) between archs. --- arch/s390x/bits/user.h | 3 --- arch/sh/bits/user.h | 3 --- arch/x32/bits/user.h | 3 --- arch/x86_64/bits/user.h | 3 --- include/sys/user.h | 9 +++++++++ 5 files changed, 9 insertions(+), 12 deletions(-) diff --git a/arch/s390x/bits/user.h b/arch/s390x/bits/user.h index ff3f048..47f94f2 100644 --- a/arch/s390x/bits/user.h +++ b/arch/s390x/bits/user.h @@ -1,6 +1,3 @@ -#undef __WORDSIZE -#define __WORDSIZE 64 - typedef union { double d; float f; diff --git a/arch/sh/bits/user.h b/arch/sh/bits/user.h index 07fe843..b6ba16e 100644 --- a/arch/sh/bits/user.h +++ b/arch/sh/bits/user.h @@ -1,6 +1,3 @@ -#undef __WORDSIZE -#define __WORDSIZE 32 - #define REG_REG0 0 #define REG_REG15 15 #define REG_PC 16 diff --git a/arch/x32/bits/user.h b/arch/x32/bits/user.h index eac82a1..b328edf 100644 --- a/arch/x32/bits/user.h +++ b/arch/x32/bits/user.h @@ -1,6 +1,3 @@ -#undef __WORDSIZE -#define __WORDSIZE 32 - typedef struct user_fpregs_struct { uint16_t cwd, swd, ftw, fop; uint64_t rip, rdp; diff --git a/arch/x86_64/bits/user.h b/arch/x86_64/bits/user.h index 4073cc0..b328edf 100644 --- a/arch/x86_64/bits/user.h +++ b/arch/x86_64/bits/user.h @@ -1,6 +1,3 @@ -#undef __WORDSIZE -#define __WORDSIZE 64 - typedef struct user_fpregs_struct { uint16_t cwd, swd, ftw, fop; uint64_t rip, rdp; diff --git a/include/sys/user.h b/include/sys/user.h index 96a0340..78036da 100644 --- a/include/sys/user.h +++ b/include/sys/user.h @@ -8,6 +8,15 @@ extern "C" { #include #include +#include + +#undef __WORDSIZE +#if __LONG_MAX == 0x7fffffffL +#define __WORDSIZE 32 +#else +#define __WORDSIZE 64 +#endif + #include #ifdef __cplusplus -- cgit v1.1