This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[RFA]: ELF include file cleanup in linux-low.c
- From: dje at google dot com (Doug Evans)
- To: gdb-patches at sourceware dot org
- Date: Mon, 21 Dec 2009 18:35:42 -0800 (PST)
- Subject: [RFA]: ELF include file cleanup in linux-low.c
Hi.
This patches replaces the use of elf files from the source tree
with system-provided elf files (per discussion with drow on irc).
Ok to check in?
Tested by running the testsuite with --target_board=native-gdbserver
with a native i686-linux configuration with a 64-bit gdb.
[As a sanity check.]
2009-12-21 Doug Evans <dje@google.com>
* linux-low.c: Delete inclusion of ansidecl.h, elf/common.h,
elf/external.h. Include <elf.h> instead but only if necessary.
Index: linux-low.c
===================================================================
RCS file: /cvs/src/src/gdb/gdbserver/linux-low.c,v
retrieving revision 1.118
diff -u -p -r1.118 linux-low.c
--- linux-low.c 21 Dec 2009 21:23:43 -0000 1.118
+++ linux-low.c 22 Dec 2009 01:40:18 -0000
@@ -19,9 +19,6 @@
#include "server.h"
#include "linux-low.h"
-#include "ansidecl.h" /* For ATTRIBUTE_PACKED, must be bug in external.h. */
-#include "elf/common.h"
-#include "elf/external.h"
#include <sys/wait.h>
#include <stdio.h>
@@ -42,6 +39,13 @@
#include <dirent.h>
#include <sys/stat.h>
#include <sys/vfs.h>
+#ifndef ELFMAG0
+/* Don't include <linux/elf.h> here. If it got included by gdb_proc_service.h
+ then ELFMAG0 will have been defined. If it didn't get included by
+ gdb_proc_service.h then including it will likely introduce a duplicate
+ definition of elf_fpregset_t. */
+#include <elf.h>
+#endif
#ifndef SPUFS_MAGIC
#define SPUFS_MAGIC 0x23c9b64e
@@ -191,7 +195,7 @@ linux_child_pid_to_exec_file (int pid)
/* Return non-zero if HEADER is a 64-bit ELF file. */
static int
-elf_64_header_p (const Elf64_External_Ehdr *header)
+elf_64_header_p (const Elf64_Ehdr *header)
{
return (header->e_ident[EI_MAG0] == ELFMAG0
&& header->e_ident[EI_MAG1] == ELFMAG1
@@ -207,7 +211,7 @@ elf_64_header_p (const Elf64_External_Eh
int
elf_64_file_p (const char *file)
{
- Elf64_External_Ehdr header;
+ Elf64_Ehdr header;
int fd;
fd = open (file, O_RDONLY);