mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-25 18:53:34 +08:00
Merge branch 'master' of ssh://sourceware.org/git/glibc
Conflicts: ChangeLog
This commit is contained in:
commit
2c0e54ff32
@ -4,6 +4,12 @@
|
||||
are re-adding the entry.
|
||||
* nscd/servicescache.c (cache_addserv): Likewise.
|
||||
|
||||
2011-06-30 Aurelien Jarno <aurelien@aurel32.net>
|
||||
|
||||
* sysdeps/generic/dl-irel.h: fix protection against multiple
|
||||
inclusions.
|
||||
* sysdeps/generic/dl-irel.h (elf_ifunc_invoke): New.
|
||||
|
||||
2011-06-28 Ulrich Drepper <drepper@gmail.com>
|
||||
|
||||
[BZ #12935]
|
||||
|
@ -17,7 +17,14 @@
|
||||
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
||||
02111-1307 USA. */
|
||||
|
||||
#ifndef _DL_IREL_h
|
||||
#ifndef _DL_IREL_H
|
||||
#define _DL_IREL_H
|
||||
|
||||
static inline DL_FIXUP_VALUE_TYPE
|
||||
__attribute ((always_inline))
|
||||
elf_ifunc_invoke (ElfW(Addr) addr)
|
||||
{
|
||||
return ((DL_FIXUP_VALUE_TYPE (*) (void)) (addr)) ();
|
||||
}
|
||||
|
||||
#endif /* dl-irel.h */
|
||||
|
Loading…
Reference in New Issue
Block a user