diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
index 5ea2f2130abb7d..8c015edcd4a77e 100644
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -1073,6 +1073,13 @@ config("compiler_cpu_abi") {
     } else if (current_cpu == "s390x") {
       cflags += [ "-m64" ]
       ldflags += [ "-m64" ]
+    } else if (current_cpu == "riscv" || current_cpu == "riscv64") {
+      if (riscv_arch != "") {
+        cflags += [ "-march=" + riscv_arch ]
+      }
+      if (riscv_abi != "") {
+        cflags += [ "-mabi=" + riscv_abi ]
+      }
     }
   }