Module Name: src Committed By: maya Date: Sun Apr 7 14:11:23 UTC 2019
Modified Files: src/external/gpl3/gcc/dist/gcc: config.gcc src/external/gpl3/gcc/dist/gcc/config: netbsd.h Log Message: Reduce diff to upstream (in config.gcc): Make the NETBSD_ENABLE_PTHREADS unconditional (we don't use the else case) To generate a diff of this commit: cvs rdiff -u -r1.53 -r1.54 src/external/gpl3/gcc/dist/gcc/config.gcc cvs rdiff -u -r1.27 -r1.28 src/external/gpl3/gcc/dist/gcc/config/netbsd.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/external/gpl3/gcc/dist/gcc/config.gcc diff -u src/external/gpl3/gcc/dist/gcc/config.gcc:1.53 src/external/gpl3/gcc/dist/gcc/config.gcc:1.54 --- src/external/gpl3/gcc/dist/gcc/config.gcc:1.53 Sun Apr 7 14:08:35 2019 +++ src/external/gpl3/gcc/dist/gcc/config.gcc Sun Apr 7 14:11:23 2019 @@ -798,10 +798,7 @@ case ${target} in gnu_ld=yes use_gcc_stdint=wrap case ${enable_threads} in - "" | yes | posix) - thread_file='posix' - tm_defines="${tm_defines} NETBSD_ENABLE_PTHREADS" - ;; + "" | yes | posix) thread_file='posix' ;; esac nbsd_tm_file="${nbsd_tm_file} netbsd.h netbsd-stdint.h netbsd-elf.h" default_use_cxa_atexit=yes Index: src/external/gpl3/gcc/dist/gcc/config/netbsd.h diff -u src/external/gpl3/gcc/dist/gcc/config/netbsd.h:1.27 src/external/gpl3/gcc/dist/gcc/config/netbsd.h:1.28 --- src/external/gpl3/gcc/dist/gcc/config/netbsd.h:1.27 Sun Feb 3 11:10:26 2019 +++ src/external/gpl3/gcc/dist/gcc/config/netbsd.h Sun Apr 7 14:11:23 2019 @@ -107,16 +107,12 @@ along with GCC; see the file COPYING3. FIXME: Could eliminate the duplication here if we were allowed to use string concatenation. */ -#ifdef NETBSD_ENABLE_PTHREADS #define NETBSD_LIB_SPEC_PTHREAD \ "%{pthread: \ %{!p: \ %{!pg:-lpthread}} \ %{p:-lpthread_p} \ %{pg:-lpthread_p}}" -#else -#define NETBSD_LIB_SPEC_PTHREAD -#endif #define NETBSD_LIB_SPEC \ NETBSD_LIB_SPEC_PTHREAD \