Add target descriptions for AVX + MPX

[deliverable/binutils-gdb.git] / gdb / gdbserver / linux-x86-low.c

diff --git a/gdb/gdbserver/linux-x86-low.c b/gdb/gdbserver/linux-x86-low.c
index feaee92bf9687b68ff258d551e293bd016e53fd9..2535959339418b8711a080c536fc4eacfa747e7d 100644 (file)
--- a/gdb/gdbserver/linux-x86-low.c
+++ b/gdb/gdbserver/linux-x86-low.c
@@ -789,6 +789,9 @@ x86_linux_read_description (void)
                case X86_XSTATE_AVX512_MASK:
                  return tdesc_amd64_avx512_linux;
 
+               case X86_XSTATE_AVX_MPX_MASK:
+                 return tdesc_amd64_avx_mpx_linux;
+
                case X86_XSTATE_MPX_MASK:
                  return tdesc_amd64_mpx_linux;
 
@@ -836,6 +839,9 @@ x86_linux_read_description (void)
            case (X86_XSTATE_MPX_MASK):
              return tdesc_i386_mpx_linux;
 
+           case (X86_XSTATE_AVX_MPX_MASK):
+             return tdesc_i386_avx_mpx_linux;
+
            case (X86_XSTATE_AVX_MASK):
              return tdesc_i386_avx_linux;
 
@@ -2855,6 +2861,8 @@ x86_get_ipa_tdesc_idx (void)
     return X86_TDESC_AVX;
   if (tdesc == tdesc_amd64_mpx_linux)
     return X86_TDESC_MPX;
+  if (tdesc == tdesc_amd64_avx_mpx_linux)
+    return X86_TDESC_AVX_MPX;
   if (tdesc == tdesc_amd64_avx512_linux || tdesc == tdesc_x32_avx512_linux)
     return X86_TDESC_AVX512;
 #endif
@@ -2867,6 +2875,8 @@ x86_get_ipa_tdesc_idx (void)
     return X86_TDESC_AVX;
   if (tdesc == tdesc_i386_mpx_linux)
     return X86_TDESC_MPX;
+  if (tdesc == tdesc_i386_avx_mpx_linux)
+    return X86_TDESC_AVX_MPX;
   if (tdesc == tdesc_i386_avx512_linux)
     return X86_TDESC_AVX512;
 
@@ -2928,6 +2938,7 @@ initialize_low_arch (void)
   init_registers_amd64_avx_linux ();
   init_registers_amd64_avx512_linux ();
   init_registers_amd64_mpx_linux ();
+  init_registers_amd64_avx_mpx_linux ();
 
   init_registers_x32_linux ();
   init_registers_x32_avx_linux ();
@@ -2942,6 +2953,7 @@ initialize_low_arch (void)
   init_registers_i386_avx_linux ();
   init_registers_i386_avx512_linux ();
   init_registers_i386_mpx_linux ();
+  init_registers_i386_avx_mpx_linux ();
 
   tdesc_i386_linux_no_xml = XNEW (struct target_desc);
   copy_target_description (tdesc_i386_linux_no_xml, tdesc_i386_linux);