This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[PATCH 2/2] Handle void * conversions in FreeBSD/x86 native code to fix C++ build.
- From: John Baldwin <jhb at FreeBSD dot org>
- To: gdb-patches at sourceware dot org
- Date: Tue, 19 Apr 2016 14:40:03 -0700
- Subject: [PATCH 2/2] Handle void * conversions in FreeBSD/x86 native code to fix C++ build.
- Authentication-results: sourceware.org; auth=none
- References: <cover dot 1461101705 dot git dot jhb at FreeBSD dot org>
- References: <cover dot 1461101705 dot git dot jhb at FreeBSD dot org>
gdb/ChangeLog:
* amd64bsd-nat.c (amd64bsd_fetch_inferior_registers): Change xstateregs
to void *.
(amd64bsd_store_inferior_registers): Likewise.
* fbsd-nat.c (resume_one_thread_cb): Explicitly cast data to ptid_t *.
(resume_all_threads_cb): Likewise.
* i386bsd-nat.c (i386bsd_supply_gregset): Cast gregs to char *.
(i386bsd_collect_gregset): Likewise.
(i386bsd_fetch_inferior_registers): Change xstateregs to void *.
(i386bsd_store_inferior_registers): Likewise.
---
gdb/ChangeLog | 12 ++++++++++++
gdb/amd64bsd-nat.c | 4 ++--
gdb/fbsd-nat.c | 4 ++--
gdb/i386bsd-nat.c | 8 ++++----
4 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 6f681b9..a3d0500 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,17 @@
2016-04-19 John Baldwin <jhb@FreeBSD.org>
+ * amd64bsd-nat.c (amd64bsd_fetch_inferior_registers): Change xstateregs
+ to void *.
+ (amd64bsd_store_inferior_registers): Likewise.
+ * fbsd-nat.c (resume_one_thread_cb): Explicitly cast data to ptid_t *.
+ (resume_all_threads_cb): Likewise.
+ * i386bsd-nat.c (i386bsd_supply_gregset): Cast gregs to char *.
+ (i386bsd_collect_gregset): Likewise.
+ (i386bsd_fetch_inferior_registers): Change xstateregs to void *.
+ (i386bsd_store_inferior_registers): Likewise.
+
+2016-04-19 John Baldwin <jhb@FreeBSD.org>
+
* main.c (setup_alternate_signal_stack): Cast to char *.
2016-04-19 Doug Evans <xdje42@gmail.com>
diff --git a/gdb/amd64bsd-nat.c b/gdb/amd64bsd-nat.c
index fb7e4fa..e278a91 100644
--- a/gdb/amd64bsd-nat.c
+++ b/gdb/amd64bsd-nat.c
@@ -65,7 +65,7 @@ amd64bsd_fetch_inferior_registers (struct target_ops *ops,
{
struct fpreg fpregs;
#ifdef PT_GETXSTATE_INFO
- char *xstateregs;
+ void *xstateregs;
if (amd64bsd_xsave_len != 0)
{
@@ -118,7 +118,7 @@ amd64bsd_store_inferior_registers (struct target_ops *ops,
{
struct fpreg fpregs;
#ifdef PT_GETXSTATE_INFO
- char *xstateregs;
+ void *xstateregs;
if (amd64bsd_xsave_len != 0)
{
diff --git a/gdb/fbsd-nat.c b/gdb/fbsd-nat.c
index bdf078e..b582abe 100644
--- a/gdb/fbsd-nat.c
+++ b/gdb/fbsd-nat.c
@@ -428,7 +428,7 @@ static void (*super_resume) (struct target_ops *,
static int
resume_one_thread_cb (struct thread_info *tp, void *data)
{
- ptid_t *ptid = data;
+ ptid_t *ptid = (ptid_t *) data;
int request;
if (ptid_get_pid (tp->ptid) != ptid_get_pid (*ptid))
@@ -447,7 +447,7 @@ resume_one_thread_cb (struct thread_info *tp, void *data)
static int
resume_all_threads_cb (struct thread_info *tp, void *data)
{
- ptid_t *filter = data;
+ ptid_t *filter = (ptid_t *) data;
if (!ptid_match (tp->ptid, *filter))
return 0;
diff --git a/gdb/i386bsd-nat.c b/gdb/i386bsd-nat.c
index 5d45c33..f5f4a0f 100644
--- a/gdb/i386bsd-nat.c
+++ b/gdb/i386bsd-nat.c
@@ -92,7 +92,7 @@ size_t i386bsd_xsave_len;
static void
i386bsd_supply_gregset (struct regcache *regcache, const void *gregs)
{
- const char *regs = gregs;
+ const char *regs = (const char *) gregs;
int regnum;
for (regnum = 0; regnum < ARRAY_SIZE (i386bsd_r_reg_offset); regnum++)
@@ -112,7 +112,7 @@ static void
i386bsd_collect_gregset (const struct regcache *regcache,
void *gregs, int regnum)
{
- char *regs = gregs;
+ char *regs = (char *) gregs;
int i;
for (i = 0; i < ARRAY_SIZE (i386bsd_r_reg_offset); i++)
@@ -157,7 +157,7 @@ i386bsd_fetch_inferior_registers (struct target_ops *ops,
#ifdef PT_GETXSTATE_INFO
if (i386bsd_xsave_len != 0)
{
- char *xstateregs;
+ void *xstateregs;
xstateregs = alloca (i386bsd_xsave_len);
if (ptrace (PT_GETXSTATE, get_ptrace_pid (inferior_ptid),
@@ -227,7 +227,7 @@ i386bsd_store_inferior_registers (struct target_ops *ops,
#ifdef PT_GETXSTATE_INFO
if (i386bsd_xsave_len != 0)
{
- char *xstateregs;
+ void *xstateregs;
xstateregs = alloca (i386bsd_xsave_len);
if (ptrace (PT_GETXSTATE, get_ptrace_pid (inferior_ptid),
--
2.7.0