1 files changed, 19 insertions, 15 deletions
diff --git a/gdb/gdbarch.h b/gdb/gdbarch.h
index fc2f1a8..72edc79 100644
--- a/gdb/gdbarch.h
+++ b/gdb/gdbarch.h
@@ -102,6 +102,24 @@ typedef void (iterate_over_regset_sections_cb)
   (const char *sect_name, int supply_size, int collect_size,
    const struct regset *regset, const char *human_name, void *cb_data);
 
+/* Different targets need different indentification data for gdbarch_info.  */
+union gdbarch_target_info
+{
+  /* Architecture-specific information.  The generic form for targets
+     that have extra requirements.  */
+  struct gdbarch_tdep_info *tdep_info;
+
+  /* Architecture-specific target description data.  Numerous targets
+     need only this, so give them an easy way to hold it.  */
+  struct tdesc_arch_data *tdesc_data;
+
+  /* SPU file system ID.  This is a single integer, so using the
+     generic form would only complicate code.  Other targets may
+     reuse this member if suitable.  */
+  int *id;
+};
+
+
 
 /* The following are pre-initialized by GDBARCH.  */
 
@@ -1652,21 +1670,7 @@ struct gdbarch_info
   bfd *abfd;
 
   /* Use default: NULL (ZERO).  */
-  union
-    {
-      /* Architecture-specific information.  The generic form for targets
-	 that have extra requirements.  */
-      struct gdbarch_tdep_info *tdep_info;
-
-      /* Architecture-specific target description data.  Numerous targets
-	 need only this, so give them an easy way to hold it.  */
-      struct tdesc_arch_data *tdesc_data;
-
-      /* SPU file system ID.  This is a single integer, so using the
-	 generic form would only complicate code.  Other targets may
-	 reuse this member if suitable.  */
-      int *id;
-    };
+  union gdbarch_target_info target_info;
 
   /* Use default: GDB_OSABI_UNINITIALIZED (-1).  */
   enum gdb_osabi osabi;