diff options
| author | skrll <skrll@NetBSD.org> | 2011-12-02 09:06:49 +0000 |
|---|---|---|
| committer | skrll <skrll@NetBSD.org> | 2011-12-02 09:06:49 +0000 |
| commit | 32f58e5df735ecd69fed946184e32d95e6cb2ee0 (patch) | |
| tree | 53e852047c6516ebb2b1981da95cd60fd4b053d3 /libexec | |
| parent | d4a4aaaf5fe8673f70d37a959961c8aaded5c897 (diff) | |
Restore backwards compatibility by removing unnecessary addition of
dlvsym to Obj_Entry.
Add some comments.
Diffstat (limited to 'libexec')
| -rw-r--r-- | libexec/ld.elf_so/reloc.c | 11 | ||||
| -rw-r--r-- | libexec/ld.elf_so/rtld.h | 10 |
2 files changed, 14 insertions, 7 deletions
diff --git a/libexec/ld.elf_so/reloc.c b/libexec/ld.elf_so/reloc.c index 1730f7f9b7b..d25c13ef30a 100644 --- a/libexec/ld.elf_so/reloc.c +++ b/libexec/ld.elf_so/reloc.c @@ -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, bool bind_now) 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; diff --git a/libexec/ld.elf_so/rtld.h b/libexec/ld.elf_so/rtld.h index 1458aa4002f..f7f54b13c5f 100644 --- a/libexec/ld.elf_so/rtld.h +++ b/libexec/ld.elf_so/rtld.h @@ -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 *); |
