From owner-p4-projects@FreeBSD.ORG  Fri Jul 14 04:59:41 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8264B16A4DF; Fri, 14 Jul 2006 04:59:41 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 5AA9816A4DD
	for <perforce@freebsd.org>; Fri, 14 Jul 2006 04:59:41 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 27E5643D45
	for <perforce@freebsd.org>; Fri, 14 Jul 2006 04:59:41 +0000 (GMT)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6E4xffc032367
	for <perforce@freebsd.org>; Fri, 14 Jul 2006 04:59:41 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6E4xe4E032364
	for perforce@freebsd.org; Fri, 14 Jul 2006 04:59:40 GMT
	(envelope-from jb@freebsd.org)
Date: Fri, 14 Jul 2006 04:59:40 GMT
Message-Id: <200607140459.k6E4xe4E032364@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 101510 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 14 Jul 2006 04:59:41 -0000

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

Change 101510 by jb@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"