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

ODR warnings for struct symloc

Browse Source 
"struct symloc" is defined in multiple spots in gdb, causing ODR
warnings.  This patch renames these.

Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=22395
This commit is contained in:
Tom Tromey
2022-05-10 08:56:26 -06:00
parent 57ebc99013
commit 77845a9ac6
2 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gdb/mdebugread.c
View File

@ -86,7 +86,7 @@ static struct objfile *mdebugread_objfile;
/* We put a pointer to this structure in the read_symtab_private field /* We put a pointer to this structure in the read_symtab_private field
of the psymtab. */ of the psymtab. */
struct symloc struct md_symloc
{ {
/* Index of the FDR that this psymtab represents. */ /* Index of the FDR that this psymtab represents. */
int fdr_idx; int fdr_idx;
@ -102,7 +102,7 @@ struct symloc
enum language pst_language; enum language pst_language;
}; };
#define PST_PRIVATE(p) ((struct symloc *)(p)->read_symtab_private) #define PST_PRIVATE(p) ((struct md_symloc *)(p)->read_symtab_private)
#define FDR_IDX(p) (PST_PRIVATE(p)->fdr_idx) #define FDR_IDX(p) (PST_PRIVATE(p)->fdr_idx)
#define CUR_BFD(p) (PST_PRIVATE(p)->cur_bfd) #define CUR_BFD(p) (PST_PRIVATE(p)->cur_bfd)
#define DEBUG_SWAP(p) (PST_PRIVATE(p)->debug_swap) #define DEBUG_SWAP(p) (PST_PRIVATE(p)->debug_swap)
@ -2604,8 +2604,8 @@ parse_partial_symbols (minimal_symbol_reader &reader,
textlow = 0; textlow = 0;
pst = new legacy_psymtab (fdr_name (fh), partial_symtabs, pst = new legacy_psymtab (fdr_name (fh), partial_symtabs,
objfile->per_bfd, textlow); objfile->per_bfd, textlow);
pst->read_symtab_private = XOBNEW (&objfile->objfile_obstack, symloc); pst->read_symtab_private = XOBNEW (&objfile->objfile_obstack, md_symloc);
memset (pst->read_symtab_private, 0, sizeof (struct symloc)); memset (pst->read_symtab_private, 0, sizeof (struct md_symloc));
save_pst = pst; save_pst = pst;
FDR_IDX (pst) = f_idx; FDR_IDX (pst) = f_idx;
@ -4649,7 +4649,7 @@ new_psymtab (const char *name, psymtab_storage *partial_symtabs,
/* Keep a backpointer to the file's symbols. */ /* Keep a backpointer to the file's symbols. */
psymtab->read_symtab_private psymtab->read_symtab_private
= OBSTACK_ZALLOC (&objfile->objfile_obstack, symloc); = OBSTACK_ZALLOC (&objfile->objfile_obstack, md_symloc);
CUR_BFD (psymtab) = cur_bfd; CUR_BFD (psymtab) = cur_bfd;
DEBUG_SWAP (psymtab) = debug_swap; DEBUG_SWAP (psymtab) = debug_swap;
DEBUG_INFO (psymtab) = debug_info; DEBUG_INFO (psymtab) = debug_info;

28
gdb/xcoffread.c
View File

@ -59,7 +59,7 @@
/* We put a pointer to this structure in the read_symtab_private field /* We put a pointer to this structure in the read_symtab_private field
of the psymtab. */ of the psymtab. */
struct symloc struct xcoff_symloc
{ {
/* First symbol number for this file. */ /* First symbol number for this file. */
@ -598,7 +598,7 @@ process_linenos (CORE_ADDR start, CORE_ADDR end)
unsigned *firstLine; unsigned *firstLine;
offset = offset =
((struct symloc *) this_symtab_psymtab->read_symtab_private)->lineno_off; ((struct xcoff_symloc *) this_symtab_psymtab->read_symtab_private)->lineno_off;
if (offset == 0) if (offset == 0)
goto return_after_cleanup; goto return_after_cleanup;
@ -966,9 +966,9 @@ read_xcoff_symtab (struct objfile *objfile, legacy_psymtab *pst)
start_compunit_symtab (objfile, filestring, NULL, file_start_addr, start_compunit_symtab (objfile, filestring, NULL, file_start_addr,
pst_symtab_language); pst_symtab_language);
record_debugformat (debugfmt); record_debugformat (debugfmt);
symnum = ((struct symloc *) pst->read_symtab_private)->first_symnum; symnum = ((struct xcoff_symloc *) pst->read_symtab_private)->first_symnum;
max_symnum = max_symnum =
symnum + ((struct symloc *) pst->read_symtab_private)->numsyms; symnum + ((struct xcoff_symloc *) pst->read_symtab_private)->numsyms;
first_object_file_end = 0; first_object_file_end = 0;
raw_symbol = xcoff->symtbl + symnum * local_symesz; raw_symbol = xcoff->symtbl + symnum * local_symesz;
@ -1747,7 +1747,7 @@ xcoff_expand_psymtab (legacy_psymtab *pst, struct objfile *objfile)
/* Read in all partial symtabs on which this one is dependent. */ /* Read in all partial symtabs on which this one is dependent. */
pst->expand_dependencies (objfile); pst->expand_dependencies (objfile);
if (((struct symloc *) pst->read_symtab_private)->numsyms != 0) if (((struct xcoff_symloc *) pst->read_symtab_private)->numsyms != 0)
{ {
/* Init stuff necessary for reading in symbols. */ /* Init stuff necessary for reading in symbols. */
stabsread_init (); stabsread_init ();
@ -1767,7 +1767,7 @@ xcoff_read_symtab (legacy_psymtab *self, struct objfile *objfile)
{ {
gdb_assert (!self->readin); gdb_assert (!self->readin);
if (((struct symloc *) self->read_symtab_private)->numsyms != 0 if (((struct xcoff_symloc *) self->read_symtab_private)->numsyms != 0
|| self->number_of_dependencies) || self->number_of_dependencies)
{ {
next_symbol_text_func = xcoff_next_symbol_text; next_symbol_text_func = xcoff_next_symbol_text;
@ -1892,8 +1892,8 @@ xcoff_start_psymtab (psymtab_storage *partial_symtabs,
objfile->per_bfd, 0); objfile->per_bfd, 0);
result->read_symtab_private = result->read_symtab_private =
XOBNEW (&objfile->objfile_obstack, struct symloc); XOBNEW (&objfile->objfile_obstack, struct xcoff_symloc);
((struct symloc *) result->read_symtab_private)->first_symnum = first_symnum; ((struct xcoff_symloc *) result->read_symtab_private)->first_symnum = first_symnum;
result->legacy_read_symtab = xcoff_read_symtab; result->legacy_read_symtab = xcoff_read_symtab;
result->legacy_expand_psymtab = xcoff_expand_psymtab; result->legacy_expand_psymtab = xcoff_expand_psymtab;
@ -1922,10 +1922,10 @@ xcoff_end_psymtab (struct objfile *objfile, psymtab_storage *partial_symtabs,
int i; int i;
if (capping_symbol_number != -1) if (capping_symbol_number != -1)
((struct symloc *) pst->read_symtab_private)->numsyms = ((struct xcoff_symloc *) pst->read_symtab_private)->numsyms =
capping_symbol_number capping_symbol_number
- ((struct symloc *) pst->read_symtab_private)->first_symnum; - ((struct xcoff_symloc *) pst->read_symtab_private)->first_symnum;
((struct symloc *) pst->read_symtab_private)->lineno_off = ((struct xcoff_symloc *) pst->read_symtab_private)->lineno_off =
first_fun_line_offset; first_fun_line_offset;
first_fun_line_offset = 0; first_fun_line_offset = 0;
@ -1947,9 +1947,9 @@ xcoff_end_psymtab (struct objfile *objfile, psymtab_storage *partial_symtabs,
legacy_psymtab *subpst = legacy_psymtab *subpst =
new legacy_psymtab (include_list[i], partial_symtabs, objfile->per_bfd); new legacy_psymtab (include_list[i], partial_symtabs, objfile->per_bfd);
subpst->read_symtab_private = XOBNEW (&objfile->objfile_obstack, symloc); subpst->read_symtab_private = XOBNEW (&objfile->objfile_obstack, xcoff_symloc);
((struct symloc *) subpst->read_symtab_private)->first_symnum = 0; ((struct xcoff_symloc *) subpst->read_symtab_private)->first_symnum = 0;
((struct symloc *) subpst->read_symtab_private)->numsyms = 0; ((struct xcoff_symloc *) subpst->read_symtab_private)->numsyms = 0;
/* We could save slight bits of space by only making one of these, /* We could save slight bits of space by only making one of these,
shared by the entire set of include files. FIXME-someday. */ shared by the entire set of include files. FIXME-someday. */