mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-22 19:00:07 +00:00
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.
This commit is contained in:
parent
f8887d0a5f
commit
96154cd892
@ -1,3 +1,8 @@
|
||||
2012-04-07 Carlos O'Donell <carlos_odonell@mentor.com>
|
||||
|
||||
* elf/dynamic-link.h (_ELF_DYNAMIC_DO_RELOC): Simplify
|
||||
conditions and remove no longer applicable assertion.
|
||||
|
||||
2012-04-06 H.J. Lu <hongjiu.lu@intel.com>
|
||||
|
||||
* bits/byteswap.h (__bswap_16): Removed.
|
||||
|
@ -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; \
|
||||
} \
|
||||
} \
|
||||
|
Loading…
Reference in New Issue
Block a user