diff --git a/gcc/gcc/config/riscv/t-elf b/gcc/gcc/config/riscv/t-elf
index 83390269..728b74a8 100644
--- a/gcc/gcc/config/riscv/t-elf
+++ b/gcc/gcc/config/riscv/t-elf
@@ -1,4 +1,4 @@
 # Build the libraries for both hard and soft floating point
 
-MULTILIB_OPTIONS = msoft-float m64/m32 mno-atomic
-MULTILIB_DIRNAMES = soft-float 64 32 no-atomic
+MULTILIB_OPTIONS = m64/m32 msoft-float mno-atomic
+MULTILIB_DIRNAMES = 64 32 soft-float no-atomic