[PATCH] Fix build on ppc64
Ryan S. Arnold
ryan.arnold@gmail.com
Sun Jul 10 20:26:00 GMT 2011
On Sun, Jul 3, 2011 at 6:45 PM, Aurelien Jarno <aurelien@aurel32.net> wrote:
> Commit 42675c6ff0e95346de8a2cbc066e14e0d6a856e4 added include of
> <dl-irel.h> from dl-runtime.c, which was already including
> <dl-machine.h>. This breaks ppc64 build as both files declare
> Elf64_FuncDesc:
>
> | In file included from dl-runtime.c:30:
> | ../sysdeps/powerpc/powerpc64/dl-irel.h:34: error: conflicting types for 'Elf64_FuncDesc'
> | ../sysdeps/powerpc/powerpc64/dl-machine.h:43: note: previous declaration of 'Elf64_FuncDesc' was here
>
> The patch below fixes the problem.
>
> 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(Elf64_FuncDesc): include
> <ldsodefs.h> and <dl-machine.h>.
> * sysdeps/powerpc/powerpc64/dl-irel.h(Elf64_FuncDesc): remove.
>
...
> --
> Aurelien Jarno GPG: 1024D/F1BCDB73
> aurelien@aurel32.net http://www.aurel32.net
This patch looks good. We've tested and verified that it solves the
problem. Please commit.
Ryan S. Arnold
More information about the Libc-alpha
mailing list