diff --git a/gcc/libgcc/config/riscv/t-linux32 b/gcc/libgcc/config/riscv/t-elf32
similarity index 100%
rename from gcc/libgcc/config/riscv/t-linux32
rename to gcc/libgcc/config/riscv/t-elf32
diff --git a/gcc/libgcc/config/riscv/t-linux b/gcc/libgcc/config/riscv/t-linux
deleted file mode 100644
index e4e877ec..00000000
--- a/gcc/libgcc/config/riscv/t-linux
+++ /dev/null
@@ -1,3 +0,0 @@
-LIB2ADD += $(srcdir)/config/riscv/riscv-fp.c \
-	   $(srcdir)/config/riscv/mul.S \
-	   $(srcdir)/config/riscv/div.S
diff --git a/patches/gcc b/patches/gcc
index 119bbab9..f5171ec8 100644
--- a/patches/gcc
+++ b/patches/gcc
@@ -211,11 +211,11 @@
  	extra_parts="$extra_parts crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o ecrti.o ecrtn.o ncrti.o ncrtn.o"
  	;;
 +riscv32*-*-linux*)
-+	tmake_file="${tmake_file} riscv/t-fpbit riscv/t-dpbit riscv/t-tpbit riscv/t-linux riscv/t-linux32"
++	tmake_file="${tmake_file} riscv/t-fpbit riscv/t-dpbit riscv/t-tpbit riscv/t-elf riscv/t-elf32"
 +	extra_parts="$extra_parts crtbegin.o crtend.o crti.o crtn.o crtendS.o crtbeginT.o"
 +	;;
 +riscv*-*-linux*)
-+	tmake_file="${tmake_file} riscv/t-fpbit riscv/t-dpbit riscv/t-tpbit riscv/t-linux"
++	tmake_file="${tmake_file} riscv/t-fpbit riscv/t-dpbit riscv/t-tpbit riscv/t-elf"
 +	extra_parts="$extra_parts crtbegin.o crtend.o crti.o crtn.o crtendS.o crtbeginT.o"
 +	;;
 +riscv*-*-*)