aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYao Qi <yao@codesourcery.com>2014-02-24 12:03:05 +0800
committerYao Qi <yao@codesourcery.com>2014-02-24 12:03:05 +0800
commit93063aa69bbd3f19faa85baefd1b7fa9363a6790 (patch)
treeb4b11445d0a386c200a58843c6cf77ae589a23a5
parent5c328c057e963faacc50796c650a5feb06762c67 (diff)
downloadgdb-93063aa69bbd3f19faa85baefd1b7fa9363a6790.zip
gdb-93063aa69bbd3f19faa85baefd1b7fa9363a6790.tar.gz
gdb-93063aa69bbd3f19faa85baefd1b7fa9363a6790.tar.bz2
Unbreak mips native build
When I build mips native gdb today, I get the follow error, ../../../git/gdb/mips-linux-nat.c: In function '_initialize_mips_linux_nat': ../../../git/gdb/mips-linux-nat.c:792:15: error: assignment from incompatible pointer type [-Werror] cc1: all warnings being treated as errors It looks an oversight of recent target_ops delegation patches. This patch is to fix the build error. gdb: 2014-02-24 Yao Qi <yao@codesourcery.com> * mips-linux-nat.c (super_close): Update its type. (mips_linux_close): Pass 'self' to super_close.
-rw-r--r--gdb/ChangeLog5
-rw-r--r--gdb/mips-linux-nat.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 01be0a3..1135fdc 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,10 @@
2014-02-24 Yao Qi <yao@codesourcery.com>
+ * mips-linux-nat.c (super_close): Update its type.
+ (mips_linux_close): Pass 'self' to super_close.
+
+2014-02-24 Yao Qi <yao@codesourcery.com>
+
* target.h (TARGET_XFER_STATUS_ERROR_P): Remove.
* corefile.c (read_memory): Adjusted.
* target.c (target_write_with_progress): Adjusted.
diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c
index 4c28733..5594e10 100644
--- a/gdb/mips-linux-nat.c
+++ b/gdb/mips-linux-nat.c
@@ -63,7 +63,7 @@ static void (*super_fetch_registers) (struct target_ops *,
static void (*super_store_registers) (struct target_ops *,
struct regcache *, int);
-static void (*super_close) (void);
+static void (*super_close) (struct target_ops *);
/* Map gdb internal register number to ptrace ``address''.
These ``addresses'' are normally defined in <asm/ptrace.h>.
@@ -764,7 +764,7 @@ mips_linux_close (struct target_ops *self)
current_watches = NULL;
if (super_close)
- super_close ();
+ super_close (self);
}
void _initialize_mips_linux_nat (void);