This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
Re: [PATCH] Fix build on ppc64
- From: "Ryan S. Arnold" <ryan dot arnold at gmail dot com>
- To: Aurelien Jarno <aurelien at aurel32 dot net>
- Cc: libc-alpha at sourceware dot org, "David S. Miller" <davem at davemloft dot net>
- Date: Fri, 8 Jul 2011 13:28:55 -0500
- Subject: Re: [PATCH] Fix build on ppc64
- References: <20110703234503.GA4648@volta.aurel32.net>
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