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.
This commit is contained in:
parent
10b8fe5e0e
commit
a300380e12
|
@ -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.
|
||||
|
|
|
@ -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 *
|
||||
|
|
Loading…
Reference in New Issue