Module Name:    src
Committed By:   skrll
Date:           Thu Jan 14 21:52:07 UTC 2010

Modified Files:
        src/libexec/ld.elf_so: reloc.c rtld.h

Log Message:
Remove the entry points for dlopen() and friends. They haven't been used
since Aug 2003.


To generate a diff of this commit:
cvs rdiff -u -r1.98 -r1.99 src/libexec/ld.elf_so/reloc.c
cvs rdiff -u -r1.84 -r1.85 src/libexec/ld.elf_so/rtld.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/libexec/ld.elf_so/reloc.c
diff -u src/libexec/ld.elf_so/reloc.c:1.98 src/libexec/ld.elf_so/reloc.c:1.99
--- src/libexec/ld.elf_so/reloc.c:1.98	Wed Jan 13 20:17:21 2010
+++ src/libexec/ld.elf_so/reloc.c	Thu Jan 14 21:52:07 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: reloc.c,v 1.98 2010/01/13 20:17:21 christos Exp $	 */
+/*	$NetBSD: reloc.c,v 1.99 2010/01/14 21:52:07 skrll Exp $	 */
 
 /*
  * Copyright 1996 John D. Polstra.
@@ -39,7 +39,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: reloc.c,v 1.98 2010/01/13 20:17:21 christos Exp $");
+__RCSID("$NetBSD: reloc.c,v 1.99 2010/01/14 21:52:07 skrll Exp $");
 #endif /* not lint */
 
 #include <err.h>
@@ -202,14 +202,6 @@
 		obj->magic = RTLD_MAGIC;
 		obj->version = RTLD_VERSION;
 
-		/* Fill in the dynamic linker entry points. */
-		obj->dlopen = dlopen;
-		obj->dlsym = dlsym;
-		obj->dlerror = dlerror;
-		obj->dlclose = dlclose;
-		obj->dladdr = dladdr;
-		obj->dlinfo = dlinfo;
-
 		dbg(("fixing up PLTGOT"));
 		/* Set the special PLTGOT entries. */
 		if (obj->pltgot != NULL)

Index: src/libexec/ld.elf_so/rtld.h
diff -u src/libexec/ld.elf_so/rtld.h:1.84 src/libexec/ld.elf_so/rtld.h:1.85
--- src/libexec/ld.elf_so/rtld.h:1.84	Wed Jan 13 20:17:21 2010
+++ src/libexec/ld.elf_so/rtld.h	Thu Jan 14 21:52:07 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: rtld.h,v 1.84 2010/01/13 20:17:21 christos Exp $	 */
+/*	$NetBSD: rtld.h,v 1.85 2010/01/14 21:52:07 skrll Exp $	 */
 
 /*
  * Copyright 1996 John D. Polstra.
@@ -162,14 +162,6 @@
 	void            (*init)(void); 	/* Initialization function to call */
 	void            (*fini)(void);	/* Termination function to call */
 
-	/* Entry points for dlopen() and friends. */
-	void           *(*dlopen)(const char *, int);
-	void           *(*dlsym)(void *, const char *);
-	char           *(*dlerror)(void);
-	int             (*dlclose)(void *);
-	int             (*dladdr)(const void *, Dl_info *);
-	int		(*dlinfo)(void *, int, void *);
-
 	u_int32_t	mainprog:1,	/* True if this is the main program */
 	        	rtld:1,		/* True if this is the dynamic linker */
 			textrel:1,	/* True if there are relocations to

Reply via email to