diff options
| author | Roland McGrath <roland@gnu.org> | 1996-03-20 14:50:57 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 1996-03-20 14:50:57 +0000 |
| commit | 948c3e72ecaa4e8dfce47dcbc62b9723c9946155 (patch) | |
| tree | fc42e920de8cebf0f84485b2f060730b790fa901 /elf | |
| parent | 213afb94b631fef0e6f24a2c61f5e31de77b62f5 (diff) | |
| download | glibc-948c3e72ecaa4e8dfce47dcbc62b9723c9946155.tar.gz glibc-948c3e72ecaa4e8dfce47dcbc62b9723c9946155.tar.xz glibc-948c3e72ecaa4e8dfce47dcbc62b9723c9946155.zip | |
Wed Mar 20 09:42:11 1996 Roland McGrath <roland@charlie-brown.gnu.ai.mit.edu>
* elf/dl-load.c (_dl_map_object_from_fd): Always set L->l_type; if not lt_executable, then lt_library. * elf/rtld.c (dl_main): Don't set NEW->l_type after _dl_map_object. Wed Mar 20 00:08:23 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/unix/sysv/linux/syscalls.list: Remove gtty and stty. Tue Mar 19 16:31:06 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/unix/sysv/linux/termbits.h (CRTSCTS, CBAUDEX, VEOL, VEOL2, VMIN, VTIME): Corrected. (PAGEOUT, WRAP, VDSUSP): Deleted. * sysdeps/unix/readdir.c: Test [! _DIRENT_HAVE_D_RECLEN] instead of (sizeof (DP->d_name) > 1) to detect fixed-size dir entries.
Diffstat (limited to 'elf')
| -rw-r--r-- | elf/dl-load.c | 3 | ||||
| -rw-r--r-- | elf/rtld.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/elf/dl-load.c b/elf/dl-load.c index 527901cd6d..1625d3cf5b 100644 --- a/elf/dl-load.c +++ b/elf/dl-load.c @@ -430,8 +430,7 @@ _dl_map_object_from_fd (const char *name, int fd, char *realname) } } - if (type == ET_EXEC) - l->l_type = lt_executable; + l->l_type = type == ET_EXEC ? lt_executable : lt_library; if (l->l_ld == 0) { diff --git a/elf/rtld.c b/elf/rtld.c index aa004f325e..23e0d35d78 100644 --- a/elf/rtld.c +++ b/elf/rtld.c @@ -1,5 +1,5 @@ /* Run time dynamic linker. -Copyright (C) 1995 Free Software Foundation, Inc. +Copyright (C) 1995, 1996 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -269,7 +269,6 @@ of this helper program; chances are you did not intend to run this program.\n", { struct link_map *new; new = _dl_map_object (l, strtab + d->d_un.d_val); - new->l_type = lt_library; if (!before_rtld && new == &rtld_map) before_rtld = last; last = new; |