diff options
| author | Tom Tromey <tromey@adacore.com> | 2022-05-18 10:06:17 -0600 |
|---|---|---|
| committer | Tom Tromey <tromey@adacore.com> | 2022-06-02 09:04:45 -0600 |
| commit | c8e41b5f14d38c4317b2d1b82974a48828f014f7 (patch) | |
| tree | ffa47a1f08ebe0d7462af634b1356ca429ec5ab2 | |
| parent | cec000ad603ea768f5c1a6cf032770eb2d468337 (diff) | |
| download | gdb-c8e41b5f14d38c4317b2d1b82974a48828f014f7.zip gdb-c8e41b5f14d38c4317b2d1b82974a48828f014f7.tar.gz gdb-c8e41b5f14d38c4317b2d1b82974a48828f014f7.tar.bz2 | |
ODR warnings from overlay constants
Some overlay-related constants are duplicated in z80-tdep.c, causing
ODR warnings. This patch renames just the z80-specific ones.
Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=22395
| -rw-r--r-- | gdb/z80-tdep.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gdb/z80-tdep.c b/gdb/z80-tdep.c index 196884a..0b28223 100644 --- a/gdb/z80-tdep.c +++ b/gdb/z80-tdep.c @@ -860,9 +860,9 @@ z80_software_single_step (struct regcache *regcache) static unsigned (*cache_ovly_region_table)[3] = 0; static unsigned cache_novly_regions; static CORE_ADDR cache_ovly_region_table_base = 0; -enum ovly_index +enum z80_ovly_index { - VMA, OSIZE, MAPPED_TO_LMA + Z80_VMA, Z80_OSIZE, Z80_MAPPED_TO_LMA }; static void @@ -952,12 +952,12 @@ z80_overlay_update_1 (struct obj_section *osect) /* find region corresponding to the section VMA */ for (i = 0; i < cache_novly_regions; i++) - if (cache_ovly_region_table[i][VMA] == vma) + if (cache_ovly_region_table[i][Z80_VMA] == vma) break; if (i == cache_novly_regions) return 0; /* no such region */ - lma = cache_ovly_region_table[i][MAPPED_TO_LMA]; + lma = cache_ovly_region_table[i][Z80_MAPPED_TO_LMA]; i = 0; /* we have interest for sections with same VMA */ @@ -995,9 +995,9 @@ z80_overlay_update (struct obj_section *osect) bfd_vma vma = bfd_section_vma (bsect); for (int i = 0; i < cache_novly_regions; ++i) - if (cache_ovly_region_table[i][VMA] == vma) + if (cache_ovly_region_table[i][Z80_VMA] == vma) osect->ovly_mapped = - (cache_ovly_region_table[i][MAPPED_TO_LMA] == lma); + (cache_ovly_region_table[i][Z80_MAPPED_TO_LMA] == lma); } } |