diff options
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/generic/ldsodefs.h | 2 | ||||
| -rw-r--r-- | sysdeps/ia64/Versions | 1 | ||||
| -rw-r--r-- | sysdeps/ia64/dl-lookupcfg.h | 14 | ||||
| -rw-r--r-- | sysdeps/ia64/dl-machine.h | 7 | ||||
| -rw-r--r-- | sysdeps/ia64/dl-symaddr.c | 6 |
5 files changed, 19 insertions, 11 deletions
diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h index e16a42afc2..ad4cbe61b5 100644 --- a/sysdeps/generic/ldsodefs.h +++ b/sysdeps/generic/ldsodefs.h @@ -70,6 +70,8 @@ typedef ElfW(Addr) lookup_t; # define DL_SYMBOL_ADDRESS(map, ref) \ (void *) (LOOKUP_VALUE_ADDRESS (map) + ref->st_value) # define DL_LOOKUP_ADDRESS(addr) ((ElfW(Addr)) (addr)) +# define DL_DT_INIT_ADDRESS(map, start) (start) +# define DL_DT_FINI_ADDRESS(map, start) (start) #endif /* Unmap a loaded object, called by _dl_close (). */ diff --git a/sysdeps/ia64/Versions b/sysdeps/ia64/Versions index 20fea950ea..1e1387f9d4 100644 --- a/sysdeps/ia64/Versions +++ b/sysdeps/ia64/Versions @@ -2,5 +2,6 @@ ld { GLIBC_2.2 { # ia64 specific functions in the dynamic linker, but used by libc.so. _dl_symbol_address; _dl_unmap; _dl_lookup_address; + _dl_function_address; } } diff --git a/sysdeps/ia64/dl-lookupcfg.h b/sysdeps/ia64/dl-lookupcfg.h index 4e14e3b450..252e697951 100644 --- a/sysdeps/ia64/dl-lookupcfg.h +++ b/sysdeps/ia64/dl-lookupcfg.h @@ -23,14 +23,22 @@ #define ELF_FUNCTION_PTR_IS_SPECIAL #define DL_UNMAP_IS_SPECIAL -void *_dl_symbol_address (const struct link_map *map, const ElfW(Sym) *ref); +extern void *_dl_symbol_address (const struct link_map *map, + const Elf64_Sym *ref); #define DL_SYMBOL_ADDRESS(map, ref) _dl_symbol_address(map, ref) -Elf64_Addr _dl_lookup_address (const void *address); +extern Elf64_Addr _dl_lookup_address (const void *address); #define DL_LOOKUP_ADDRESS(addr) _dl_lookup_address (addr) -void _dl_unmap (struct link_map *map); +extern void _dl_unmap (struct link_map *map); #define DL_UNMAP(map) _dl_unmap (map) + +extern Elf64_Addr _dl_function_address (const struct link_map *map, + Elf64_Addr start); + +#define DL_FUNCTION_ADDRESS(map, addr) _dl_function_address (map, addr) +#define DL_DT_INIT_ADDRESS(map, addr) DL_FUNCTION_ADDRESS (map, addr) +#define DL_DT_FINI_ADDRESS(map, addr) DL_FUNCTION_ADDRESS (map, addr) diff --git a/sysdeps/ia64/dl-machine.h b/sysdeps/ia64/dl-machine.h index 92aad5af47..0b0352083c 100644 --- a/sysdeps/ia64/dl-machine.h +++ b/sysdeps/ia64/dl-machine.h @@ -424,14 +424,11 @@ _dl_start_user: #define ELF_MACHINE_NO_REL 1 /* Return the address of the entry point. */ -extern ElfW(Addr) _dl_start_address (const struct link_map *map, - ElfW(Addr) start); - #define ELF_MACHINE_START_ADDRESS(map, start) \ - _dl_start_address ((map), (start)) + DL_FUNCTION_ADDRESS (map, start) #define elf_machine_profile_fixup_plt(l, reloc, rel_addr, value) \ - elf_machine_fixup_plt ((l), (reloc), (rel_addr), (value)) + elf_machine_fixup_plt (l, reloc, rel_addr, value) #define elf_machine_profile_plt(reloc_addr) ((Elf64_Addr) (reloc_addr)) diff --git a/sysdeps/ia64/dl-symaddr.c b/sysdeps/ia64/dl-symaddr.c index bc3301c707..1375cc6a2f 100644 --- a/sysdeps/ia64/dl-symaddr.c +++ b/sysdeps/ia64/dl-symaddr.c @@ -21,7 +21,7 @@ #include <dl-machine.h> void * -_dl_symbol_address (const struct link_map *map, const ElfW(Sym) *ref) +_dl_symbol_address (const struct link_map *map, const Elf64_Sym *ref) { Elf64_Addr value = (map ? map->l_addr : 0) + ref->st_value; @@ -32,8 +32,8 @@ _dl_symbol_address (const struct link_map *map, const ElfW(Sym) *ref) return (void *) value; } -ElfW(Addr) -_dl_start_address (const struct link_map *map, ElfW(Addr) start) +Elf64_Addr +_dl_function_address (const struct link_map *map, Elf64_Addr start) { return __ia64_make_fptr (map, start, &__fptr_root, NULL); } |