This is the mail archive of the
gdb-cvs@sourceware.org
mailing list for the GDB project.
[binutils-gdb] Build failure in sim/rx/gdb-if.c on windows
- From: Joel Brobecker <brobecke at sourceware dot org>
- To: gdb-cvs at sourceware dot org
- Date: 15 Jan 2015 03:22:20 -0000
- Subject: [binutils-gdb] Build failure in sim/rx/gdb-if.c on windows
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=a300380e12ca04a6cb900e9bfd26161b3fe56ed8
commit a300380e12ca04a6cb900e9bfd26161b3fe56ed8
Author: Joel Brobecker <brobecker@adacore.com>
Date: Thu Jan 15 07:14:45 2015 +0400
Build failure in sim/rx/gdb-if.c on windows
This should fix a build failure reported on x86_64-mingw32 by Daniel
Calcoen due to conflicting declarations of "open". This patch just
renames the static global in sim/rx/gdb-if.c into "rx_sim_is_open".
sim/rx/ChangeLog:
* gdb-if.c (open): Rename to...
(rx_sim_is_open): This. Replace all uses of "open" by uses of
"rx_sim_is_open" throughout.
Tested by rebuilding on x86_64-linux.
Diff:
---
sim/rx/ChangeLog | 6 ++++++
sim/rx/gdb-if.c | 8 ++++----
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/sim/rx/ChangeLog b/sim/rx/ChangeLog
index 3c1c4e5..8d4c4ec 100644
--- a/sim/rx/ChangeLog
+++ b/sim/rx/ChangeLog
@@ -1,3 +1,9 @@
+2015-12-15 Joel Brobecker <brobecker@adacore.com>
+
+ * gdb-if.c (open): Rename to...
+ (rx_sim_is_open): This. Replace all uses of "open" by uses of
+ "rx_sim_is_open" throughout.
+
2014-08-19 Alan Modra <amodra@gmail.com>
* configure: Regenerate.
diff --git a/sim/rx/gdb-if.c b/sim/rx/gdb-if.c
index 7af5b00..762c3d2 100644
--- a/sim/rx/gdb-if.c
+++ b/sim/rx/gdb-if.c
@@ -54,14 +54,14 @@ static struct sim_state the_minisim = {
"This is the sole rx minisim instance. See libsim.a's global variables."
};
-static int open;
+static int rx_sim_is_open;
SIM_DESC
sim_open (SIM_OPEN_KIND kind,
struct host_callback_struct *callback,
struct bfd *abfd, char **argv)
{
- if (open)
+ if (rx_sim_is_open)
fprintf (stderr, "rx minisim: re-opened sim\n");
/* The 'run' interface doesn't use this function, so we don't care
@@ -79,7 +79,7 @@ sim_open (SIM_OPEN_KIND kind,
execution_error_init_debugger ();
sim_disasm_init (abfd);
- open = 1;
+ rx_sim_is_open = 1;
return &the_minisim;
}
@@ -98,7 +98,7 @@ sim_close (SIM_DESC sd, int quitting)
/* Not much to do. At least free up our memory. */
init_mem ();
- open = 0;
+ rx_sim_is_open = 0;
}
static bfd *