From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2126) id 08DB73856DF8; Thu, 2 Jun 2022 15:29:29 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 08DB73856DF8 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Tom Tromey To: gdb-cvs@sourceware.org Subject: [binutils-gdb] ODR warning for "struct find_targ_sec_arg" X-Act-Checkin: binutils-gdb X-Git-Author: Tom Tromey X-Git-Refname: refs/heads/master X-Git-Oldrev: 0fecb1a78491d3d090c05b868a970a571688f66e X-Git-Newrev: ddfc4ef12441bef95ea0bf0a2fb68fe58e24440a Message-Id: <20220602152929.08DB73856DF8@sourceware.org> Date: Thu, 2 Jun 2022 15:29:29 +0000 (GMT) X-BeenThere: gdb-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Jun 2022 15:29:29 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3Dddfc4ef12441= bef95ea0bf0a2fb68fe58e24440a commit ddfc4ef12441bef95ea0bf0a2fb68fe58e24440a Author: Tom Tromey Date: Wed May 18 09:51:10 2022 -0600 ODR warning for "struct find_targ_sec_arg" =20 "struct find_targ_sec_arg" is defined in multiple .c files, causing ODR warnings. This patch renames the types. =20 Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=3D22395 Diff: --- gdb/coffread.c | 8 ++++---- gdb/xcoffread.c | 7 ++++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/gdb/coffread.c b/gdb/coffread.c index 75cf646c980..474a1aa02f5 100644 --- a/gdb/coffread.c +++ b/gdb/coffread.c @@ -254,7 +254,7 @@ coff_locate_sections (bfd *abfd, asection *sectp, void = *csip) /* Return the section_offsets* that CS points to. */ static int cs_to_section (struct coff_symbol *, struct objfile *); =20 -struct find_targ_sec_arg +struct coff_find_targ_sec_arg { int targ_index; asection **resultp; @@ -263,7 +263,7 @@ struct find_targ_sec_arg static void find_targ_sec (bfd *abfd, asection *sect, void *obj) { - struct find_targ_sec_arg *args =3D (struct find_targ_sec_arg *) obj; + struct coff_find_targ_sec_arg *args =3D (struct coff_find_targ_sec_arg *= ) obj; =20 if (sect->target_index =3D=3D args->targ_index) *args->resultp =3D sect; @@ -274,7 +274,7 @@ static struct bfd_section* cs_to_bfd_section (struct coff_symbol *cs, struct objfile *objfile) { asection *sect =3D NULL; - struct find_targ_sec_arg args; + struct coff_find_targ_sec_arg args; =20 args.targ_index =3D cs->c_secnum; args.resultp =3D § @@ -301,7 +301,7 @@ static CORE_ADDR cs_section_address (struct coff_symbol *cs, bfd *abfd) { asection *sect =3D NULL; - struct find_targ_sec_arg args; + struct coff_find_targ_sec_arg args; CORE_ADDR addr =3D 0; =20 args.targ_index =3D cs->c_secnum; diff --git a/gdb/xcoffread.c b/gdb/xcoffread.c index 9adc841b1f1..250bd9f4a94 100644 --- a/gdb/xcoffread.c +++ b/gdb/xcoffread.c @@ -249,7 +249,7 @@ static void process_linenos (CORE_ADDR, CORE_ADDR); static int secnum_to_section (int, struct objfile *); static asection *secnum_to_bfd_section (int, struct objfile *); =20 -struct find_targ_sec_arg +struct xcoff_find_targ_sec_arg { int targ_index; int *resultp; @@ -262,7 +262,8 @@ static void find_targ_sec (bfd *, asection *, void *); static void find_targ_sec (bfd *abfd, asection *sect, void *obj) { - struct find_targ_sec_arg *args =3D (struct find_targ_sec_arg *) obj; + struct xcoff_find_targ_sec_arg *args + =3D (struct xcoff_find_targ_sec_arg *) obj; struct objfile *objfile =3D args->objfile; =20 if (sect->target_index =3D=3D args->targ_index) @@ -290,7 +291,7 @@ static void xcoff_secnum_to_sections (int n_scnum, struct objfile *objfile, asection **bfd_sect, int *secnum) { - struct find_targ_sec_arg args; + struct xcoff_find_targ_sec_arg args; =20 args.targ_index =3D n_scnum; args.resultp =3D secnum;