aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@redhat.com>2011-10-05 11:50:05 +0200
committerAndreas Schwab <schwab@redhat.com>2011-10-05 11:50:05 +0200
commit989edf2cb0254faa4c7a2e46410bede16c2c0219 (patch)
tree9095893158e50bbad80d806b8c2c944ecca22520
parent560d4a5882df782e1ede396870ec18e382842bae (diff)
downloadglibc-989edf2cb0254faa4c7a2e46410bede16c2c0219.tar
glibc-989edf2cb0254faa4c7a2e46410bede16c2c0219.tar.gz
glibc-989edf2cb0254faa4c7a2e46410bede16c2c0219.tar.bz2
glibc-989edf2cb0254faa4c7a2e46410bede16c2c0219.zip
alpha: don't call ifunc functions in trace mode
-rw-r--r--ChangeLog.alpha7
-rw-r--r--sysdeps/alpha/dl-machine.h8
2 files changed, 11 insertions, 4 deletions
diff --git a/ChangeLog.alpha b/ChangeLog.alpha
index 55f8768987..b7d6bb1afb 100644
--- a/ChangeLog.alpha
+++ b/ChangeLog.alpha
@@ -1,3 +1,8 @@
+2011-10-05 Andreas Schwab <schwab@redhat.com>
+
+ * sysdeps/alpha/dl-machine.h (elf_machine_rela)
+ (elf_machine_lazy_rel): Add parameter skip_ifunc.
+
2011-03-28 Aurelien Jarno <aurelien@aurel32.net>
* sysdeps/unix/sysv/linux/alpha/____longjmp_chk.S(____longjmp_chk):
@@ -48,7 +53,7 @@
Define without 64-bit aliases.
2010-05-03 Aurelien Jarno <aurelien@aurel32.net>
-
+
* 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 e4a502208c..2790ae5702 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 <rth@tamu.edu>.
@@ -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);