Module Name: src
Committed By: skrll
Date: Fri Dec 2 09:06:49 UTC 2011
Modified Files:
src/libexec/ld.elf_so: reloc.c rtld.h
Log Message:
Restore backwards compatibility by removing unnecessary addition of
dlvsym to Obj_Entry.
Add some comments.
To generate a diff of this commit:
cvs rdiff -u -r1.104 -r1.105 src/libexec/ld.elf_so/reloc.c
cvs rdiff -u -r1.106 -r1.107 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.104 src/libexec/ld.elf_so/reloc.c:1.105
--- src/libexec/ld.elf_so/reloc.c:1.104 Sat Jun 25 05:45:12 2011
+++ src/libexec/ld.elf_so/reloc.c Fri Dec 2 09:06:49 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: reloc.c,v 1.104 2011/06/25 05:45:12 nonaka Exp $ */
+/* $NetBSD: reloc.c,v 1.105 2011/12/02 09:06:49 skrll Exp $ */
/*
* Copyright 1996 John D. Polstra.
@@ -39,7 +39,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: reloc.c,v 1.104 2011/06/25 05:45:12 nonaka Exp $");
+__RCSID("$NetBSD: reloc.c,v 1.105 2011/12/02 09:06:49 skrll Exp $");
#endif /* not lint */
#include <err.h>
@@ -210,10 +210,13 @@ _rtld_relocate_objects(Obj_Entry *first,
obj->magic = RTLD_MAGIC;
obj->version = RTLD_VERSION;
- /* Fill in the dynamic linker entry points. */
+ /*
+ * Fill in the backwards compatibility dynamic linker entry points.
+ *
+ * DO NOT ADD TO THIS LIST
+ */
obj->dlopen = dlopen;
obj->dlsym = dlsym;
- obj->dlvsym = dlvsym;
obj->dlerror = dlerror;
obj->dlclose = dlclose;
obj->dladdr = dladdr;
Index: src/libexec/ld.elf_so/rtld.h
diff -u src/libexec/ld.elf_so/rtld.h:1.106 src/libexec/ld.elf_so/rtld.h:1.107
--- src/libexec/ld.elf_so/rtld.h:1.106 Sat Jun 25 05:45:12 2011
+++ src/libexec/ld.elf_so/rtld.h Fri Dec 2 09:06:49 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rtld.h,v 1.106 2011/06/25 05:45:12 nonaka Exp $ */
+/* $NetBSD: rtld.h,v 1.107 2011/12/02 09:06:49 skrll Exp $ */
/*
* Copyright 1996 John D. Polstra.
@@ -191,10 +191,14 @@ typedef struct Struct_Obj_Entry {
void (*init)(void); /* Initialization function to call */
void (*fini)(void); /* Termination function to call */
- /* Entry points for dlopen() and friends. */
+ /*
+ * BACKWARDS COMPAT Entry points for dlopen() and friends.
+ *
+ * DO NOT MOVE OR ADD TO THE LIST
+ *
+ */
void *(*dlopen)(const char *, int);
void *(*dlsym)(void *, const char *);
- void *(*dlvsym)(void *, const char *, const char *);
char *(*dlerror)(void);
int (*dlclose)(void *);
int (*dladdr)(const void *, Dl_info *);
