Add detection for RISCV compilers

2 files changed, 12 insertions, 1 deletions

diff --git a/configure.py b/configure.py
index b1a988bdb..55bbe5d27 100755
--- a/configure.py
+++ b/configure.py
@@ -2950,7 +2950,10 @@ def check_compiler_arch(options, ccinfo, archinfo, source_paths):
     abi_flags = ccinfo.mach_abi_link_flags(options).split(' ')
     cc_output = run_compiler_preproc(options, ccinfo, detect_version_source, 'UNKNOWN', abi_flags).lower()
 
-    if cc_output in ['', 'unknown']:
+    if cc_output == '':
+        cc_output = run_compiler_preproc(options, ccinfo, detect_version_source, 'UNKNOWN').lower()
+
+    if cc_output == 'unknown':
         logging.warning('Unable to detect target architecture via compiler macro checks')
         return None
 
diff --git a/src/build-data/detect_arch.cpp b/src/build-data/detect_arch.cpp
index f5e6ecd58..028e39b3b 100644
--- a/src/build-data/detect_arch.cpp
+++ b/src/build-data/detect_arch.cpp
@@ -57,6 +57,14 @@
 #elif defined(__s390__)
   S390
 
+#elif defined(__riscv)
+
+  #if defined(__LP64__)
+     RISCV64
+  #else
+     RISCV32
+  #endif
+
 #else
   UNKNOWN