Module Name: src
Committed By: bouyer
Date: Sat Jan 23 17:34:16 UTC 2010
Modified Files:
src/libexec/ld.elf_so [netbsd-5]: reloc.c rtld.h
Log Message:
Pull up following revision(s) (requested by skrll in ticket #1249):
libexec/ld.elf_so/rtld.h: revisions 1.87, 1.88
libexec/ld.elf_so/reloc.c: revision 1.101
Restore backwards compatibility for binaries referencing the main
Obj_Entry.
To generate a diff of this commit:
cvs rdiff -u -r1.96.4.1 -r1.96.4.2 src/libexec/ld.elf_so/reloc.c
cvs rdiff -u -r1.79.4.1 -r1.79.4.2 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.96.4.1 src/libexec/ld.elf_so/reloc.c:1.96.4.2
--- src/libexec/ld.elf_so/reloc.c:1.96.4.1 Wed Oct 14 09:31:27 2009
+++ src/libexec/ld.elf_so/reloc.c Sat Jan 23 17:34:16 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: reloc.c,v 1.96.4.1 2009/10/14 09:31:27 sborrill Exp $ */
+/* $NetBSD: reloc.c,v 1.96.4.2 2010/01/23 17:34:16 bouyer Exp $ */
/*
* Copyright 1996 John D. Polstra.
@@ -39,7 +39,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: reloc.c,v 1.96.4.1 2009/10/14 09:31:27 sborrill Exp $");
+__RCSID("$NetBSD: reloc.c,v 1.96.4.2 2010/01/23 17:34:16 bouyer Exp $");
#endif /* not lint */
#include <err.h>
@@ -210,7 +210,6 @@
obj->dlerror = dlerror;
obj->dlclose = dlclose;
obj->dladdr = dladdr;
- obj->dlinfo = dlinfo;
dbg(("fixing up PLTGOT"));
/* Set the special PLTGOT entries. */
Index: src/libexec/ld.elf_so/rtld.h
diff -u src/libexec/ld.elf_so/rtld.h:1.79.4.1 src/libexec/ld.elf_so/rtld.h:1.79.4.2
--- src/libexec/ld.elf_so/rtld.h:1.79.4.1 Wed Oct 14 09:31:27 2009
+++ src/libexec/ld.elf_so/rtld.h Sat Jan 23 17:34:16 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rtld.h,v 1.79.4.1 2009/10/14 09:31:27 sborrill Exp $ */
+/* $NetBSD: rtld.h,v 1.79.4.2 2010/01/23 17:34:16 bouyer Exp $ */
/*
* Copyright 1996 John D. Polstra.
@@ -130,7 +130,6 @@
caddr_t entry; /* Entry point */
const Elf_Phdr *__junk001;
size_t pathlen; /* Pathname length */
- void *ehdr;
/* Items from the dynamic section. */
Elf_Addr *pltgot; /* PLTGOT table */
@@ -168,7 +167,6 @@
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 */
@@ -196,6 +194,8 @@
Objlist dagmembers; /* DAG has these members (%) */
dev_t dev; /* Object's filesystem's device */
ino_t ino; /* Object's inode number */
+
+ void *ehdr;
} Obj_Entry;
#if defined(_RTLD_SOURCE)
