Index: sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h
--- sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h.orig
+++ sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h
@@ -388,7 +388,7 @@ extern "C" {
 #define	_DONT_USE_1275_GENERIC_NAMES
 #define	_HAVE_CPUID_INSN
 
-#elif defined(__riscv__)
+#elif defined(__riscv__) || defined(__riscv)
 
 /*
  * Define the appropriate "processor characteristics"
@@ -576,6 +576,10 @@ extern "C" {
  */
 #if defined(__sparcv8) && defined(__sparcv9)
 #error	"SPARC Versions 8 and 9 are mutually exclusive choices"
+#endif
+
+#if !defined(__sparcv9) && defined(__sparc__) && defined(__arch64__)
+#define __sparcv9
 #endif
 
 /*
