* arm-linux-tdep.c: Add "elf/common.h" header.

	Remove AT_HWCAP macro definintion as it is provided in
	added include file.
	* s390-tdep.c: Remove system header <elf.h>
	Add "elf/common.h" header for AT_HWCAP definition.
	(s390_core_read_description): Use correct CORE_ADDR
	for hwcap local variable used as third parameter
	of function target_auxv_search.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index dd25f6af4d9698f9c4f83353edcfae68815bb52f..b52ecb02c1b57dff7f092d0a552bbfb44d5e83b6 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,14 @@
+2013-09-16  Pierre Muller  <muller@sourceware.org>
+
+       * arm-linux-tdep.c: Add "elf/common.h" header.
+       Remove AT_HWCAP macro definintion as it is provided in
+       added include file.
+       * s390-tdep.c: Remove system header <elf.h>
+       Add "elf/common.h" header for AT_HWCAP definition.
+       (s390_core_read_description): Use correct CORE_ADDR
+       for hwcap local variable used as third parameter
+       of function target_auxv_search.
+
 2013-09-14  Pierre Muller  <muller@sourceware.org>
            Tom Tromey  <tromey@redhat.com>
            Pedro Alves  <palves@redhat.com>

diff --git a/gdb/arm-linux-tdep.c b/gdb/arm-linux-tdep.c
index 6ac61cc1a14707178bf19bb184533e5d464b60db..7546d34a1bb297c0f540a8a96a755cd9243fc219 100644 (file)
--- a/gdb/arm-linux-tdep.c
+++ b/gdb/arm-linux-tdep.c
@@ -49,12 +49,9 @@
 #include "parser-defs.h"
 #include "user-regs.h"
 #include <ctype.h>
-
+#include "elf/common.h"
 #include "gdb_string.h"
 
-/* This is defined in <elf.h> on ARM GNU/Linux systems.  */
-#define AT_HWCAP        16
-
 extern int arm_apcs_32;
 
 /* Under ARM GNU/Linux the traditional way of performing a breakpoint

diff --git a/gdb/s390-tdep.c b/gdb/s390-tdep.c
index c340758d97ee0ca4f25033fc3156b782c683c682..091d82a76b169d4163475871830cf6aad650132d 100644 (file)
--- a/gdb/s390-tdep.c
+++ b/gdb/s390-tdep.c
@@ -52,7 +52,7 @@
 #include "user-regs.h"
 #include "cli/cli-utils.h"
 #include <ctype.h>
-#include <elf.h>
+#include "elf/common.h"
 
 #include "features/s390-linux32.c"
 #include "features/s390-linux32v1.c"
@@ -807,7 +807,7 @@ s390_core_read_description (struct gdbarch *gdbarch,
   asection *v1 = bfd_get_section_by_name (abfd, ".reg-s390-last-break");
   asection *v2 = bfd_get_section_by_name (abfd, ".reg-s390-system-call");
   asection *section = bfd_get_section_by_name (abfd, ".reg");
-  unsigned long hwcap = 0;
+  CORE_ADDR hwcap = 0;
 
   target_auxv_search (target, AT_HWCAP, &hwcap);
   if (!section)