From 3743bb4fbf22f982f311bba3dd5f1cb5a3dbcf44 Mon Sep 17 00:00:00 2001 From: Doug Evans Date: Thu, 21 Jan 2010 18:27:32 +0000 Subject: [PATCH] * 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. --- gdb/gdbserver/ChangeLog | 5 +++++ gdb/gdbserver/linux-arm-low.c | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index 0d2b3786c31..078de3cb208 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,8 @@ +2010-01-21 Doug Evans + + * 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. + 2010-01-21 Pedro Alves * proc-service.c (ps_lgetregs): Don't refetch registers from the 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 +#endif #include -#include "gdb_proc_service.h" - /* Defined in auto-generated files. */ void init_registers_arm (void); void init_registers_arm_with_iwmmxt (void); -- 2.30.2