mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2024-11-21 01:12:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix duplicate definition of Elf64_FuncDesc

Browse Source
This commit is contained in:
Aurelien Jarno 2011-07-04 01:45:03 +02:00 committed by Andreas Schwab
parent 25ad0df13b
commit 873a772e30
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2011-07-04 Aurelien Jarno <aurelien@aurel32.net>
* sysdeps/powerpc/dl-tls.h: Add _PPC_DL_TLS_H inclusion
protection macro.
* sysdeps/powerpc/powerpc64/dl-irel.h: Include <ldsodefs.h>
and <dl-machine.h>.
(Elf64_FuncDesc): Remove.
2011-08-22 David S. Miller <davem@davemloft.net>
* sysdeps/unix/sysv/linux/sparc/sparc32/____longjmp_chk.S: Fix

4
sysdeps/powerpc/dl-tls.h
View File

@ -17,6 +17,8 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
#ifndef _PPC_DL_TLS_H
# define _PPC_DL_TLS_H 1
/* Type used for the representation of TLS information in the TOC. */
typedef struct
@ -50,3 +52,5 @@ extern void *__tls_get_addr (tls_index *ti);
/* Value used for dtv entries for which the allocation is delayed. */
#define TLS_DTV_UNALLOCATED ((void *) -1l)
#endif /* dl-tls.h */

11
sysdeps/powerpc/powerpc64/dl-irel.h
View File

@ -1,6 +1,6 @@
/* Machine-dependent ELF indirect relocation inline functions.
PowerPC64 version.
Copyright (C) 2009 Free Software Foundation, Inc.
Copyright (C) 2009, 2011 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
@ -23,16 +23,11 @@
#include <stdio.h>
#include <unistd.h>
#include <ldsodefs.h>
#include <dl-machine.h>
#define ELF_MACHINE_IRELA 1
typedef struct
{
Elf64_Addr fd_func;
Elf64_Addr fd_toc;
Elf64_Addr fd_aux;
} Elf64_FuncDesc;
static inline Elf64_Addr
__attribute ((always_inline))
elf_ifunc_invoke (Elf64_Addr addr)