From owner-svn-src-head@FreeBSD.ORG  Sat Aug 21 17:30:00 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 15F5A1065674;
	Sat, 21 Aug 2010 17:30:00 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E001B8FC0C;
	Sat, 21 Aug 2010 17:29:59 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o7LHTx5a076188;
	Sat, 21 Aug 2010 17:29:59 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o7LHTxjY076184;
	Sat, 21 Aug 2010 17:29:59 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <201008211729.o7LHTxjY076184@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Sat, 21 Aug 2010 17:29:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r211577 - in head: . cddl/lib/drti lib/libelf
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 21 Aug 2010 17:30:00 -0000

Author: rpaulo
Date: Sat Aug 21 17:29:59 2010
New Revision: 211577
URL: http://svn.freebsd.org/changeset/base/211577

Log:
  Don't link drti.o with libelf_pic.a. This means that all software with
  userland SDT probes must be linked with libelf explicitly.
  
  Requested by:	kib
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/Makefile.inc1
  head/cddl/lib/drti/Makefile
  head/lib/libelf/Makefile

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Sat Aug 21 17:15:37 2010	(r211576)
+++ head/Makefile.inc1	Sat Aug 21 17:29:59 2010	(r211577)
@@ -1149,7 +1149,7 @@ gnu/lib/libgcc__L: lib/libc__L
 _prebuild_libs=	${_kerberos5_lib_libasn1} ${_kerberos5_lib_libheimntlm} \
 		${_kerberos5_lib_libhx509} ${_kerberos5_lib_libkrb5} \
 		${_kerberos5_lib_libroken} \
-		lib/libbz2 lib/libcom_err lib/libcrypt lib/libelf \
+		lib/libbz2 lib/libcom_err lib/libcrypt \
 		lib/libexpat lib/libfetch \
 		${_lib_libgssapi} ${_lib_libipx} \
 		lib/libkiconv lib/libkvm lib/liblzma lib/libmd \

Modified: head/cddl/lib/drti/Makefile
==============================================================================
--- head/cddl/lib/drti/Makefile	Sat Aug 21 17:15:37 2010	(r211576)
+++ head/cddl/lib/drti/Makefile	Sat Aug 21 17:29:59 2010	(r211577)
@@ -8,7 +8,7 @@ FILESOWN=	${LIBOWN}
 FILESGRP=	${LIBGRP}
 FILESMODE=	${LIBMODE}
 FILESDIR=	${LIBDIR}/dtrace
-CLEANFILES=	${FILES} ${FILES}.tmp
+CLEANFILES=	${FILES}
 
 CFLAGS+=	-I${.CURDIR}/../../../sys/cddl/compat/opensolaris \
 		-I${.CURDIR}/../../../cddl/compat/opensolaris/include \
@@ -18,10 +18,4 @@ CFLAGS+=	-I${.CURDIR}/../../../sys/cddl/
 		-I${OPENSOLARIS_SYS_DISTDIR}/uts/common \
 		-DPIC -fpic
 
-.c.o:
-	${CC} ${CFLAGS} -c ${.IMPSRC}
-	mv ${FILES} ${FILES}.tmp
-	${LD} -o ${FILES} -r ${FILES}.tmp ${LIBELF_PIC}
-	rm -f ${FILES}.tmp
-
 .include <bsd.prog.mk>

Modified: head/lib/libelf/Makefile
==============================================================================
--- head/lib/libelf/Makefile	Sat Aug 21 17:15:37 2010	(r211576)
+++ head/lib/libelf/Makefile	Sat Aug 21 17:29:59 2010	(r211577)
@@ -55,7 +55,6 @@ SRCS=	elf_begin.c						\
 	${GENSRCS}
 INCS=	libelf.h gelf.h
 
-INSTALL_PIC_ARCHIVE=yes
 GENSRCS=	libelf_fsize.c libelf_msize.c libelf_convert.c
 CLEANFILES=	${GENSRCS}
 CFLAGS+=	-I. -I${.CURDIR}