[Patch] PR16445 - fix build of binutils-gdb

[Tobias Burnus]

On Fri, Jan 17, 2014 at 02:23:59PM +0000, Pedro Alves wrote:
> On 01/17/2014 08:47 AM, Tobias Burnus wrote:
> > building the GIT version of binutils-gdb fails on RHEL 6 since a couple
> > of days, using the current trunk build of GCC 4.9. It did work on January 10.
> Hmm, what changed on January 10?

It could also be a few days later, I not doing daily builds.

> Does this work for you?

Yes - I have successfully built binutils-gdb with your patch
into an empty directory.

Tobias

>  gdb/gdbserver/linux-x86-low.c | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/gdb/gdbserver/linux-x86-low.c b/gdb/gdbserver/linux-x86-low.c
> index 04fa3c9..e1daa7d 100644
> --- a/gdb/gdbserver/linux-x86-low.c
> +++ b/gdb/gdbserver/linux-x86-low.c
> @@ -26,9 +26,14 @@
>  #include "i387-fp.h"
>  #include "i386-low.h"
>  #include "i386-xstate.h"
> -#include "elf/common.h"
> 
>  #include "gdb_proc_service.h"
> +/* Don't include elf/common.h if linux/elf.h got included by
> +   gdb_proc_service.h.  */
> +#ifndef ELFMAG0
> +#include "elf/common.h"
> +#endif
> +
>  #include "agent.h"
>  #include "tdesc.h"
>  #include "tracepoint.h"
> -- 
> 1.7.11.7