diff options
| author | Tom Tromey <tromey@adacore.com> | 2022-05-18 09:49:35 -0600 |
|---|---|---|
| committer | Tom Tromey <tromey@adacore.com> | 2022-06-02 09:04:45 -0600 |
| commit | 0fecb1a78491d3d090c05b868a970a571688f66e (patch) | |
| tree | a04a330fcfafbc26c0ad3ee883829e1a34eb929a /gdb/cris-tdep.c | |
| parent | cc55e4ef62f102c4aff3b34ee2a134cdcc734897 (diff) | |
| download | gdb-0fecb1a78491d3d090c05b868a970a571688f66e.zip gdb-0fecb1a78491d3d090c05b868a970a571688f66e.tar.gz gdb-0fecb1a78491d3d090c05b868a970a571688f66e.tar.bz2 | |
ODR warning for "struct stack_item"
"struct stack_item" is defined in multiple .c files, causing ODR
warnings. This patch renames these types.
Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=22395
Diffstat (limited to 'gdb/cris-tdep.c')
| -rw-r--r-- | gdb/cris-tdep.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/gdb/cris-tdep.c b/gdb/cris-tdep.c index 898d277..efd728a 100644 --- a/gdb/cris-tdep.c +++ b/gdb/cris-tdep.c @@ -656,17 +656,18 @@ static CORE_ADDR crisv32_scan_prologue (CORE_ADDR pc, order. The below implements a FILO (stack) to do this. Copied from d10v-tdep.c. */ -struct stack_item +struct cris_stack_item { int len; - struct stack_item *prev; + struct cris_stack_item *prev; gdb_byte *data; }; -static struct stack_item * -push_stack_item (struct stack_item *prev, const gdb_byte *contents, int len) +static struct cris_stack_item * +push_stack_item (struct cris_stack_item *prev, const gdb_byte *contents, + int len) { - struct stack_item *si = XNEW (struct stack_item); + struct cris_stack_item *si = XNEW (struct cris_stack_item); si->data = (gdb_byte *) xmalloc (len); si->len = len; si->prev = prev; @@ -674,10 +675,10 @@ push_stack_item (struct stack_item *prev, const gdb_byte *contents, int len) return si; } -static struct stack_item * -pop_stack_item (struct stack_item *si) +static struct cris_stack_item * +pop_stack_item (struct cris_stack_item *si) { - struct stack_item *dead = si; + struct cris_stack_item *dead = si; si = si->prev; xfree (dead->data); xfree (dead); @@ -798,7 +799,7 @@ cris_push_dummy_call (struct gdbarch *gdbarch, struct value *function, int argreg; int argnum; - struct stack_item *si = NULL; + struct cris_stack_item *si = NULL; /* Push the return address. */ regcache_cooked_write_unsigned (regcache, SRP_REGNUM, bp_addr); |