diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 9a210428206..cecd6d86ff9 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2017-05-14  Krister Walfridsson  <krister.walfridsson@gmail.com>
+
+	PR target/80600
+	* config/netbsd.h (NETBSD_LIBGCC_SPEC): Always add -lgcc.
+
 2017-05-14  Uros Bizjak  <ubizjak@gmail.com>
 
 	* config/i386.i386.c (ix86_cc_modes_compatible): CCNOmode is
diff --git a/gcc/config/netbsd.h b/gcc/config/netbsd.h
index 18bda9c3dd4..4001f240d58 100644
--- a/gcc/config/netbsd.h
+++ b/gcc/config/netbsd.h
@@ -120,8 +120,7 @@ along with GCC; see the file COPYING3.  If not see
 #undef LIB_SPEC
 #define LIB_SPEC NETBSD_LIB_SPEC
 
-/* Provide a LIBGCC_SPEC appropriate for NetBSD.  We also want to exclude
-   libgcc with -symbolic.  */
+/* Provide a LIBGCC_SPEC appropriate for NetBSD.  */
 
 #ifdef NETBSD_NATIVE
 #define NETBSD_LIBGCC_SPEC	\
@@ -133,7 +132,7 @@ along with GCC; see the file COPYING3.  If not see
      %{p: -lgcc_p}		\
      %{pg: -lgcc_p}}"
 #else
-#define NETBSD_LIBGCC_SPEC "%{!shared:%{!symbolic: -lgcc}}"
+#define NETBSD_LIBGCC_SPEC "-lgcc"
 #endif
 
 #undef LIBGCC_SPEC
diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index 13bdd94641c..c070a3d2a96 100644
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,3 +1,8 @@
+2017-05-14  Krister Walfridsson  <krister.walfridsson@gmail.com>
+
+	PR target/80600
+	* config.host (*-*-netbsd*): Add t-slibgcc-libgcc to tmake_file.
+
 2017-05-14  Daniel Santos  <daniel.santos@pobox.com>
 
 	* config.host: Add i386/t-msabi to i386/t-linux file list.
diff --git a/libgcc/config.host b/libgcc/config.host
index 466b855c39b..7711abf2704 100644
--- a/libgcc/config.host
+++ b/libgcc/config.host
@@ -249,6 +249,7 @@ case ${host} in
 *-*-netbsd*)
   tmake_file="$tmake_file t-crtstuff-pic t-libgcc-pic t-eh-dw2-dip"
   tmake_file="$tmake_file t-slibgcc t-slibgcc-gld t-slibgcc-elf-ver"
+  tmake_file="$tmake_file t-slibgcc-libgcc"
   # NetBSD 1.7 and later are set up to use GCC's crtstuff for
   # ELF configurations.  We will clear extra_parts in the
   # a.out configurations.