PERFORCE change 101510 for review

[John Birrell]

http://perforce.freebsd.org/chv.cgi?CH=101510

Change 101510 by jb at jb_freebsd2 on 2006/07/14 04:59:22

	If threads are built into libc, then still define the -pthread
	argument (because ports expect that), but always link just libc
	no matter what.

Affected files ...

.. //depot/projects/dtrace/src/contrib/gcc/config/freebsd-spec.h#3 edit

Differences ...

==== //depot/projects/dtrace/src/contrib/gcc/config/freebsd-spec.h#3 (text+ko) ====

@@ -156,13 +156,26 @@
       %{pthread:-lc_r_p}}						\
   }"
 #else
+#ifdef FBSD_LIBC_THREADS
+/* Leave the -pthread option defined, but link libc no matter what. */
 #define FBSD_LIB_SPEC "							\
   %{!shared:								\
+    %{!pg:								\
+      %{!pthread:-lc}							\
+      %{pthread:-lc}}							\
+    %{pg:								\
+      %{!pthread:-lc_p}							\
+      %{pthread:-lc_p}}							\
+  }"
+#else
+#define FBSD_LIB_SPEC "							\
+  %{!shared:								\
     %{!pg: %{pthread:-lpthread} -lc}					\
     %{pg:  %{pthread:-lpthread_p} -lc_p}				\
   }"
 #endif
 #endif
+#endif
 
 #if FBSD_MAJOR < 5
 #define FBSD_DYNAMIC_LINKER "/usr/libexec/ld-elf.so.1"