1 files changed, 16 insertions, 15 deletions

diff --git a/gdb/arch/amd64-linux-tdesc.c b/gdb/arch/amd64-linux-tdesc.c
index 91de758..8796662 100644
--- a/gdb/arch/amd64-linux-tdesc.c
+++ b/gdb/arch/amd64-linux-tdesc.c
@@ -26,34 +26,35 @@
 /* See arch/amd64-linux-tdesc.h.  */
 
 const struct target_desc *
-amd64_linux_read_description (uint64_t xcr0, bool is_x32)
+amd64_linux_read_description (uint64_t xstate_bv, bool is_x32)
 {
   /* The type used for the amd64 and x32 target description caches.  */
   using tdesc_cache_type = std::unordered_map<uint64_t, const target_desc_up>;
 
   /* Caches for the previously seen amd64 and x32 target descriptions,
-     indexed by the xcr0 value that created the target description.  These
-     need to be static within this function to ensure they are initialised
-     before first use.  */
+     indexed by the xstate_bv value that created the target
+     description.  These need to be static within this function to ensure
+     they are initialised before first use.  */
   static tdesc_cache_type amd64_tdesc_cache, x32_tdesc_cache;
 
   tdesc_cache_type &tdesc_cache = is_x32 ? x32_tdesc_cache : amd64_tdesc_cache;
 
-  /* Only some bits are checked when creating a tdesc, but the XCR0 value
-     contains other feature bits that are not relevant for tdesc creation.
-     When indexing into the TDESC_CACHE we need to use a consistent xcr0
-     value otherwise we might fail to find an existing tdesc which has the
-     same set of relevant bits set.  */
-  xcr0 &= is_x32
-    ? x86_linux_x32_xcr0_feature_mask ()
-    : x86_linux_amd64_xcr0_feature_mask ();
+  /* Only some bits are checked when creating a tdesc, but the
+     xstate_bv value contains other feature bits that are not
+     relevant for tdesc creation.
+     When indexing into the TDESC_CACHE we need to use a consistent
+     xstate_bv value otherwise we might fail to find an existing
+     tdesc which has the same set of relevant bits set.  */
+  xstate_bv &= is_x32
+    ? x86_linux_x32_xstate_bv_feature_mask ()
+    : x86_linux_amd64_xstate_bv_feature_mask ();
 
-  const auto it = tdesc_cache.find (xcr0);
+  const auto it = tdesc_cache.find (xstate_bv);
   if (it != tdesc_cache.end ())
     return it->second.get ();
 
   /* Create the previously unseen target description.  */
-  target_desc_up tdesc (amd64_create_target_description (xcr0, is_x32,
+  target_desc_up tdesc (amd64_create_target_description (xstate_bv, is_x32,
 							 true, true));
   x86_linux_post_init_tdesc (tdesc.get (), true);
 
@@ -61,6 +62,6 @@ amd64_linux_read_description (uint64_t xcr0, bool is_x32)
      target_desc_up.  This is safe as the cache (and the pointers contained
      within it) are not deleted until GDB exits.  */
   target_desc *ptr = tdesc.get ();
-  tdesc_cache.emplace (xcr0, std::move (tdesc));
+  tdesc_cache.emplace (xstate_bv, std::move (tdesc));
   return ptr;
 }