diff options
| author | Doug Evans <dje@google.com> | 2010-01-21 18:27:32 +0000 |
|---|---|---|
| committer | Doug Evans <dje@google.com> | 2010-01-21 18:27:32 +0000 |
| commit | 7f0e6396a16d31ad830f7546531b78281ef07e01 (patch) | |
| tree | e1430ee7fcd500ed9546abbbb01650073c0ea8af /gdb/gdbserver/linux-arm-low.c | |
| parent | 13fcddfac850e443710bb8cca4508bea8b5fa28a (diff) | |
| download | gdb-7f0e6396a16d31ad830f7546531b78281ef07e01.tar.gz | |
* linux-arm-low.c: Remove redundant include of gdb_proc_service.h.
Only include elf.h if gdb_proc_service.h didn't include linux/elf.h.
Diffstat (limited to 'gdb/gdbserver/linux-arm-low.c')
| -rw-r--r-- | gdb/gdbserver/linux-arm-low.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/gdb/gdbserver/linux-arm-low.c b/gdb/gdbserver/linux-arm-low.c index 965b02926eb..e0afd3a6ce9 100644 --- a/gdb/gdbserver/linux-arm-low.c +++ b/gdb/gdbserver/linux-arm-low.c @@ -20,11 +20,13 @@ #include "server.h" #include "linux-low.h" +/* Don't include elf.h if linux/elf.h got included by gdb_proc_service.h. + On Bionic elf.h and linux/elf.h have conflicting definitions. */ +#ifndef ELFMAG0 #include <elf.h> +#endif #include <sys/ptrace.h> -#include "gdb_proc_service.h" - /* Defined in auto-generated files. */ void init_registers_arm (void); void init_registers_arm_with_iwmmxt (void); |