From: Ulrich Drepper Date: Sat, 28 Sep 2002 04:29:49 +0000 (+0000) Subject: Define macro DO_ELF_MACHINE_REL_RELATIVE for 'elf_machine_rel_relative'. (elf_dynamic... X-Git-Tag: upstream/2.30~21036 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0e312a828297d11d5eee354bbf8a564c6f12c0d4;p=external%2Fglibc.git 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'. --- diff --git a/elf/do-rel.h b/elf/do-rel.h index c693b6f..9ebffd8 100644 --- a/elf/do-rel.h +++ b/elf/do-rel.h @@ -30,6 +30,12 @@ # define RELCOUNT_IDX VERSYMIDX (DT_RELCOUNT) #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 # define VERSYMIDX(sym) (DT_NUM + DT_THISPROCNUM + DT_VERSIONTAGIDX (sym)) #endif @@ -96,8 +102,7 @@ elf_dynamic_do_rel (struct link_map *map, # endif #endif for (; relative < r; ++relative) - elf_machine_rel_relative (l_addr, relative, - (void *) (l_addr + relative->r_offset)); + DO_ELF_MACHINE_REL_RELATIVE (map, l_addr, relative); #ifdef RTLD_BOOTSTRAP /* The dynamic linker always uses versioning. */ @@ -130,4 +135,5 @@ elf_dynamic_do_rel (struct link_map *map, #undef Rel #undef elf_machine_rel #undef elf_machine_rel_relative +#undef DO_ELF_MACHINE_REL_RELATIVE #undef RELCOUNT_IDX