Add target descriptions for AVX + MPX

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

diff --git a/gdb/x86-linux-nat.c b/gdb/x86-linux-nat.c
index fa5ef300489b8e9bbb26c1dde74b8b587afc01a5..107576f30b2d443b0d2e2723748a6014a7cc5d00 100644 (file)
--- a/gdb/x86-linux-nat.c
+++ b/gdb/x86-linux-nat.c
@@ -1,6 +1,6 @@
 /* Native-dependent code for GNU/Linux x86 (i386 and x86-64).
 
-   Copyright (C) 1999-2015 Free Software Foundation, Inc.
+   Copyright (C) 1999-2016 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -215,6 +215,11 @@ x86_linux_read_description (struct target_ops *ops)
            return tdesc_x32_avx_linux; /* No MPX on x32 using AVX.  */
          else
            return tdesc_amd64_mpx_linux;
+       case X86_XSTATE_AVX_MPX_MASK:
+         if (is_x32)
+           return tdesc_x32_avx_linux; /* No MPX on x32 using AVX.  */
+         else
+           return tdesc_amd64_avx_mpx_linux;
        case X86_XSTATE_AVX_MASK:
          if (is_x32)
            return tdesc_x32_avx_linux;
@@ -237,6 +242,8 @@ x86_linux_read_description (struct target_ops *ops)
          return tdesc_i386_avx512_linux;
        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;
        default:
@@ -351,15 +358,6 @@ x86_linux_get_thread_area (pid_t pid, void *addr, unsigned int *base_addr)
 }
 \f
 
-/* to_always_non_stop_p implementation.  */
-
-static int
-x86_linux_always_non_stop_p (struct target_ops *self)
-{
-  /* Enabling this breaks the btrace target.  */
-  return 0;
-}
-
 /* Create an x86 GNU/Linux target.  */
 
 struct target_ops *
@@ -392,8 +390,6 @@ x86_linux_create_target (void)
   t->to_read_btrace = x86_linux_read_btrace;
   t->to_btrace_conf = x86_linux_btrace_conf;
 
-  t->to_always_non_stop_p = x86_linux_always_non_stop_p;
-
   return t;
 }