sys/reg.h: derive __WORDSIZE from __LONG_MAX

this removes an otherwise-unnecessary bits header from most archs, replacing it with an empty generic version.
2 years ago · e709a6f07a
19 changed files with 9 additions and 42 deletions
--- a/arch/aarch64/bits/reg.h
+++ b/arch/aarch64/bits/reg.h
@ -1,2 +0,0 @@
-#undef __WORDSIZE
-#define __WORDSIZE 64
--- a/arch/arm/bits/reg.h
+++ b/arch/arm/bits/reg.h
@ -1,3 +0,0 @@
-#undef __WORDSIZE
-#define __WORDSIZE 32
-/* FIXME */
--- a/arch/generic/bits/reg.h
+++ b/arch/generic/bits/reg.h
--- a/arch/i386/bits/reg.h
+++ b/arch/i386/bits/reg.h
@ -1,5 +1,3 @@
-#undef __WORDSIZE
-#define __WORDSIZE 32
 #define EBX 0
 #define ECX 1
 #define EDX 2
--- a/arch/loongarch64/bits/reg.h
+++ b/arch/loongarch64/bits/reg.h
@ -1,2 +0,0 @@
-#undef __WORDSIZE
-#define __WORDSIZE 64
--- a/arch/m68k/bits/reg.h
+++ b/arch/m68k/bits/reg.h
@ -1,5 +1,3 @@
-#undef __WORDSIZE
-#define __WORDSIZE 32
 #define PT_D1 0
 #define PT_D2 1
 #define PT_D3 2
--- a/arch/microblaze/bits/reg.h
+++ b/arch/microblaze/bits/reg.h
@ -1,3 +0,0 @@
-#undef __WORDSIZE
-#define __WORDSIZE 32
-/* FIXME */
--- a/arch/mips/bits/reg.h
+++ b/arch/mips/bits/reg.h
@ -1,6 +1,3 @@
-#undef __WORDSIZE
-#define __WORDSIZE 32
-
 #define EF_R0 6
 #define EF_R1 7
 #define EF_R2 8
--- a/arch/mips64/bits/reg.h
+++ b/arch/mips64/bits/reg.h
@ -1,6 +1,3 @@
-#undef __WORDSIZE
-#define __WORDSIZE 64
-
 #define EF_R0 0
 #define EF_R1 1
 #define EF_R2 2
--- a/arch/mipsn32/bits/reg.h
+++ b/arch/mipsn32/bits/reg.h
@ -1,6 +1,3 @@
-#undef __WORDSIZE
-#define __WORDSIZE 64
-
 #define EF_R0 0
 #define EF_R1 1
 #define EF_R2 2
--- a/arch/or1k/bits/reg.h
+++ b/arch/or1k/bits/reg.h
@ -1,3 +0,0 @@
-#undef __WORDSIZE
-#define __WORDSIZE 32
-/* FIXME */
--- a/arch/powerpc/bits/reg.h
+++ b/arch/powerpc/bits/reg.h
@ -1,3 +0,0 @@
-#undef __WORDSIZE
-#define __WORDSIZE 32
-/* FIXME */
--- a/arch/powerpc64/bits/reg.h
+++ b/arch/powerpc64/bits/reg.h
@ -1,3 +0,0 @@
-#undef __WORDSIZE
-#define __WORDSIZE 64
-/* FIXME */
--- a/arch/riscv32/bits/reg.h
+++ b/arch/riscv32/bits/reg.h
@ -1,2 +0,0 @@
-#undef __WORDSIZE
-#define __WORDSIZE 32
--- a/arch/riscv64/bits/reg.h
+++ b/arch/riscv64/bits/reg.h
@ -1,2 +0,0 @@
-#undef __WORDSIZE
-#define __WORDSIZE 64
--- a/arch/s390x/bits/reg.h
+++ b/arch/s390x/bits/reg.h
@ -1,2 +0,0 @@
-#undef __WORDSIZE
-#define __WORDSIZE 64
--- a/arch/x32/bits/reg.h
+++ b/arch/x32/bits/reg.h
@ -1,5 +1,3 @@
-#undef __WORDSIZE
-#define __WORDSIZE 32
 #define R15    0
 #define R14    1
 #define R13    2
--- a/arch/x86_64/bits/reg.h
+++ b/arch/x86_64/bits/reg.h
@ -1,5 +1,3 @@
-#undef __WORDSIZE
-#define __WORDSIZE 64
 #define R15    0
 #define R14    1
 #define R13    2
--- a/include/sys/reg.h
+++ b/include/sys/reg.h
@ -4,6 +4,15 @@
 #include <limits.h>
 #include <unistd.h>

+#include <bits/alltype.h>
+
+#undef __WORDSIZE
+#if __LONG_MAX == 0x7fffffffL
+#define __WORDSIZE 32
+#else
+#define __WORDSIZE 64
+#endif
+
 #include <bits/reg.h>

 #endif