From: Andreas Schwab Date: Wed, 5 Oct 2011 09:50:05 +0000 (+0200) Subject: alpha: don't call ifunc functions in trace mode X-Git-Tag: glibc-2.16-ports-before-merge~369 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=989edf2cb0254faa4c7a2e46410bede16c2c0219;p=thirdparty%2Fglibc.git alpha: don't call ifunc functions in trace mode --- diff --git a/ChangeLog.alpha b/ChangeLog.alpha index 55f8768987c..b7d6bb1afb3 100644 --- a/ChangeLog.alpha +++ b/ChangeLog.alpha @@ -1,3 +1,8 @@ +2011-10-05 Andreas Schwab + + * sysdeps/alpha/dl-machine.h (elf_machine_rela) + (elf_machine_lazy_rel): Add parameter skip_ifunc. + 2011-03-28 Aurelien Jarno * sysdeps/unix/sysv/linux/alpha/____longjmp_chk.S(____longjmp_chk): @@ -48,7 +53,7 @@ Define without 64-bit aliases. 2010-05-03 Aurelien Jarno - + * sysdeps/alpha/memchr.S: Use prefetch load. * sysdeps/alpha/alphaev6/memchr.S: Likewise. diff --git a/sysdeps/alpha/dl-machine.h b/sysdeps/alpha/dl-machine.h index e4a502208c6..2790ae5702f 100644 --- a/sysdeps/alpha/dl-machine.h +++ b/sysdeps/alpha/dl-machine.h @@ -1,5 +1,5 @@ /* Machine-dependent ELF dynamic relocation inline functions. Alpha version. - Copyright (C) 1996-2005, 2006 Free Software Foundation, Inc. + Copyright (C) 1996-2005, 2006, 2011 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Richard Henderson . @@ -371,7 +371,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; unsigned long int const r_type = ELF64_R_TYPE (reloc->r_info); @@ -514,7 +515,8 @@ elf_machine_rela_relative (Elf64_Addr l_addr, const Elf64_Rela *reloc, 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) { Elf64_Addr * const reloc_addr = (void *)(l_addr + reloc->r_offset); unsigned long int const r_type = ELF64_R_TYPE (reloc->r_info);