Put dl* function definitions in libc on ELF, removing the need for libdl.

These are just stubs, the real functions are resolved by ld.so when linking
is performed.  ok art

3 files changed, 96 insertions, 1 deletions

diff --git a/lib/libc/Makefile.inc b/lib/libc/Makefile.inc
index c9f6ddef254..27b8e06d65e 100644
--- a/lib/libc/Makefile.inc
+++ b/lib/libc/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.4 2001/03/02 13:27:05 espie Exp $
+#	$OpenBSD: Makefile.inc,v 1.5 2001/11/20 01:09:38 pvalchev Exp $
 #
 # This file contains make rules that are shared by libc and libc_r.
 #
@@ -26,6 +26,7 @@ AINC+=  -nostdinc -idirafter ${DESTDIR}/usr/include
 .endif
 
 .include "${LIBCSRCDIR}/db/Makefile.inc"
+.include "${LIBCSRCDIR}/dlfcn/Makefile.inc"
 .include "${LIBCSRCDIR}/compat-43/Makefile.inc"
 .include "${LIBCSRCDIR}/gen/Makefile.inc"
 .include "${LIBCSRCDIR}/crypt/Makefile.inc"
diff --git a/lib/libc/dlfcn/Makefile.inc b/lib/libc/dlfcn/Makefile.inc
new file mode 100644
index 00000000000..2a3224e28b5
--- /dev/null
+++ b/lib/libc/dlfcn/Makefile.inc
@@ -0,0 +1,10 @@
+#	$OpenBSD: Makefile.inc,v 1.1 2001/11/20 01:09:38 pvalchev Exp $
+
+.PATH: ${LIBCSRCDIR}/dlfcn
+
+.include <bsd.own.mk>
+
+.if ${ELF_TOOLCHAIN:L} == "yes"
+SRCS+=		dlfcn_stubs.c
+CPPFLAGS+=	-I${.CURDIR}/dlfcn
+.endif
diff --git a/lib/libc/dlfcn/dlfcn_stubs.c b/lib/libc/dlfcn/dlfcn_stubs.c
new file mode 100644
index 00000000000..2db7e4b012e
--- /dev/null
+++ b/lib/libc/dlfcn/dlfcn_stubs.c
@@ -0,0 +1,84 @@
+/*	$OpenBSD: dlfcn_stubs.c,v 1.1 2001/11/20 01:09:38 pvalchev Exp $	*/
+
+/*
+ * Copyright (c) 1998 Per Fogelstrom, Opsycon AB
+ * 
+ * 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 under OpenBSD by
+ *	Per Fogelstrom, Opsycon AB, Sweden.
+ * 4. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ *
+ */
+
+/*
+ *	All functions here are just stubs that will be overridden
+ *	by the real functions in ld.so when dynamic loading is
+ *	performed at exec. The symbols here are provided as a link
+ *	helper so we can link a program using the dl functions
+ *	without getting any unresolved references.
+ */
+
+void	*dlopen(const char *libname, int how) __attribute__((weak));
+int	 dlclose(void *handle) __attribute__((weak));
+void	*dlsym(void *handle, const char *name) __attribute__((weak));
+int	 dlctl(void *handle, int command, void *data) __attribute__((weak));
+const char *	dlerror() __attribute__((weak));
+
+#include <stdio.h>
+
+void *
+dlopen(const char *libname, int how)
+{
+	printf("Wrong dl symbols!\n");
+	return NULL;
+}
+
+int
+dlclose(void *handle)
+{
+	printf("Wrong dl symbols!\n");
+	return 0;
+}
+
+void *
+dlsym(void *handle, const char *name)
+{
+	printf("Wrong dl symbols!\n");
+	return NULL;
+}
+
+int
+dlctl(void *handle, int command, void *data)
+{
+	printf("Wrong dl symbols!\n");
+	return 0;
+}
+
+const char *
+dlerror()
+{
+	printf("Wrong dl symbols!\n");
+	return "Wrong dl symbols!\n";
+}