From 0fbd9e9828b86f8b1ffd45307bd146b3ddcce5a1 Mon Sep 17 00:00:00 2001
From: John Polstra <jdp@FreeBSD.org>
Date: Wed, 11 Feb 1998 04:57:25 +0000
Subject: [PATCH] Remove the include of <dlfcn.h> from crt0.c; it is not needed
 now that the dl* trampolines have been moved into libc.

Move dlfcn.h from src/lib/csu/i386 into src/include.  Nothing in
src/lib/csu/i386 uses it any more.
---
 include/Makefile                  | 5 +++--
 {lib/csu/i386 => include}/dlfcn.h | 0
 lib/csu/i386/Makefile             | 8 ++------
 lib/csu/i386/crt0.c               | 3 +--
 4 files changed, 6 insertions(+), 10 deletions(-)
 rename {lib/csu/i386 => include}/dlfcn.h (100%)

diff --git a/include/Makefile b/include/Makefile
index 83b632ae63ec..b666ab789133 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.2 (Berkeley) 1/4/94
-#	$Id: Makefile,v 1.69 1998/01/02 09:39:12 jkh Exp $
+#	$Id: Makefile,v 1.70 1998/01/31 05:54:54 imp Exp $
 #
 # Doing a make install builds /usr/include
 #
@@ -11,7 +11,8 @@ depend lint tags:
 CLEANFILES= osreldate.h version vers.c
 SUBDIR= rpcsvc
 FILES=	a.out.h ar.h assert.h bitstring.h ctype.h db.h dirent.h disktab.h \
-	elf.h err.h fnmatch.h fstab.h fts.h glob.h grp.h strhash.h histedit.h \
+	dlfcn.h elf.h err.h fnmatch.h fstab.h \
+	fts.h glob.h grp.h strhash.h histedit.h \
 	kvm.h limits.h link.h locale.h malloc.h memory.h mpool.h \
 	ndbm.h netdb.h nl_types.h nlist.h paths.h pthread.h pthread_np.h pwd.h \
 	ranlib.h regex.h regexp.h resolv.h rune.h runetype.h setjmp.h sgtty.h \
diff --git a/lib/csu/i386/dlfcn.h b/include/dlfcn.h
similarity index 100%
rename from lib/csu/i386/dlfcn.h
rename to include/dlfcn.h
diff --git a/lib/csu/i386/Makefile b/lib/csu/i386/Makefile
index a05ecafeeb9b..e672c073a9d3 100644
--- a/lib/csu/i386/Makefile
+++ b/lib/csu/i386/Makefile
@@ -1,7 +1,7 @@
 #	from: @(#)Makefile	5.6 (Berkeley) 5/22/91
-#	$Id: Makefile,v 1.34 1998/02/06 16:46:31 jdp Exp $
+#	$Id: Makefile,v 1.35 1998/02/09 06:05:07 jdp Exp $
 
-CFLAGS+=        -DLIBC_SCCS -fno-omit-frame-pointer -I${.CURDIR}
+CFLAGS+=        -DLIBC_SCCS -fno-omit-frame-pointer
 OBJS=		crt0.o c++rt0.o gcrt0.o scrt0.o sgcrt0.o
 CLEANFILES+=	a.out
 
@@ -33,10 +33,6 @@ sgcrt0.o: scrt0.o
 	${CC} ${CFLAGS} -c -DMCRT0 ${.CURDIR}/crt0.c -o ${.TARGET}
 	${LD} -O ${.TARGET} -x -r ${.TARGET}
 
-beforeinstall:
-	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/dlfcn.h \
-		${DESTDIR}/usr/include
-
 realinstall:
 	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 ${OBJS} \
 		${DESTDIR}/usr/lib
diff --git a/lib/csu/i386/crt0.c b/lib/csu/i386/crt0.c
index 75b1ac5d3870..8286e74057ac 100644
--- a/lib/csu/i386/crt0.c
+++ b/lib/csu/i386/crt0.c
@@ -27,13 +27,12 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: crt0.c,v 1.32 1998/02/06 16:46:33 jdp Exp $
+ *	$Id: crt0.c,v 1.33 1998/02/09 06:05:09 jdp Exp $
  */
 
 #include <sys/param.h>
 
 #include <stdlib.h>
-#include <dlfcn.h>
 
 #ifdef DYNAMIC
 #include <sys/types.h>