diff options
| author | Andreas Schwab <schwab@redhat.com> | 2011-10-05 11:52:26 +0200 |
|---|---|---|
| committer | Andreas Schwab <schwab@redhat.com> | 2011-10-05 11:52:26 +0200 |
| commit | 86a90a837cde86d73d23216ea22cb153cddf4959 (patch) | |
| tree | 724c37083eba1d027f77e6e0a39053264b2f90db | |
| parent | 0507f293c9b67d8eec92e8178308d72f1ed88449 (diff) | |
| download | glibc-86a90a837cde86d73d23216ea22cb153cddf4959.tar.xz glibc-86a90a837cde86d73d23216ea22cb153cddf4959.zip | |
cris: don't call ifunc functions in trace mode
| -rw-r--r-- | ChangeLog.cris | 5 | ||||
| -rw-r--r-- | sysdeps/cris/dl-machine.h | 7 |
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog.cris b/ChangeLog.cris index 810b53b329..da1ad973f1 100644 --- a/ChangeLog.cris +++ b/ChangeLog.cris @@ -1,3 +1,8 @@ +2011-10-05 Andreas Schwab <schwab@redhat.com> + + * sysdeps/cris/dl-machine.h (elf_machine_rela) + (elf_machine_lazy_rel): Add parameter skip_ifunc. + 2007-10-22 Daniel Jacobowitz <dan@codesourcery.com> * sysdeps/unix/sysv/linux/cris/bits/fcntl.h (F_DUPFD_CLOEXEC): Define. diff --git a/sysdeps/cris/dl-machine.h b/sysdeps/cris/dl-machine.h index 368733e73f..cc3701e591 100644 --- a/sysdeps/cris/dl-machine.h +++ b/sysdeps/cris/dl-machine.h @@ -1,5 +1,5 @@ /* Machine-dependent ELF dynamic relocation inline functions. CRIS version. - Copyright (C) 1996-2001, 2002, 2003 Free Software Foundation, Inc. + Copyright (C) 1996-2001, 2002, 2003, 2011 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -285,7 +285,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) { Elf32_Addr *const reloc_addr = reloc_addr_arg; const unsigned int r_type = ELF32_R_TYPE (reloc->r_info); @@ -378,7 +378,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) { Elf32_Addr *const reloc_addr = (void *) (l_addr + reloc->r_offset); const unsigned int r_type = ELF32_R_TYPE (reloc->r_info); |
