diff --git a/js/src/jit/moz.build b/js/src/jit/moz.build
index 1422f1158fd1..85d2058a0c08 100644
--- a/js/src/jit/moz.build
+++ b/js/src/jit/moz.build
@@ -230,7 +230,7 @@ elif CONFIG["JS_CODEGEN_RISCV64"]:
     UNIFIED_SOURCES += [
         "riscv64/Architecture-riscv64.cpp",
         "riscv64/Assembler-riscv64.cpp",
-        "riscv64/AssemblerMatInt.cpp.cpp",
+        "riscv64/AssemblerMatInt.cpp",
         "riscv64/CodeGenerator-riscv64.cpp",
         "riscv64/constant/Base-constant-riscv.cpp",
         "riscv64/disasm/Disasm-riscv64.cpp",
diff --git a/js/src/jit/riscv64/MacroAssembler-riscv64.h b/js/src/jit/riscv64/MacroAssembler-riscv64.h
index b5069d58d8c7..f0e567ece712 100644
--- a/js/src/jit/riscv64/MacroAssembler-riscv64.h
+++ b/js/src/jit/riscv64/MacroAssembler-riscv64.h
@@ -993,6 +993,10 @@ class MacroAssemblerRiscv64Compat : public MacroAssemblerRiscv64 {
     push(scratch);
   }
   void pushValue(const Address& addr);
+  void pushValue(const BaseIndex& addr, Register scratch) {
+    loadValue(addr, ValueOperand(scratch));
+    pushValue(ValueOperand(scratch));
+  }
 
   void handleFailureWithHandlerTail(Label* profilerExitTail,
                                     Label* bailoutTail);
diff --git a/js/src/jsapi-tests/testJitMacroAssembler.cpp b/js/src/jsapi-tests/testJitMacroAssembler.cpp
index 2890aa2a3769..0cfa71700fba 100644
--- a/js/src/jsapi-tests/testJitMacroAssembler.cpp
+++ b/js/src/jsapi-tests/testJitMacroAssembler.cpp
@@ -24,8 +24,7 @@ using namespace js::jit;
 using mozilla::NegativeInfinity;
 using mozilla::PositiveInfinity;
 
-#if defined(JS_CODEGEN_X86) || defined(JS_CODEGEN_X64) || \
-    defined(JS_CODEGEN_RISCV64s)
+#if defined(JS_CODEGEN_X86) || defined(JS_CODEGEN_X64)
 
 BEGIN_TEST(testJitMacroAssembler_flexibleDivMod) {
   TempAllocator tempAlloc(&cx->tempLifoAlloc());