Module Name: src
Committed By: bouyer
Date: Sat Jan 23 17:34:12 UTC 2010
Modified Files:
src/libexec/ld.elf_so [netbsd-5-0]: 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.79 -r1.79.8.1 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/rtld.h
diff -u src/libexec/ld.elf_so/rtld.h:1.79 src/libexec/ld.elf_so/rtld.h:1.79.8.1
--- src/libexec/ld.elf_so/rtld.h:1.79 Sat Oct 4 09:37:12 2008
+++ src/libexec/ld.elf_so/rtld.h Sat Jan 23 17:34:12 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rtld.h,v 1.79 2008/10/04 09:37:12 skrll Exp $ */
+/* $NetBSD: rtld.h,v 1.79.8.1 2010/01/23 17:34:12 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 */
@@ -195,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)
