diff --git a/AUTHORS b/AUTHORS
index 63d90c271d..0a8aa33b3b 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -92,6 +92,7 @@ Miguel Paris <mparisdiaz@gmail.com>
 Raman Budny <budnyjj@gmail.com>
 Stephan Hartmann <stha09@googlemail.com>
 Lennart Grahl <lennart.grahl@gmail.com>
+Zhaofeng Li <hello@zhaofeng.li>
 
 &yet LLC <*@andyet.com>
 8x8 Inc. <*@sip-communicator.org>
diff --git a/rtc_base/system/arch.h b/rtc_base/system/arch.h
index be2367b85f..42eb46e71e 100644
--- a/rtc_base/system/arch.h
+++ b/rtc_base/system/arch.h
@@ -67,12 +67,13 @@
 #define WEBRTC_ARCH_32_BITS
 #endif
 #define WEBRTC_ARCH_BIG_ENDIAN
-#elif defined(__riscv) && __riscv_xlen == 64
+#elif defined(__riscv) || defined(__riscv__)
+#define WEBRTC_ARCH_LITTLE_ENDIAN
+#if __riscv_xlen == 64
 #define WEBRTC_ARCH_64_BITS
-#define WEBRTC_ARCH_LITTLE_ENDIAN
-#elif defined(__riscv) && __riscv_xlen == 32
+#else
 #define WEBRTC_ARCH_32_BITS
-#define WEBRTC_ARCH_LITTLE_ENDIAN
+#endif
 #elif defined(__pnacl__)
 #define WEBRTC_ARCH_32_BITS
 #define WEBRTC_ARCH_LITTLE_ENDIAN