diff --git a/include/openssl/base.h b/include/openssl/base.h
index 1e7da87..7afcc4f 100644
--- a/include/openssl/base.h
+++ b/include/openssl/base.h
@@ -107,6 +107,7 @@
 #define OPENSSL_MIPS64
 #elif defined(__riscv) && __SIZEOF_POINTER__ == 8
 #define OPENSSL_64_BIT
+#define OPENSSL_RISCV64
 #elif defined(__riscv) && __SIZEOF_POINTER__ == 4
 #define OPENSSL_32_BIT
 #elif defined(__pnacl__)
@@ -118,9 +119,6 @@
 #define OPENSSL_32_BIT
 #elif defined(__myriad2__)
 #define OPENSSL_32_BIT
-#elif defined(__riscv) && __riscv_xlen == 64
-#define OPENSSL_64_BIT
-#define OPENSSL_RISCV64
 #else
 // Note BoringSSL only supports standard 32-bit and 64-bit two's-complement,
 // little-endian architectures. Functions will not produce the correct answer