btrace: fix build fail with 32-bit BFD

When compiling GDB with 32-bit BFD, the build fails with:

In file included from btrace.h:33:0,
                 from btrace.c:23:
/usr/include/intel-pt.h:1643:51: note: expected 'int (*)(uint8_t *, size_t,
 const struct pt_asid *, uint64_t, void *)' but argument is of type 'int
 (*)(gdb_byte *, size_t, const struct pt_asid *, CORE_ADDR, void *)' extern
 pt_export int pt_image_set_callback(struct pt_image *image, ^

gdb/
	* btrace.c (btrace_pt_readmem_callback): Change type of PC argument.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 8a971e59d42080a3fcbbbc7bb334cb84f798a0b6..1fcf223df286c568eef09db12236f3dc9c4b7f03 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2015-07-09  Markus Metzger  <markus.t.metzger@intel.com>
+
+       * btrace.c (btrace_pt_readmem_callback): Change type of PC argument.
+
 2015-07-08  Simon Marchi  <simon.marchi@ericsson.com>
 
        * progspace.c (delete_program_space): Add missing spaces.

diff --git a/gdb/btrace.c b/gdb/btrace.c
index b924e7de6a902c62b8df39720fbcada27c1b9c57..1618e55f6646d6ff1f7d7c6f2ace7fe6375a36a9 100644 (file)
--- a/gdb/btrace.c
+++ b/gdb/btrace.c
@@ -824,14 +824,14 @@ ftrace_add_pt (struct pt_insn_decoder *decoder,
 
 static int
 btrace_pt_readmem_callback (gdb_byte *buffer, size_t size,
-                           const struct pt_asid *asid, CORE_ADDR pc,
+                           const struct pt_asid *asid, uint64_t pc,
                            void *context)
 {
   int errcode;
 
   TRY
     {
-      errcode = target_read_code (pc, buffer, size);
+      errcode = target_read_code ((CORE_ADDR) pc, buffer, size);
       if (errcode != 0)
        return -pte_nomap;
     }