Module Name: src
Committed By: mrg
Date: Sun Feb 3 11:10:26 UTC 2019
Modified Files:
src/external/gpl3/gcc/dist/gcc/config: netbsd.h
Log Message:
- perform some CSE on NETBSD_LIB_SPEC
- remove some #if 0 code
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 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/netbsd.h
diff -u src/external/gpl3/gcc/dist/gcc/config/netbsd.h:1.26 src/external/gpl3/gcc/dist/gcc/config/netbsd.h:1.27
--- src/external/gpl3/gcc/dist/gcc/config/netbsd.h:1.26 Sat Jan 19 12:57:32 2019
+++ src/external/gpl3/gcc/dist/gcc/config/netbsd.h Sun Feb 3 11:10:26 2019
@@ -108,30 +108,18 @@ along with GCC; see the file COPYING3.
use string concatenation. */
#ifdef NETBSD_ENABLE_PTHREADS
-#define NETBSD_LIB_SPEC \
+#define NETBSD_LIB_SPEC_PTHREAD \
"%{pthread: \
%{!p: \
%{!pg:-lpthread}} \
%{p:-lpthread_p} \
- %{pg:-lpthread_p}} \
- %{posix: \
- %{!p: \
- %{!pg:-lposix}} \
- %{p:-lposix_p} \
- %{pg:-lposix_p}} \
- %{shared: \
- %{!p: \
- %{!pg:-lc}} \
- %{p:-lc_p} \
- %{pg:-lc_p}} \
- %{!shared: \
- %{!symbolic: \
- %{!p: \
- %{!pg:-lc}} \
- %{p:-lc_p} \
- %{pg:-lc_p}}}"
+ %{pg:-lpthread_p}}"
#else
+#define NETBSD_LIB_SPEC_PTHREAD
+#endif
+
#define NETBSD_LIB_SPEC \
+ NETBSD_LIB_SPEC_PTHREAD \
"%{posix: \
%{!p: \
%{!pg:-lposix}} \
@@ -148,7 +136,6 @@ along with GCC; see the file COPYING3.
%{!pg:-lc}} \
%{p:-lc_p} \
%{pg:-lc_p}}}"
-#endif
#undef LIB_SPEC
#define LIB_SPEC NETBSD_LIB_SPEC
@@ -156,11 +143,6 @@ along with GCC; see the file COPYING3.
#define LIBSTDCXX_PROFILE "stdc++_p"
#define MATH_LIBRARY_PROFILE "m_p"
-#if 0 // XXXMRG
-#undef STATIC_LIBASAN_LIBS
-#define STATIC_LIBASAN_LIBS "-lstdc++ -lpthread"
-#endif
-
/* Provide a LIBGCC_SPEC appropriate for NetBSD. */
#ifdef NETBSD_NATIVE
#define NETBSD_LIBGCC_SPEC \
