diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index b6be9c2f478..69457f1c946 100644
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,3 +1,11 @@
+2017-05-10  Andreas Tobler  <andreast@gcc.gnu.org>
+
+	Backport from mainline
+        2017-05-09  Andreas Tobler  <andreast@gcc.gnu.org>
+
+	* config.host: Use the generic FreeBSD t-slibgcc-elf-ver for
+	arm*-*-freebsd* instead of the t-slibgcc-libgcc.
+
 2017-05-02  Release Manager
 
 	* GCC 7.1.0 released.
diff --git a/libgcc/config.host b/libgcc/config.host
index b279a6458f9..bedcf1017df 100644
--- a/libgcc/config.host
+++ b/libgcc/config.host
@@ -389,7 +389,7 @@ arm-wrs-vxworks)
 	;;
 arm*-*-freebsd*)                # ARM FreeBSD EABI
 	tmake_file="${tmake_file} arm/t-arm t-fixedpoint-gnu-prefix arm/t-elf"
-	tmake_file="${tmake_file} arm/t-bpabi arm/t-freebsd t-slibgcc-libgcc"
+	tmake_file="${tmake_file} arm/t-bpabi arm/t-freebsd"
 	tm_file="${tm_file} arm/bpabi-lib.h"
 	unwind_header=config/arm/unwind-arm.h
 	tmake_file="${tmake_file} t-softfp-sfdf t-softfp-excl arm/t-softfp t-softfp"