diff options
| author | Andreas Schwab <schwab@redhat.com> | 2011-10-04 16:10:16 +0200 |
|---|---|---|
| committer | Andreas Schwab <schwab@redhat.com> | 2011-10-05 14:35:40 +0200 |
| commit | 3a62d00d408e9ec19479b6c7d39e89021061f9cd (patch) | |
| tree | 6f2c708cb3da2fe6d0cbcddfe096cc7e7a8051ba /sysdeps/powerpc | |
| parent | 68577918437e2ccfd6bd2836892f59ef42994963 (diff) | |
| download | glibc-3a62d00d408e9ec19479b6c7d39e89021061f9cd.tar glibc-3a62d00d408e9ec19479b6c7d39e89021061f9cd.tar.gz glibc-3a62d00d408e9ec19479b6c7d39e89021061f9cd.tar.bz2 glibc-3a62d00d408e9ec19479b6c7d39e89021061f9cd.zip | |
Don't call ifunc functions in trace mode
Diffstat (limited to 'sysdeps/powerpc')
| -rw-r--r-- | sysdeps/powerpc/powerpc32/dl-machine.h | 8 | ||||
| -rw-r--r-- | sysdeps/powerpc/powerpc64/dl-machine.h | 15 |
2 files changed, 15 insertions, 8 deletions
diff --git a/sysdeps/powerpc/powerpc32/dl-machine.h b/sysdeps/powerpc/powerpc32/dl-machine.h index e7052b69d5..b24fee0962 100644 --- a/sysdeps/powerpc/powerpc32/dl-machine.h +++ b/sysdeps/powerpc/powerpc32/dl-machine.h @@ -272,7 +272,7 @@ extern void _dl_reloc_overflow (struct link_map *map, auto inline void __attribute__ ((always_inline)) elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc, const Elf32_Sym *sym, const struct r_found_version *version, - void *const reloc_addr_arg) + void *const reloc_addr_arg, int skip_ifunc) { Elf32_Addr *const reloc_addr = reloc_addr_arg; const Elf32_Sym *const refsym = sym; @@ -307,7 +307,8 @@ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc, if (sym != NULL && __builtin_expect (ELFW(ST_TYPE) (sym->st_info) == STT_GNU_IFUNC, 0) - && __builtin_expect (sym->st_shndx != SHN_UNDEF, 1)) + && __builtin_expect (sym->st_shndx != SHN_UNDEF, 1) + && __builtin_expect (!skip_ifunc, 1)) value = ((Elf32_Addr (*) (void)) value) (); /* A small amount of code is duplicated here for speed. In libc, @@ -382,7 +383,8 @@ elf_machine_rela_relative (Elf32_Addr l_addr, const Elf32_Rela *reloc, auto inline void __attribute__ ((always_inline)) elf_machine_lazy_rel (struct link_map *map, - Elf32_Addr l_addr, const Elf32_Rela *reloc) + Elf32_Addr l_addr, const Elf32_Rela *reloc, + int skip_ifunc) { /* elf_machine_runtime_setup handles this. */ } diff --git a/sysdeps/powerpc/powerpc64/dl-machine.h b/sysdeps/powerpc/powerpc64/dl-machine.h index ab90d1e899..f4265bb157 100644 --- a/sysdeps/powerpc/powerpc64/dl-machine.h +++ b/sysdeps/powerpc/powerpc64/dl-machine.h @@ -556,7 +556,8 @@ elf_machine_rela (struct link_map *map, const Elf64_Rela *reloc, const Elf64_Sym *sym, const struct r_found_version *version, - void *const reloc_addr_arg) + void *const reloc_addr_arg, + int skip_ifunc) { Elf64_Addr *const reloc_addr = reloc_addr_arg; const int r_type = ELF64_R_TYPE (reloc->r_info); @@ -579,7 +580,8 @@ elf_machine_rela (struct link_map *map, if (sym != NULL && __builtin_expect (ELFW(ST_TYPE) (sym->st_info) == STT_GNU_IFUNC, 0) - && __builtin_expect (sym->st_shndx != SHN_UNDEF, 1)) + && __builtin_expect (sym->st_shndx != SHN_UNDEF, 1) + && __builtin_expect (!skip_ifunc, 1)) value = resolve_ifunc (value, map, sym_map); /* For relocs that don't edit code, return. @@ -592,12 +594,14 @@ elf_machine_rela (struct link_map *map, return; case R_PPC64_IRELATIVE: - value = resolve_ifunc (value, map, sym_map); + if (__builtin_expect (!skip_ifunc, 1)) + value = resolve_ifunc (value, map, sym_map); *reloc_addr = value; return; case R_PPC64_JMP_IREL: - value = resolve_ifunc (value, map, sym_map); + if (__builtin_expect (!skip_ifunc, 1)) + value = resolve_ifunc (value, map, sym_map); /* Fall thru */ case R_PPC64_JMP_SLOT: #ifdef RESOLVE_CONFLICT_FIND_MAP @@ -846,7 +850,8 @@ elf_machine_rela (struct link_map *map, auto inline void __attribute__ ((always_inline)) elf_machine_lazy_rel (struct link_map *map, - Elf64_Addr l_addr, const Elf64_Rela *reloc) + Elf64_Addr l_addr, const Elf64_Rela *reloc, + int skip_ifunc) { /* elf_machine_runtime_setup handles this. */ } |