diff options
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/config.gcc | 16 | ||||
| -rw-r--r-- | gcc/config/netbsd.h | 16 |
3 files changed, 7 insertions, 31 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index f4ef973..5e2b4f5 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2017-07-09 Krister Walfridsson <krister.walfridsson@gmail.com> + + * config.gcc (*-*-netbsd*): Remove check for NetBSD versions not + supporting pthreds. + * config/netbsd.h (NETBSD_LIBGCC_SPEC): Always enable pthreads. + 2017-07-08 Richard Sandiford <richard.sandiford@linaro.org> * Makefile.in (HOOKS_H, RTL_BASE_H, FUNCTION_H, EXPR_H, REGS_H) diff --git a/gcc/config.gcc b/gcc/config.gcc index a1e0f8f..1b47457 100644 --- a/gcc/config.gcc +++ b/gcc/config.gcc @@ -794,22 +794,8 @@ case ${target} in gas=yes gnu_ld=yes use_gcc_stdint=wrap - - # NetBSD 2.0 and later get POSIX threads enabled by default. - # Allow them to be explicitly enabled on any other version. case ${enable_threads} in - "") - case ${target} in - *-*-netbsd[2-9]* | *-*-netbsdelf[2-9]*) - thread_file='posix' - tm_defines="${tm_defines} NETBSD_ENABLE_PTHREADS" - ;; - esac - ;; - yes | posix) - thread_file='posix' - tm_defines="${tm_defines} NETBSD_ENABLE_PTHREADS" - ;; + "" | yes | posix) thread_file='posix' ;; esac # NetBSD 2.0 and later provide __cxa_atexit(), which we use by diff --git a/gcc/config/netbsd.h b/gcc/config/netbsd.h index f4ac23a..f96ead0 100644 --- a/gcc/config/netbsd.h +++ b/gcc/config/netbsd.h @@ -84,7 +84,6 @@ along with GCC; see the file COPYING3. If not see FIXME: Could eliminate the duplication here if we were allowed to use string concatenation. */ -#ifdef NETBSD_ENABLE_PTHREADS #define NETBSD_LIB_SPEC \ "%{pthread: \ %{!p: \ @@ -103,21 +102,6 @@ along with GCC; see the file COPYING3. If not see %{!pg:-lc}} \ %{p:-lc_p} \ %{pg:-lc_p}}}" -#else -#define NETBSD_LIB_SPEC \ - "%{posix: \ - %{!p: \ - %{!pg:-lposix}} \ - %{p:-lposix_p} \ - %{pg:-lposix_p}} \ - %{shared:-lc} \ - %{!shared: \ - %{!symbolic: \ - %{!p: \ - %{!pg:-lc}} \ - %{p:-lc_p} \ - %{pg:-lc_p}}}" -#endif #undef LIB_SPEC #define LIB_SPEC NETBSD_LIB_SPEC |