lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-08-01 10:06:57 +03:00
Code Activity

[BZ #10087]

Browse Source 
* elf/dl-runtime.c (_dl_fixup): Use DL_FIXUP_VALUE_ADDR to access
	result of lookup to make call to implement STT_GNU_IFUNC.
	(_dl_profile_fixup): Likewise.
	Patch by H.J. Lu <hjl.tools@gmail.com>.
This commit is contained in:
Ulrich Drepper
2009-04-27 03:01:36 +00:00
parent 1ac03a1e44
commit e49dc847d2
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,5 +1,11 @@
2009-04-26 Ulrich Drepper <drepper@redhat.com> 2009-04-26 Ulrich Drepper <drepper@redhat.com>
[BZ #10087]
* elf/dl-runtime.c (_dl_fixup): Use DL_FIXUP_VALUE_ADDR to access
result of lookup to make call to implement STT_GNU_IFUNC.
(_dl_profile_fixup): Likewise.
Patch by H.J. Lu <hjl.tools@gmail.com>.
* nscd/connections.c (send_ro_fd): Define temporary variable to avoid * nscd/connections.c (send_ro_fd): Define temporary variable to avoid
warning. warning.

8
elf/dl-runtime.c
View File

@ -137,7 +137,7 @@ _dl_fixup (
value = elf_machine_plt_value (l, reloc, value); value = elf_machine_plt_value (l, reloc, value);
if (__builtin_expect (ELFW(ST_TYPE) (sym->st_info) == STT_GNU_IFUNC, 0)) if (__builtin_expect (ELFW(ST_TYPE) (sym->st_info) == STT_GNU_IFUNC, 0))
value = ((DL_FIXUP_VALUE_TYPE (*) (void)) value) (); value = ((DL_FIXUP_VALUE_TYPE (*) (void)) DL_FIXUP_VALUE_ADDR (value)) ();
/* Finally, fix up the plt itself. */ /* Finally, fix up the plt itself. */
if (__builtin_expect (GLRO(dl_bind_not), 0)) if (__builtin_expect (GLRO(dl_bind_not), 0))
@ -225,7 +225,8 @@ _dl_profile_fixup (
if (__builtin_expect (ELFW(ST_TYPE) (defsym->st_info) if (__builtin_expect (ELFW(ST_TYPE) (defsym->st_info)
== STT_GNU_IFUNC, 0)) == STT_GNU_IFUNC, 0))
value = ((DL_FIXUP_VALUE_TYPE (*) (void)) value) (); value = ((DL_FIXUP_VALUE_TYPE (*) (void))
DL_FIXUP_VALUE_ADDR (value)) ();
} }
else else
{ {
@ -235,7 +236,8 @@ _dl_profile_fixup (
if (__builtin_expect (ELFW(ST_TYPE) (refsym->st_info) if (__builtin_expect (ELFW(ST_TYPE) (refsym->st_info)
== STT_GNU_IFUNC, 0)) == STT_GNU_IFUNC, 0))
value = ((DL_FIXUP_VALUE_TYPE (*) (void)) value) (); value = ((DL_FIXUP_VALUE_TYPE (*) (void))
DL_FIXUP_VALUE_ADDR (value)) ();
result = l; result = l;
} }