From 5229071ba1e6c5dbba277e50306d2ad38f417947 Mon Sep 17 00:00:00 2001
From: Brooks Davis <brooks@one-eyed-alien.net>
Date: Fri, 28 Oct 2022 00:58:41 +0100
Subject: [PATCH] Improve RISC-V support

Check __riscv_xlen == 64 rather than _LP64 and define _LP64 if missing.

Reviewed-by: Richard Yao <richard.yao@alumni.stonybrook.edu>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by:	Brooks Davis <brooks.davis@sri.com>
Closes #14128
---
 include/os/linux/spl/sys/isa_defs.h | 6 +++++-
 lib/libspl/include/sys/isa_defs.h   | 6 +++++-
 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 a032aae916..ee3b746079 100644
--- a/include/os/linux/spl/sys/isa_defs.h
+++ b/include/os/linux/spl/sys/isa_defs.h
@@ -206,9 +206,13 @@
  * RISC-V arch specific defines
  * only RV64G (including atomic) LP64 is supported yet
  */
-#elif defined(__riscv) && defined(_LP64) && _LP64 && \
+#elif defined(__riscv) && defined(__riscv_xlen) && __riscv_xlen == 64 && \
 	defined(__riscv_atomic) && __riscv_atomic
 
+#if !defined(_LP64)
+#define	_LP64 1
+#endif
+
 #ifndef	__riscv__
 #define	__riscv__
 #endif
diff --git a/lib/libspl/include/sys/isa_defs.h b/lib/libspl/include/sys/isa_defs.h
index 756adff15a..114cca4f15 100644
--- a/lib/libspl/include/sys/isa_defs.h
+++ b/lib/libspl/include/sys/isa_defs.h
@@ -227,9 +227,13 @@ extern "C" {
  * RISC-V arch specific defines
  * only RV64G (including atomic) LP64 is supported yet
  */
-#elif defined(__riscv) && defined(_LP64) && _LP64 && \
+#elif defined(__riscv) && defined(__riscv_xlen) && __riscv_xlen == 64 && \
 	defined(__riscv_atomic) && __riscv_atomic
 
+#if !defined(_LP64)
+#define	_LP64 1
+#endif
+
 #ifndef	__riscv__
 #define	__riscv__
 #endif