espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-18 16:53:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Build failure in sim/rx/gdb-if.c on windows

Browse Source 
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:
Joel Brobecker
2015-01-15 07:14:45 +04:00
parent 10b8fe5e0e
commit a300380e12
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sim/rx/ChangeLog
View File

@ -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> 2014-08-19 Alan Modra <amodra@gmail.com>
* configure: Regenerate. * configure: Regenerate.

8
sim/rx/gdb-if.c
View File

@ -54,14 +54,14 @@ static struct sim_state the_minisim = {
"This is the sole rx minisim instance. See libsim.a's global variables." "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_DESC
sim_open (SIM_OPEN_KIND kind, sim_open (SIM_OPEN_KIND kind,
struct host_callback_struct *callback, struct host_callback_struct *callback,
struct bfd *abfd, char **argv) struct bfd *abfd, char **argv)
{ {
if (open) if (rx_sim_is_open)
fprintf (stderr, "rx minisim: re-opened sim\n"); fprintf (stderr, "rx minisim: re-opened sim\n");
/* The 'run' interface doesn't use this function, so we don't care /* 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 (); execution_error_init_debugger ();
sim_disasm_init (abfd); sim_disasm_init (abfd);
open = 1; rx_sim_is_open = 1;
return &the_minisim; return &the_minisim;
} }
@ -98,7 +98,7 @@ sim_close (SIM_DESC sd, int quitting)
/* Not much to do. At least free up our memory. */ /* Not much to do. At least free up our memory. */
init_mem (); init_mem ();
open = 0; rx_sim_is_open = 0;
} }
static bfd * static bfd *