aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/os/linux/spl/sys/isa_defs.h6
-rw-r--r--lib/libspl/include/sys/isa_defs.h6
2 files changed, 10 insertions, 2 deletions
diff --git a/include/os/linux/spl/sys/isa_defs.h b/include/os/linux/spl/sys/isa_defs.h
index e36afef31..c19943b85 100644
--- a/include/os/linux/spl/sys/isa_defs.h
+++ b/include/os/linux/spl/sys/isa_defs.h
@@ -40,9 +40,13 @@
#define __x86
#endif
+#if defined(_ILP32)
+/* x32-specific defines; careful to *not* define _LP64 here */
+#else
#if !defined(_LP64)
#define _LP64
#endif
+#endif
#define _ALIGNMENT_REQUIRED 1
@@ -216,7 +220,7 @@
#else
/*
* Currently supported:
- * x86_64, i386, arm, powerpc, s390, sparc, mips, and RV64G
+ * x86_64, x32, i386, arm, powerpc, s390, sparc, mips, and RV64G
*/
#error "Unsupported ISA type"
#endif
diff --git a/lib/libspl/include/sys/isa_defs.h b/lib/libspl/include/sys/isa_defs.h
index 18a41fef9..4d2d909f3 100644
--- a/lib/libspl/include/sys/isa_defs.h
+++ b/lib/libspl/include/sys/isa_defs.h
@@ -46,9 +46,13 @@ extern "C" {
#define __x86
#endif
+#if defined(_ILP32)
+/* x32-specific defines; careful to *not* define _LP64 here */
+#else
#if !defined(_LP64)
#define _LP64
#endif
+#endif
#if !defined(_LITTLE_ENDIAN)
#define _LITTLE_ENDIAN
@@ -214,7 +218,7 @@ extern "C" {
#else
/*
* Currently supported:
- * x86_64, i386, arm, powerpc, s390, sparc, mips, and RV64G
+ * x86_64, x32, i386, arm, powerpc, s390, sparc, mips, and RV64G
*/
#error "Unsupported ISA type"
#endif