diff --git a/rtl/riscv/riscv.inc b/rtl/riscv/riscv.inc
index 999658c391..b999d7970b 100644
--- a/rtl/riscv/riscv.inc
+++ b/rtl/riscv/riscv.inc
@@ -157,3 +157,28 @@ begin
   SetNativeFPUControlWord(cw);
 {$endif FPUFD}
 end;
+
+
+{$define FPC_SYSTEM_HAS_MEM_BARRIER}
+
+procedure ReadBarrier; assembler; nostackframe;
+  asm
+    fence ir, ir
+  end;
+
+
+procedure ReadDependencyBarrier;
+  begin
+  end;
+
+
+procedure ReadWriteBarrier; assembler; nostackframe;
+  asm
+    fence iorw, iorw
+  end;
+
+
+procedure WriteBarrier; assembler; nostackframe;
+  asm
+    fence ow, ow
+  end;
diff --git a/rtl/riscv64/riscv64.inc b/rtl/riscv64/riscv64.inc
index 9be40017b5..c583013321 100644
--- a/rtl/riscv64/riscv64.inc
+++ b/rtl/riscv64/riscv64.inc
@@ -278,28 +278,3 @@ procedure inclocked(var l:int64);
   begin
     InterLockedIncrement64(l);
   end;
-
-
-{$define FPC_SYSTEM_HAS_MEM_BARRIER}
-
-procedure ReadBarrier; assembler; nostackframe;
-  asm
-    fence ir, ir
-  end;
-
-
-procedure ReadDependencyBarrier;
-  begin
-  end;
-
-
-procedure ReadWriteBarrier; assembler; nostackframe;
-  asm
-    fence iorw, iorw
-  end;
-
-
-procedure WriteBarrier; assembler; nostackframe;
-  asm
-    fence ow, ow
-  end;