From: Yao Qi <yao@codesourcery.com>
Date: Mon, 24 Feb 2014 04:03:05 +0000 (+0800)
Subject: Unbreak mips native build
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=93063aa69bbd3f19faa85baefd1b7fa9363a6790;p=binutils-gdb.git

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.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 01be0a30555..1135fdcdf71 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+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.
diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c
index 4c28733a2b8..5594e108b8e 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);