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

sim: m32c: rename open symbol to avoid collisions

Browse Source 
If the header files define open(), make sure our local open var
doesn't shadow it.
This commit is contained in:
Mike Frysinger
2021-05-29 12:03:27 -04:00
parent 5c9e84c2d8
commit 80e61ea097
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sim/m32c/ChangeLog
View File

@ -1,3 +1,9 @@
2021-05-28 Mike Frysinger <vapier@gentoo.org>
* gdb-if.c (open): Rename to ...
(is_open): ... this.
(sim_open, sim_close): Rename open to is_open.
2021-05-16 Mike Frysinger <vapier@gentoo.org> 2021-05-16 Mike Frysinger <vapier@gentoo.org>
* int.c, misc.c, opc2c.c, reg.c, srcdest.c: Include defs.h. * int.c, misc.c, opc2c.c, reg.c, srcdest.c: Include defs.h.

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

@ -58,7 +58,7 @@ static struct sim_state the_minisim = {
"This is the sole m32c minisim instance. See libsim.a's global variables." "This is the sole m32c minisim instance. See libsim.a's global variables."
}; };
static int open; static int is_open;
SIM_DESC SIM_DESC
sim_open (SIM_OPEN_KIND kind, sim_open (SIM_OPEN_KIND kind,
@ -66,7 +66,7 @@ sim_open (SIM_OPEN_KIND kind,
struct bfd *abfd, char * const *argv) struct bfd *abfd, char * const *argv)
{ {
setbuf (stdout, 0); setbuf (stdout, 0);
if (open) if (is_open)
fprintf (stderr, "m32c minisim: re-opened sim\n"); fprintf (stderr, "m32c 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
@ -88,7 +88,7 @@ sim_open (SIM_OPEN_KIND kind,
init_mem (); init_mem ();
init_regs (); init_regs ();
open = 1; is_open = 1;
return &the_minisim; return &the_minisim;
} }
@ -107,7 +107,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; is_open = 0;
} }
static bfd * static bfd *