diff options
| author | Pedro Alves <palves@redhat.com> | 2014-01-17 13:33:30 +0000 |
|---|---|---|
| committer | Pedro Alves <palves@redhat.com> | 2014-01-17 13:33:30 +0000 |
| commit | b5737fa98a3a488dbdc0c6aa7391cd038f6d24f1 (patch) | |
| tree | ceb6078a2c3cb9c116ed4f3afe35572b21dccbd2 /gdb/gdbserver | |
| parent | 69f9764846ca76d780e0ecd8b688200561f7c9bb (diff) | |
| download | gdb-b5737fa98a3a488dbdc0c6aa7391cd038f6d24f1.zip gdb-b5737fa98a3a488dbdc0c6aa7391cd038f6d24f1.tar.gz gdb-b5737fa98a3a488dbdc0c6aa7391cd038f6d24f1.tar.bz2 | |
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 <palves@redhat.com>
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.
Diffstat (limited to 'gdb/gdbserver')
| -rw-r--r-- | gdb/gdbserver/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/gdbserver/linux-x86-low.c | 7 |
2 files changed, 12 insertions, 1 deletions
diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index c387aa6..cbe90c7 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,9 @@ +2014-01-17 Pedro Alves <palves@redhat.com> + + 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 <dje@google.com> * dll.c (UNSPECIFIED_CORE_ADDR): New macro. 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" |