diff --git a/arch/risc-v/src/rv32im/Toolchain.defs b/arch/risc-v/src/rv32im/Toolchain.defs
index 6fab51473e..c41ffe83fb 100644
--- a/arch/risc-v/src/rv32im/Toolchain.defs
+++ b/arch/risc-v/src/rv32im/Toolchain.defs
@@ -80,9 +80,9 @@ ifeq ($(CONFIG_RISCV_TOOLCHAIN),GNU_RVGL)
   CROSSDEV ?= riscv64-unknown-elf-
   ARCROSSDEV ?= riscv64-unknown-elf-
 ifeq ($(CONFIG_RV32IM_HW_MULDIV),y)
-  ARCHCPUFLAGS = -march=RV32IMXcustom -m32
+  ARCHCPUFLAGS = -march=rv32im -mabi=ilp32f -mdiv
 else
-  ARCHCPUFLAGS = -march=RV32IXcustom -m32
+  ARCHCPUFLAGS = -march=rv32im -mabi=ilp32f -mno-div
 endif
 endif
 
@@ -93,9 +93,9 @@ ifeq ($(CONFIG_RISCV_TOOLCHAIN),GNU_RVGW)
     WINTOOL = y
   endif
 ifeq ($(CONFIG_RV32IM_HW_MULDIV),y)
-  ARCHCPUFLAGS = -march=RV32IMXcustom -m32
+  ARCHCPUFLAGS = -march=rv32im -mabi=ilp32f -mdiv
 else
-  ARCHCPUFLAGS = -march=RV32IXcustom -m32
+  ARCHCPUFLAGS = -march=rv32im -mabi=ilp32f -mno-div
 endif
 endif