diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2005-01-06 14:57:16 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2005-01-06 14:57:16 +0000 |
| commit | 0ecfa2580d1aedb744deb5af1b60f92c69b9e9e0 (patch) | |
| tree | 1ef0d0dc09dba23037800d5f3794a77d9b45554f /elf/rtld.c | |
| parent | e4f5d077e9190f57abd49684bd7afcf4325bd348 (diff) | |
Updated to fedora-glibc-20050106T1443
Diffstat (limited to 'elf/rtld.c')
| -rw-r--r-- | elf/rtld.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/elf/rtld.c b/elf/rtld.c index ee7291477f..3835a207ec 100644 --- a/elf/rtld.c +++ b/elf/rtld.c @@ -1,5 +1,5 @@ /* Run time dynamic linker. - Copyright (C) 1995-2002, 2003, 2004 Free Software Foundation, Inc. + Copyright (C) 1995-2002, 2003, 2004, 2005 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 @@ -1412,9 +1412,9 @@ ERROR: ld.so: object '%s' from %s cannot be preloaded: ignored.\n", { if (! l->l_addr) l->l_addr = ph->p_vaddr; - else if (ph->p_vaddr + ph->p_memsz >= l->l_map_end) + if (ph->p_vaddr + ph->p_memsz >= l->l_map_end) l->l_map_end = ph->p_vaddr + ph->p_memsz; - else if ((ph->p_flags & PF_X) + if ((ph->p_flags & PF_X) && ph->p_vaddr + ph->p_memsz >= l->l_text_end) l->l_text_end = ph->p_vaddr + ph->p_memsz; } |