summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Metzger <markus.t.metzger@intel.com>2015-07-07 13:54:34 +0200
committerMarkus Metzger <markus.t.metzger@intel.com>2015-07-09 08:01:44 +0200
commit80a2b330f7e719cd851242d6f976719586fb9295 (patch)
tree645b4bd42f6cb4d90aa99a45a9fbec7420c50b0e
parentde0ef285459ec1b4330b9eaede88a229380aefa0 (diff)
downloadbinutils-gdb-80a2b330f7e719cd851242d6f976719586fb9295.tar.gz
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.
-rw-r--r--gdb/ChangeLog4
-rw-r--r--gdb/btrace.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 8a971e59d42..1fcf223df28 100644
--- 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 b924e7de6a9..1618e55f664 100644
--- 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;
}