From: Andrew Burgess <aburgess@redhat.com>
Date: Tue, 26 Mar 2024 18:52:36 +0000 (+0000)
Subject: Revert "gdb/arch: assert that X86_XSTATE_MPX is not set for x32"
X-Git-Tag: gdb-15-branchpoint~600
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0991b56074af7e6b106015c67925fdcfe039f077;p=thirdparty%2Fbinutils-gdb.git

Revert "gdb/arch: assert that X86_XSTATE_MPX is not set for x32"

This reverts commit efba976d9713a92b4507ccfef2257e4589da2798.
---

diff --git a/gdb/arch/amd64.c b/gdb/arch/amd64.c
index f182e686dda..b8ff4270079 100644
--- a/gdb/arch/amd64.c
+++ b/gdb/arch/amd64.c
@@ -66,12 +66,8 @@ amd64_create_target_description (uint64_t xcr0, bool is_x32, bool is_linux,
   if (xcr0 & X86_XSTATE_AVX)
     regnum = create_feature_i386_64bit_avx (tdesc.get (), regnum);
 
-  if (xcr0 & X86_XSTATE_MPX)
-    {
-      /* MPX is not available on x32.  */
-      gdb_assert (!is_x32);
-      regnum = create_feature_i386_64bit_mpx (tdesc.get (), regnum);
-    }
+  if ((xcr0 & X86_XSTATE_MPX) && !is_x32)
+    regnum = create_feature_i386_64bit_mpx (tdesc.get (), regnum);
 
   if (xcr0 & X86_XSTATE_AVX512)
     regnum = create_feature_i386_64bit_avx512 (tdesc.get (), regnum);