Define macro DO_ELF_MACHINE_REL_RELATIVE for 'elf_machine_rel_relative'. (elf_dynamic_do_rel): Call DO_ELF_MACHINE_REL_RELATIVE macro instead of 'elf_machine_rel_relative'.
This commit is contained in:
parent
2c536abd23
commit
0e312a8282
10
elf/do-rel.h
10
elf/do-rel.h
@ -30,6 +30,12 @@
|
|||||||
# define RELCOUNT_IDX VERSYMIDX (DT_RELCOUNT)
|
# define RELCOUNT_IDX VERSYMIDX (DT_RELCOUNT)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifndef DO_ELF_MACHINE_REL_RELATIVE
|
||||||
|
# define DO_ELF_MACHINE_REL_RELATIVE(map, l_addr, relative) \
|
||||||
|
elf_machine_rel_relative (l_addr, relative, \
|
||||||
|
(void *) (l_addr + relative->r_offset))
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifndef VERSYMIDX
|
#ifndef VERSYMIDX
|
||||||
# define VERSYMIDX(sym) (DT_NUM + DT_THISPROCNUM + DT_VERSIONTAGIDX (sym))
|
# define VERSYMIDX(sym) (DT_NUM + DT_THISPROCNUM + DT_VERSIONTAGIDX (sym))
|
||||||
#endif
|
#endif
|
||||||
@ -96,8 +102,7 @@ elf_dynamic_do_rel (struct link_map *map,
|
|||||||
# endif
|
# endif
|
||||||
#endif
|
#endif
|
||||||
for (; relative < r; ++relative)
|
for (; relative < r; ++relative)
|
||||||
elf_machine_rel_relative (l_addr, relative,
|
DO_ELF_MACHINE_REL_RELATIVE (map, l_addr, relative);
|
||||||
(void *) (l_addr + relative->r_offset));
|
|
||||||
|
|
||||||
#ifdef RTLD_BOOTSTRAP
|
#ifdef RTLD_BOOTSTRAP
|
||||||
/* The dynamic linker always uses versioning. */
|
/* The dynamic linker always uses versioning. */
|
||||||
@ -130,4 +135,5 @@ elf_dynamic_do_rel (struct link_map *map,
|
|||||||
#undef Rel
|
#undef Rel
|
||||||
#undef elf_machine_rel
|
#undef elf_machine_rel
|
||||||
#undef elf_machine_rel_relative
|
#undef elf_machine_rel_relative
|
||||||
|
#undef DO_ELF_MACHINE_REL_RELATIVE
|
||||||
#undef RELCOUNT_IDX
|
#undef RELCOUNT_IDX
|
||||||
|
Loading…
x
Reference in New Issue
Block a user