system/glibc
3
0
Fork 0
Code Issues Projects Releases Wiki Activity

Cleanup last patch

Browse Source
This commit is contained in:
Ulrich Drepper 2011-10-16 10:24:02 -04:00
parent e453f6cd0c
commit aac13307d6
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
elf/do-rel.h
View File

@ -49,7 +49,8 @@
auto inline void __attribute__ ((always_inline)) auto inline void __attribute__ ((always_inline))
elf_dynamic_do_Rel (struct link_map *map, elf_dynamic_do_Rel (struct link_map *map,
ElfW(Addr) reladdr, ElfW(Addr) relsize, ElfW(Addr) reladdr, ElfW(Addr) relsize,
ElfW(Word) nrelative, int lazy, int skip_ifunc) __typeof (((ElfW(Dyn) *) 0)->d_un.d_val) nrelative,
int lazy, int skip_ifunc)
{ {
const ElfW(Rel) *r = (const void *) reladdr; const ElfW(Rel) *r = (const void *) reladdr;
const ElfW(Rel) *end = (const void *) (reladdr + relsize); const ElfW(Rel) *end = (const void *) (reladdr + relsize);

6
elf/dynamic-link.h
View File

@ -258,7 +258,8 @@ elf_get_dynamic_info (struct link_map *l, ElfW(Dyn) *temp)
# ifdef ELF_MACHINE_PLTREL_OVERLAP # ifdef ELF_MACHINE_PLTREL_OVERLAP
# define _ELF_DYNAMIC_DO_RELOC(RELOC, reloc, map, do_lazy, skip_ifunc, test_rel) \ # define _ELF_DYNAMIC_DO_RELOC(RELOC, reloc, map, do_lazy, skip_ifunc, test_rel) \
do { \ do { \
struct { ElfW(Addr) start, size; ElfW(Word) nrelative; int lazy; } \ struct { ElfW(Addr) start, size; \
__typeof (((ElfW(Dyn) *) 0)->d_un.d_val) nrelative; int lazy; } \
ranges[3]; \ ranges[3]; \
int ranges_index; \ int ranges_index; \
\ \
@ -299,7 +300,8 @@ elf_get_dynamic_info (struct link_map *l, ElfW(Dyn) *temp)
# else # else
# define _ELF_DYNAMIC_DO_RELOC(RELOC, reloc, map, do_lazy, skip_ifunc, test_rel) \ # define _ELF_DYNAMIC_DO_RELOC(RELOC, reloc, map, do_lazy, skip_ifunc, test_rel) \
do { \ do { \
struct { ElfW(Addr) start, size; ElfW(Word) nrelative; int lazy; } \ struct { ElfW(Addr) start, size; \
__typeof (((ElfW(Dyn) *) 0)->d_un.d_val) nrelative; int lazy; } \
ranges[2] = { { 0, 0, 0, 0 }, { 0, 0, 0, 0 } }; \ ranges[2] = { { 0, 0, 0, 0 }, { 0, 0, 0, 0 } }; \
\ \
if ((map)->l_info[DT_##RELOC]) \ if ((map)->l_info[DT_##RELOC]) \