summaryrefslogtreecommitdiff
path: root/elf/link.h
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1995-09-30 21:18:30 +0000
committerRoland McGrath <roland@gnu.org>1995-09-30 21:18:30 +0000
commit879bf2e65a9ddaea34fe0428ab0f71caca4b4d00 (patch)
tree7bfc6325a784f1f65f7cd527f1b1be6f2ff1a456 /elf/link.h
parent41cfadd63c6d28400f263460e3f2b15e74893b63 (diff)
* sysdeps/mach/hurd/dl-sysdep.c (_dl_sysdep_start): If started by
kernel with args on stack, point _dl_hurd_data at zero data instead of garbage. When ld.so run as program, grok args -LIB=MEMOBJ and pre-load shared object files found in memory objects loaded by the boot loader. * elf/link.h (struct link_map): New member `l_entry'. (_dl_map_object, _dl_map_object_from_fd): Remove last arg ENTRY_POINT. * elf/dl-load.c (_dl_map_object, _dl_map_object_from_fd): Remove last arg ENTRY_POINT. Store the entry point location in the `l_entry' member of the new map. * elf/rtld.c (dl_main): Don't pass USER_ENTRY arg to _dl_map_object. When run as program, set *USER_ENTRY to L->l_entry. * elf/dl-init.c (_dl_init_next): Don't pass ENTRY_POINT arg to _dl_map_object.
Diffstat (limited to 'elf/link.h')
-rw-r--r--elf/link.h8
1 files changed, 3 insertions, 5 deletions
diff --git a/elf/link.h b/elf/link.h
index aacb3f1630..0388c02202 100644
--- a/elf/link.h
+++ b/elf/link.h
@@ -85,6 +85,7 @@ struct link_map
Elf32_Dyn *l_info[DT_NUM]; /* Indexed pointers to dynamic section. */
const Elf32_Phdr *l_phdr; /* Pointer to program header table in core. */
Elf32_Word l_phnum; /* Number of program header entries. */
+ Elf32_Addr l_entry; /* Entry point location. */
/* Symbol hash table. */
Elf32_Word l_nbuckets;
@@ -158,17 +159,14 @@ extern int _dlerror_run (void (*operate) (void));
/* Open the shared object NAME and map in its segments.
LOADER's DT_RPATH is used in searching for NAME.
- If ENTRY_POINT is not null, fill it in with the object's entry point.
If the object is already opened, returns its existing map. */
extern struct link_map *_dl_map_object (struct link_map *loader,
- const char *name,
- Elf32_Addr *entry_point);
+ const char *name);
/* Similar, but file found at REALNAME and opened on FD.
REALNAME must malloc'd storage and is used in internal data structures. */
extern struct link_map *_dl_map_object_from_fd (const char *name,
- int fd, char *realname,
- Elf32_Addr *entry_point);
+ int fd, char *realname);
/* Cache the locations of MAP's hash table. */
extern void _dl_setup_hash (struct link_map *map);