From 0fbd9e9828b86f8b1ffd45307bd146b3ddcce5a1 Mon Sep 17 00:00:00 2001 From: John Polstra Date: Wed, 11 Feb 1998 04:57:25 +0000 Subject: Remove the include of 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 ++-- include/dlfcn.h | 71 +++++++++++++++++++++++++++++++++++++++++++++++++++ lib/csu/i386/Makefile | 8 ++---- lib/csu/i386/crt0.c | 3 +-- lib/csu/i386/dlfcn.h | 71 --------------------------------------------------- 5 files changed, 77 insertions(+), 81 deletions(-) create mode 100644 include/dlfcn.h delete mode 100644 lib/csu/i386/dlfcn.h 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/include/dlfcn.h b/include/dlfcn.h new file mode 100644 index 000000000000..ba61ebfd4953 --- /dev/null +++ b/include/dlfcn.h @@ -0,0 +1,71 @@ +/* + * Copyright (c) 1994 + * The Regents of the University of California. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the University of + * California, Berkeley and its contributors. + * 4. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * @(#)err.h 8.1 (Berkeley) 6/2/93 + */ + +#ifndef _DLFCN_H_ +#define _DLFCN_H_ +#include + +/* + * Modes for dlopen(). + */ +#define RTLD_LAZY 1 /* Bind function calls lazily */ +#define RTLD_NOW 2 /* Bind function calls immediately */ + +/* + * Special handle argument for dlsym(). It causes the search for the + * symbol to begin in the next shared object after the one containing + * the caller. + */ +#define RTLD_NEXT ((void *) -1) + +/* + * Structure filled in by dladdr(). + */ +typedef struct dl_info { + const char *dli_fname; /* Pathname of shared object */ + void *dli_fbase; /* Base address of shared object */ + const char *dli_sname; /* Name of nearest symbol */ + void *dli_saddr; /* Address of nearest symbol */ +} Dl_info; + +__BEGIN_DECLS +int dladdr __P((const void *, Dl_info *)); +int dlclose __P((void *)); +const char *dlerror __P((void)); +void *dlopen __P((const char *, int)); +void *dlsym __P((void *, const char *)); +__END_DECLS + +#endif /* !_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 #include -#include #ifdef DYNAMIC #include diff --git a/lib/csu/i386/dlfcn.h b/lib/csu/i386/dlfcn.h deleted file mode 100644 index ba61ebfd4953..000000000000 --- a/lib/csu/i386/dlfcn.h +++ /dev/null @@ -1,71 +0,0 @@ -/* - * Copyright (c) 1994 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)err.h 8.1 (Berkeley) 6/2/93 - */ - -#ifndef _DLFCN_H_ -#define _DLFCN_H_ -#include - -/* - * Modes for dlopen(). - */ -#define RTLD_LAZY 1 /* Bind function calls lazily */ -#define RTLD_NOW 2 /* Bind function calls immediately */ - -/* - * Special handle argument for dlsym(). It causes the search for the - * symbol to begin in the next shared object after the one containing - * the caller. - */ -#define RTLD_NEXT ((void *) -1) - -/* - * Structure filled in by dladdr(). - */ -typedef struct dl_info { - const char *dli_fname; /* Pathname of shared object */ - void *dli_fbase; /* Base address of shared object */ - const char *dli_sname; /* Name of nearest symbol */ - void *dli_saddr; /* Address of nearest symbol */ -} Dl_info; - -__BEGIN_DECLS -int dladdr __P((const void *, Dl_info *)); -int dlclose __P((void *)); -const char *dlerror __P((void)); -void *dlopen __P((const char *, int)); -void *dlsym __P((void *, const char *)); -__END_DECLS - -#endif /* !_DLFCN_H_ */ -- cgit v1.3