gdb: pass inferior to target_current_description

Make the current inferior reference bubble up one level.

Change-Id: I441f954877749dc5a861ab03e881b529dafc2efd

diff --git a/gdb/arch-utils.c b/gdb/arch-utils.c
index 3247c363e8659a41376b2b7bdcd76e2eac37b62c..9110f0ee184d72f66b49fb41c049c59bbe2047a6 100644 (file)
--- a/gdb/arch-utils.c
+++ b/gdb/arch-utils.c
@@ -595,7 +595,7 @@ gdbarch_update_p (struct gdbarch_info info)
 
   /* Check for the current target description.  */
   if (info.target_desc == NULL)
-    info.target_desc = target_current_description ();
+    info.target_desc = target_current_description (current_inferior ());
 
   new_gdbarch = gdbarch_find_by_info (info);
 
@@ -654,7 +654,7 @@ set_gdbarch_from_file (bfd *abfd)
   struct gdbarch *gdbarch;
 
   info.abfd = abfd;
-  info.target_desc = target_current_description ();
+  info.target_desc = target_current_description (current_inferior ());
   gdbarch = gdbarch_find_by_info (info);
 
   if (gdbarch == NULL)

diff --git a/gdb/target-descriptions.c b/gdb/target-descriptions.c
index 4f2104416236e3e4bc0f60e98c351e160102014d..23b5b109bb77872275153bc59b9531df2794ae55 100644 (file)
--- a/gdb/target-descriptions.c
+++ b/gdb/target-descriptions.c
@@ -541,14 +541,12 @@ target_clear_description (void)
     internal_error (_("Could not remove target-supplied description"));
 }
 
-/* Return the global current target description.  This should only be
-   used by gdbarch initialization code; most access should be through
-   an existing gdbarch.  */
+/* See target-descriptions.h.  */
 
-const struct target_desc *
-target_current_description (void)
+const target_desc *
+target_current_description (inferior *inf)
 {
-  target_desc_info *tdesc_info = &current_inferior ()->tdesc_info;
+  target_desc_info *tdesc_info = &inf->tdesc_info;
 
   if (tdesc_info->fetched)
     return tdesc_info->tdesc;

diff --git a/gdb/target-descriptions.h b/gdb/target-descriptions.h
index 54c1f234f06cad65b0b5351ba7447b866617ef76..d708dbd3589ee887551fb0a1dd7759a73ade61f0 100644 (file)
--- a/gdb/target-descriptions.h
+++ b/gdb/target-descriptions.h
@@ -39,11 +39,10 @@ void target_find_description (void);
 
 void target_clear_description (void);
 
-/* Return the current inferior's target description.  This should only
-   be used by gdbarch initialization code; most access should be
-   through an existing gdbarch.  */
+/* Return INF's target description.  This should only be used by gdbarch
+   initialization code; most access should be through an existing gdbarch.  */
 
-const struct target_desc *target_current_description (void);
+const target_desc *target_current_description (inferior *inf);
 
 /* Record architecture-specific functions to call for pseudo-register
    support.  If tdesc_use_registers is called and gdbarch_num_pseudo_regs