From: Joel Brobecker <brobecker@adacore.com>
To: Daniel Calcoen <Daniel.Calcoen@cern.ch>
Cc: "gdb-patches@sourceware.org" <gdb-patches@sourceware.org>
Subject: Re: sim/rx/gdb-if.c variable name collision
Date: Thu, 15 Jan 2015 03:27:00 -0000 [thread overview]
Message-ID: <20150115032654.GL8167@adacore.com> (raw)
In-Reply-To: <46996EF9723066478746F941CF170BB8D7870402@CERNXCHG44.cern.ch>
[-- Attachment #1: Type: text/plain, Size: 853 bytes --]
> I built binutils (from master) for linux without problems.
>
> When I try to build the same source/target but now using x64-mingw32 I get a name collision with a local variable name âopenâ declared in line 64 of/sim/rx/gdb-if.c,
>
> used in lines 64,82 and 101.
Thanks for the report.
> Could this variable be renamed? And commited?
>
> Once renamed the compilation went fine.
>
> I'm not aware of the naming conventions used by gdb people this is why
> I didn't propose a patch.
Often, we'll use a prefix. In this case, I used "rx_", and renamed
the variable to "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. Pushed on master and gdb-7.9-branch.
--
Joel
[-- Attachment #2: 0001-Build-failure-in-sim-rx-gdb-if.c-on-windows.patch --]
[-- Type: text/x-diff, Size: 2093 bytes --]
From a300380e12ca04a6cb900e9bfd26161b3fe56ed8 Mon Sep 17 00:00:00 2001
From: Joel Brobecker <brobecker@adacore.com>
Date: Thu, 15 Jan 2015 07:14:45 +0400
Subject: [PATCH] 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.
---
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 *
--
1.9.1
prev parent reply other threads:[~2015-01-15 3:27 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <46996EF9723066478746F941CF170BB8D78703EB@CERNXCHG44.cern.ch>
2015-01-14 21:32 ` Daniel Calcoen
2015-01-15 3:27 ` Joel Brobecker [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150115032654.GL8167@adacore.com \
--to=brobecker@adacore.com \
--cc=Daniel.Calcoen@cern.ch \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).