summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkristerw <kristerw@138bc75d-0d04-0410-961f-82ee72b054a4>2017-09-28 19:17:51 +0000
committerkristerw <kristerw@138bc75d-0d04-0410-961f-82ee72b054a4>2017-09-28 19:17:51 +0000
commit984e1caaea93793cb9ca9a0dc75f4a9b74edf1aa (patch)
treea9cdc8d1f13595081c0fc6cea4acec0e914ea6d1
parent8c4d1c9e787356388d8889e8a9d90bf0d583de23 (diff)
downloadgcc-984e1caaea93793cb9ca9a0dc75f4a9b74edf1aa.tar.gz
gcc/ChangeLog:
Backport from mainline 2017-05-14 Krister Walfridsson <krister.walfridsson@gmail.com> PR target/80600 * config/netbsd.h (NETBSD_LIBGCC_SPEC): Always add -lgcc. libgcc/ChangeLog: Backport from mainline 2017-05-14 Krister Walfridsson <krister.walfridsson@gmail.com> PR target/80600 * config.host (*-*-netbsd*): Add t-slibgcc-libgcc to tmake_file. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-7-branch@253263 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/ChangeLog8
-rw-r--r--gcc/config/netbsd.h5
-rw-r--r--libgcc/ChangeLog8
-rw-r--r--libgcc/config.host1
4 files changed, 19 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3e9ba77a672..5da8cfb32dc 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2017-09-28 Krister Walfridsson <krister.walfridsson@gmail.com>
+
+ Backport from mainline
+ 2017-05-14 Krister Walfridsson <krister.walfridsson@gmail.com>
+
+ PR target/80600
+ * config/netbsd.h (NETBSD_LIBGCC_SPEC): Always add -lgcc.
+
2017-09-27 Christophe Lyon <christophe.lyon@linaro.org>
Backport from trunk r249639.
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 f23623b7fc5..aa1b04bec43 100644
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,3 +1,11 @@
+2017-09-28 Krister Walfridsson <krister.walfridsson@gmail.com>
+
+ Backport from mainline
+ 2017-05-14 Krister Walfridsson <krister.walfridsson@gmail.com>
+
+ PR target/80600
+ * config.host (*-*-netbsd*): Add t-slibgcc-libgcc to tmake_file.
+
2017-08-14 Release Manager
* GCC 7.2.0 released.
diff --git a/libgcc/config.host b/libgcc/config.host
index bedcf1017df..529fc46c3d6 100644
--- a/libgcc/config.host
+++ b/libgcc/config.host
@@ -245,6 +245,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.