+2002-02-14 Elena Zannoni <ezannoni@redhat.com>
+
+ * rs6000-tdep.c (rs6000_gdbarch_init): Don't call
+ find_variant_by_name, because it confuses the multiarch
+ framework. Return NULL if there isn't an architecture with the
+ user supplied name, instead of forcing a different one without
+ recording the change with the multiarch machinery.
+ (find_variant_by_name): Delete.
+
2002-02-14 Peter Schauer <pes@regent.e-technik.tu-muenchen.de>
* config/i386/i386sol2.mh (NATDEPFILES): Add i387-nat.o, needed by
#undef num_registers
-/* Look up the variant named NAME in the `variants' table. Return a
- pointer to the struct variant, or null if we couldn't find it. */
-
-static const struct variant *
-find_variant_by_name (char *name)
-{
- const struct variant *v;
-
- for (v = variants; v->name; v++)
- if (!strcmp (name, v->name))
- return v;
-
- return NULL;
-}
-
/* Return the variant corresponding to architecture ARCH and machine number
MACH. If no such variant exists, return null. */
/* Choose variant. */
v = find_variant_by_arch (arch, mach);
if (!v)
- v = find_variant_by_name (power ? "power" : "powerpc");
+ return NULL;
+
tdep->regs = v->regs;
tdep->ppc_gp0_regnum = 0;