summaryrefslogtreecommitdiff
path: root/elf
diff options
context:
space:
mode:
Diffstat (limited to 'elf')
-rw-r--r--elf/dl-load.c3
-rw-r--r--elf/rtld.c3
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;