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 /elf/dl-conflict.c | |
| 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 'elf/dl-conflict.c')
| -rw-r--r-- | elf/dl-conflict.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/elf/dl-conflict.c b/elf/dl-conflict.c index b730105628..653e446170 100644 --- a/elf/dl-conflict.c +++ b/elf/dl-conflict.c @@ -1,5 +1,5 @@ /* Resolve conflicts against already prelinked libraries. - Copyright (C) 2001, 2002, 2003, 2004, 2005, 2008 Free Software Foundation, Inc. + Copyright (C) 2001, 2002, 2003, 2004, 2005, 2008, 2011 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Jakub Jelinek <jakub@redhat.com>, 2001. @@ -69,7 +69,8 @@ _dl_resolve_conflicts (struct link_map *l, ElfW(Rela) *conflict, GL(dl_num_cache_relocations) += conflictend - conflict; for (; conflict < conflictend; ++conflict) - elf_machine_rela (l, conflict, NULL, NULL, (void *) conflict->r_offset); + elf_machine_rela (l, conflict, NULL, NULL, (void *) conflict->r_offset, + 0); } #endif } |