aboutsummaryrefslogtreecommitdiff
path: root/original/uapi/asm-generic/bitsperlong.h
diff options
context:
space:
mode:
Diffstat (limited to 'original/uapi/asm-generic/bitsperlong.h')
-rw-r--r--original/uapi/asm-generic/bitsperlong.h13
1 files changed, 12 insertions, 1 deletions
diff --git a/original/uapi/asm-generic/bitsperlong.h b/original/uapi/asm-generic/bitsperlong.h
index 693d9a4..352cb81 100644
--- a/original/uapi/asm-generic/bitsperlong.h
+++ b/original/uapi/asm-generic/bitsperlong.h
@@ -2,6 +2,17 @@
#ifndef _UAPI__ASM_GENERIC_BITS_PER_LONG
#define _UAPI__ASM_GENERIC_BITS_PER_LONG
+#ifndef __BITS_PER_LONG
+/*
+ * In order to keep safe and avoid regression, only unify uapi
+ * bitsperlong.h for some archs which are using newer toolchains
+ * that have the definitions of __CHAR_BIT__ and __SIZEOF_LONG__.
+ * See the following link for more info:
+ * https://lore.kernel.org/linux-arch/b9624545-2c80-49a1-ac3c-39264a591f7b@app.fastmail.com/
+ */
+#if defined(__CHAR_BIT__) && defined(__SIZEOF_LONG__)
+#define __BITS_PER_LONG (__CHAR_BIT__ * __SIZEOF_LONG__)
+#else
/*
* There seems to be no way of detecting this automatically from user
* space, so 64 bit architectures should override this in their
@@ -9,8 +20,8 @@
* both 32 and 64 bit user space must not rely on CONFIG_64BIT
* to decide it, but rather check a compiler provided macro.
*/
-#ifndef __BITS_PER_LONG
#define __BITS_PER_LONG 32
#endif
+#endif
#endif /* _UAPI__ASM_GENERIC_BITS_PER_LONG */