From: Tom de Vries <tdevries@suse.de>
To: gdb-patches@sourceware.org
Subject: [PATCH 2/4] [gdb/build] Fix enum param_types odr violation
Date: Mon, 14 Aug 2023 13:17:19 +0200 [thread overview]
Message-ID: <20230814111721.31402-2-tdevries@suse.de> (raw)
In-Reply-To: <20230814111721.31402-1-tdevries@suse.de>
When building gdb with -O2 -flto, I run into:
...
gdb/guile/scm-param.c:121:6: warning: type 'param_types' violates the C++ \
One Definition Rule [-Wodr]
enum param_types
^
gdb/python/py-param.c:33:6: note: an enum with different value name is \
defined in another translation unit
enum param_types
^
...
Fix this by renaming to enum scm_param_types and py_param_types.
Tested on x86_64-linux.
---
gdb/guile/scm-param.c | 10 +++++-----
gdb/python/py-param.c | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/gdb/guile/scm-param.c b/gdb/guile/scm-param.c
index d49cc3cebcb..3a9e1c3dc18 100644
--- a/gdb/guile/scm-param.c
+++ b/gdb/guile/scm-param.c
@@ -118,7 +118,7 @@ struct param_smob
/* Guile parameter types as in PARAMETER_TYPES later on. */
-enum param_types
+enum scm_param_types
{
param_boolean,
param_auto_boolean,
@@ -134,7 +134,7 @@ enum param_types
};
/* Translation from Guile parameters to GDB variable types. Keep in the
- same order as PARAM_TYPES due to C++'s lack of designated initializers. */
+ same order as SCM_PARAM_TYPES due to C++'s lack of designated initializers. */
static const struct
{
@@ -202,7 +202,7 @@ static SCM initial_value_keyword;
static SCM auto_keyword;
static int pascm_is_valid (param_smob *);
-static const char *pascm_param_type_name (enum param_types type);
+static const char *pascm_param_type_name (enum scm_param_types type);
static SCM pascm_param_value (const setting &var, int arg_pos,
const char *func_name);
\f
@@ -612,7 +612,7 @@ pascm_valid_parameter_type_p (int param_type)
/* Return PARAM_TYPE as a string. */
static const char *
-pascm_param_type_name (enum param_types param_type)
+pascm_param_type_name (enum scm_param_types param_type)
{
int i;
@@ -1038,7 +1038,7 @@ gdbscm_make_parameter (SCM name_scm, SCM rest)
p_smob->name = name;
p_smob->cmd_class = (enum command_class) cmd_class;
p_smob->pname
- = pascm_param_type_name (static_cast<enum param_types> (param_type));
+ = pascm_param_type_name (static_cast<enum scm_param_types> (param_type));
p_smob->type = param_to_var[param_type].type;
p_smob->extra_literals = param_to_var[param_type].extra_literals;
p_smob->doc = doc;
diff --git a/gdb/python/py-param.c b/gdb/python/py-param.c
index 4ef13f8b24c..b9828de1162 100644
--- a/gdb/python/py-param.c
+++ b/gdb/python/py-param.c
@@ -30,7 +30,7 @@
/* Python parameter types as in PARM_CONSTANTS below. */
-enum param_types
+enum py_param_types
{
param_boolean,
param_auto_boolean,
--
2.35.3
next prev parent reply other threads:[~2023-08-14 11:17 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-14 11:17 [PATCH 1/4] [gdb/build] Remove superfluous variable param_types in gdb/python/py-param.c Tom de Vries
2023-08-14 11:17 ` Tom de Vries [this message]
2023-08-14 16:07 ` [PATCH 2/4] [gdb/build] Fix enum param_types odr violation Tom Tromey
2023-08-14 11:17 ` [PATCH 3/4] [gdb/build] Fix struct token_and_value " Tom de Vries
2023-08-14 16:07 ` Tom Tromey
2023-08-14 11:17 ` [PATCH 4/4] [gdb/build] Fix struct token " Tom de Vries
2023-08-14 16:08 ` Tom Tromey
2023-08-14 16:06 ` [PATCH 1/4] [gdb/build] Remove superfluous variable param_types in gdb/python/py-param.c Tom Tromey
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=20230814111721.31402-2-tdevries@suse.de \
--to=tdevries@suse.de \
--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).