diff options
| author | Aurelien Jarno <aurelien@aurel32.net> | 2011-07-04 01:45:03 +0200 |
|---|---|---|
| committer | Andreas Schwab <schwab@redhat.com> | 2011-08-23 15:05:32 +0200 |
| commit | 873a772e304d8b56e8f91ac15e9bc08dfde0ffb1 (patch) | |
| tree | 213a01061b0ed967cc7305b90b7be1d1681e3b3c /sysdeps | |
| parent | 25ad0df13b48d9b7cf4db7190cec09d0393bd6d0 (diff) | |
| download | glibc-873a772e304d8b56e8f91ac15e9bc08dfde0ffb1.tar.gz glibc-873a772e304d8b56e8f91ac15e9bc08dfde0ffb1.tar.xz glibc-873a772e304d8b56e8f91ac15e9bc08dfde0ffb1.zip | |
Fix duplicate definition of Elf64_FuncDesc
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/powerpc/dl-tls.h | 4 | ||||
| -rw-r--r-- | sysdeps/powerpc/powerpc64/dl-irel.h | 11 |
2 files changed, 7 insertions, 8 deletions
diff --git a/sysdeps/powerpc/dl-tls.h b/sysdeps/powerpc/dl-tls.h index 9ab81f9965..5fd1b232cf 100644 --- a/sysdeps/powerpc/dl-tls.h +++ b/sysdeps/powerpc/dl-tls.h @@ -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 */ diff --git a/sysdeps/powerpc/powerpc64/dl-irel.h b/sysdeps/powerpc/powerpc64/dl-irel.h index 3c2668fbb7..bd2c73ab0b 100644 --- a/sysdeps/powerpc/powerpc64/dl-irel.h +++ b/sysdeps/powerpc/powerpc64/dl-irel.h @@ -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) |