From bf5316f3a608b608da66b4d6e9b61a4da035fb35 Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Wed, 5 Oct 2011 11:51:18 +0200 Subject: [PATCH] am33: don't call ifunc functions in trace mode --- ChangeLog.am33 | 5 +++++ sysdeps/am33/dl-machine.h | 7 ++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog.am33 b/ChangeLog.am33 index e9b19bd3c4..ccffef38fc 100644 --- a/ChangeLog.am33 +++ b/ChangeLog.am33 @@ -1,3 +1,8 @@ +2011-10-05 Andreas Schwab + + * sysdeps/am33/dl-machine.h (elf_machine_rela) + (elf_machine_lazy_rel): Add parameter skip_ifunc. + 2007-10-22 Daniel Jacobowitz * sysdeps/unix/sysv/linux/am33/bits/fcntl.h (F_DUPFD_CLOEXEC): Define. diff --git a/sysdeps/am33/dl-machine.h b/sysdeps/am33/dl-machine.h index 808fd9cc82..ffd866ac1f 100644 --- a/sysdeps/am33/dl-machine.h +++ b/sysdeps/am33/dl-machine.h @@ -1,5 +1,5 @@ /* Machine-dependent ELF dynamic relocation inline functions. AM33 version. - Copyright (C) 1995,96,97,98,99,2000,2001, 2004 + Copyright (C) 1995,96,97,98,99,2000,2001, 2004, 2011 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -296,7 +296,7 @@ elf_machine_plt_value (struct link_map *map, const Elf32_Rela *reloc, static inline void 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) { const unsigned int r_type = ELF32_R_TYPE (reloc->r_info); Elf32_Addr value, *reloc_addr; @@ -457,7 +457,8 @@ elf_machine_rela_relative (Elf32_Addr l_addr, const Elf32_Rela *reloc, static inline void 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) { unsigned long int const r_type = ELF32_R_TYPE (reloc->r_info); -- 2.11.4.GIT