aboutsummaryrefslogtreecommitdiff
path: root/elf/dynamic-link.h
diff options
context:
space:
mode:
authorCarlos O'Donell <carlos_odonell@mentor.com>2012-04-07 09:34:45 -0400
committerDavid S. Miller <davem@davemloft.net>2012-04-07 09:41:22 -0400
commit96154cd892c614f13f32996ce75df1442641fb5b (patch)
treebdd4ca7d973305a053895d3ea3cfd5dff428b9cc /elf/dynamic-link.h
parentf8887d0a5feda97244613135822b0439addc2b1f (diff)
downloadglibc-96154cd892c614f13f32996ce75df1442641fb5b.tar
glibc-96154cd892c614f13f32996ce75df1442641fb5b.tar.gz
glibc-96154cd892c614f13f32996ce75df1442641fb5b.tar.bz2
glibc-96154cd892c614f13f32996ce75df1442641fb5b.zip
Simplify _ELF_DYNAMIC_DO_RELOC after combining the old two defs.
* elf/dynamic-link.h (_ELF_DYNAMIC_DO_RELOC): Simplify conditions and remove no longer applicable assertion.
Diffstat (limited to 'elf/dynamic-link.h')
-rw-r--r--elf/dynamic-link.h9
1 files changed, 1 insertions, 8 deletions
diff --git a/elf/dynamic-link.h b/elf/dynamic-link.h
index 310ad5e66e..ef01c61f3e 100644
--- a/elf/dynamic-link.h
+++ b/elf/dynamic-link.h
@@ -278,13 +278,7 @@ elf_get_dynamic_info (struct link_map *l, ElfW(Dyn) *temp)
\
if (__builtin_expect (ranges[0].size, 1)) \
ranges[0].size = (start - ranges[0].start); \
- if (! ELF_DURING_STARTUP \
- && ((do_lazy) \
- /* This test does not only detect whether the relocation \
- sections are in the right order, it also checks whether \
- there is a DT_REL/DT_RELA section. */ \
- || __builtin_expect (ranges[0].start + ranges[0].size \
- != start, 0))) \
+ if (! ELF_DURING_STARTUP && ((do_lazy) || ranges[0].size == 0)) \
{ \
ranges[1].start = start; \
ranges[1].size = (map)->l_info[DT_PLTRELSZ]->d_un.d_val; \
@@ -293,7 +287,6 @@ elf_get_dynamic_info (struct link_map *l, ElfW(Dyn) *temp)
else \
{ \
/* Combine processing the sections. */ \
- assert (ranges[0].start + ranges[0].size == start); \
ranges[0].size += (map)->l_info[DT_PLTRELSZ]->d_un.d_val; \
} \
} \