Merge branch 'master' of ssh://sourceware.org/git/glibc

Conflicts:
	ChangeLog
This commit is contained in:
Ulrich Drepper 2011-06-29 23:36:11 -04:00
commit 2c0e54ff32
2 changed files with 14 additions and 1 deletions

View File

@ -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]

View File

@ -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 */