[binutils-gdb] Rename "variant" to "ppc_variant"

[gdb-buildbot@sergiodj.net]

*** TEST RESULTS FOR COMMIT 675127ec647e08ceabc66ec7d3ad560d91deacad ***

commit 675127ec647e08ceabc66ec7d3ad560d91deacad
Author:     Tom Tromey <tromey@adacore.com>
AuthorDate: Fri Apr 24 13:40:31 2020 -0600
Commit:     Tom Tromey <tromey@adacore.com>
CommitDate: Fri Apr 24 13:40:31 2020 -0600

    Rename "variant" to "ppc_variant"
    
    I wanted to use the name "variant" to represent a DWARF variant, but
    it turned out there was an existing structure of that name.  This
    renames the existing variant to "ppc_variant".
    
    gdb/ChangeLog
    2020-04-24  Tom Tromey  <tromey@adacore.com>
    
            * rs6000-tdep.c (struct ppc_variant): Rename from "variant".
            (variants, find_variant_by_arch, rs6000_gdbarch_init): Update.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 4b909b8c94..9645eadc9e 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2020-04-24  Tom Tromey  <tromey@adacore.com>
+
+	* rs6000-tdep.c (struct ppc_variant): Rename from "variant".
+	(variants, find_variant_by_arch, rs6000_gdbarch_init): Update.
+
 2020-04-24  Hannes Domani  <ssbssa@yahoo.de>
 
 	* windows-tdep.c (exception_values): Add WOW64 exception numbers.
diff --git a/gdb/rs6000-tdep.c b/gdb/rs6000-tdep.c
index 1e1fbc7022..90678941a1 100644
--- a/gdb/rs6000-tdep.c
+++ b/gdb/rs6000-tdep.c
@@ -3315,7 +3315,7 @@ rs6000_adjust_frame_regnum (struct gdbarch *gdbarch, int num, int eh_frame_p)
 
 /* Information about a particular processor variant.  */
 
-struct variant
+struct ppc_variant
   {
     /* Name of this variant.  */
     const char *name;
@@ -3333,7 +3333,7 @@ struct variant
     struct target_desc **tdesc;
   };
 
-static struct variant variants[] =
+static struct ppc_variant variants[] =
 {
   {"powerpc", "PowerPC user-level", bfd_arch_powerpc,
    bfd_mach_ppc, &tdesc_powerpc_altivec32},
@@ -3392,10 +3392,10 @@ static struct variant variants[] =
 /* Return the variant corresponding to architecture ARCH and machine number
    MACH.  If no such variant exists, return null.  */
 
-static const struct variant *
+static const struct ppc_variant *
 find_variant_by_arch (enum bfd_architecture arch, unsigned long mach)
 {
-  const struct variant *v;
+  const struct ppc_variant *v;
 
   for (v = variants; v->name; v++)
     if (arch == v->arch && mach == v->mach)
@@ -6199,7 +6199,7 @@ rs6000_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
      layout, if we do not already have one.  */
   if (! tdesc_has_registers (tdesc))
     {
-      const struct variant *v;
+      const struct ppc_variant *v;
 
       /* Choose variant.  */
       v = find_variant_by_arch (arch, mach);