From b5737fa98a3a488dbdc0c6aa7391cd038f6d24f1 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Fri, 17 Jan 2014 13:33:30 +0000 Subject: [PATCH] Fix PR PR16445 - gdbserver build failure on x86. If gdb_proc_service.h ends up including linux/elf.h, we'll trip on duplicate definitions: In file included from ../../../gdb/gdbserver/linux-x86-low.c:29:0: ../../../gdb/gdbserver/../../include/elf/common.h:36:0: error: "ELFMAG0" redefined [-Werror] ... etc ... Handle this the same way linux-low.c and linux-arm-low.c handle this. gdb/gdbserver/ 2014-01-17 Pedro Alves PR PR16445 * linux-x86-low.c (linux-x86-low.c): Don't include elf/common.h if ELFMAG0 is defined after including gdb_proc_service.h. --- gdb/gdbserver/ChangeLog | 6 ++++++ gdb/gdbserver/linux-x86-low.c | 7 ++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index c387aa64ce..cbe90c7450 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,9 @@ +2014-01-17 Pedro Alves + + PR PR16445 + * linux-x86-low.c (linux-x86-low.c): Don't include elf/common.h if + ELFMAG0 is defined after including gdb_proc_service.h. + 2014-01-16 Doug Evans * dll.c (UNSPECIFIED_CORE_ADDR): New macro. diff --git a/gdb/gdbserver/linux-x86-low.c b/gdb/gdbserver/linux-x86-low.c index 04fa3c9be2..e1daa7da7f 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" -- 2.34.1