mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2024-11-27 03:41:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

libc part of prelink IFUNC support.

Browse Source 
The dl-lookup.c changes are needed for prelink (support in prelink
checked into SVN, tested for both i?86 and x86-64), dl-irel.h just
something I discovered by code inspection.
This commit is contained in:
Jakub Jelinek 2009-06-15 07:46:53 -07:00 committed by Ulrich Drepper
parent 0efa1cd30f
commit 0212596218
3 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2009-06-15 Jakub Jelinek <jakub@redhat.com>
* elf/dl-lookup.c (_dl_debug_bindings): When resolving to
STT_GNU_IFUNC symbol or in 8 into type_class.
* sysdeps/i386/dl-irel.h (elf_irel): Use Elf32_Addr type
instead of Elf64_Addr.
2009-06-14 Ulrich Drepper <drepper@redhat.com>
* po/sv.po: Update from translation team.

17
elf/dl-lookup.c
View File

@ -1,5 +1,5 @@
/* Look up a symbol in the loaded objects.
Copyright (C) 1995-2005, 2006, 2007 Free Software Foundation, Inc.
Copyright (C) 1995-2005, 2006, 2007, 2009 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
@ -542,15 +542,20 @@ _dl_debug_bindings (const char *undef_name, struct link_map *undef_map,
conflict = 1;
}
if (value->s
&& (__builtin_expect (ELFW(ST_TYPE) (value->s->st_info)
== STT_TLS, 0)))
type_class = 4;
if (value->s)
{
if (__builtin_expect (ELFW(ST_TYPE) (value->s->st_info)
== STT_TLS, 0))
type_class = 4;
else if (__builtin_expect (ELFW(ST_TYPE) (value->s->st_info)
== STT_GNU_IFUNC, 0))
type_class |= 8;
}
if (conflict
|| GLRO(dl_trace_prelink_map) == undef_map
|| GLRO(dl_trace_prelink_map) == NULL
|| type_class == 4)
|| type_class >= 4)
{
_dl_printf ("%s 0x%0*Zx 0x%0*Zx -> 0x%0*Zx 0x%0*Zx ",
conflict ? "conflict" : "lookup",

2
sysdeps/i386/dl-irel.h
View File

@ -35,7 +35,7 @@ elf_irel (const Elf32_Rel *reloc)
if (__builtin_expect (r_type == R_386_IRELATIVE, 1))
{
Elf64_Addr value = ((Elf32_Addr (*) (void)) (*reloc_addr)) ();
Elf32_Addr value = ((Elf32_Addr (*) (void)) (*reloc_addr)) ();
*reloc_addr = value;
}
else