Change regcache list to be an hash map

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

diff --git a/gdb/x86-linux-nat.c b/gdb/x86-linux-nat.c
index 9a451e0e1aa0a41d49273c34231d6ef0ad95ae0f..e1b592510fa6c810d941946e20189b7c353fe9d3 100644 (file)
--- a/gdb/x86-linux-nat.c
+++ b/gdb/x86-linux-nat.c
@@ -35,7 +35,7 @@
 #ifdef __x86_64__
 #include "amd64-linux-tdep.h"
 #endif
-#include "common/x86-xstate.h"
+#include "gdbsupport/x86-xstate.h"
 #include "nat/linux-btrace.h"
 #include "nat/linux-nat.h"
 #include "nat/x86-linux.h"
@@ -217,16 +217,15 @@ x86_linux_nat_target::enable_btrace (ptid_t ptid,
                                     const struct btrace_config *conf)
 {
   struct btrace_target_info *tinfo = nullptr;
-  TRY
+  try
     {
       tinfo = linux_enable_btrace (ptid, conf);
     }
-  CATCH (exception, RETURN_MASK_ERROR)
+  catch (const gdb_exception_error &exception)
     {
       error (_("Could not enable branch tracing for %s: %s"),
-            target_pid_to_str (ptid).c_str (), exception.message);
+            target_pid_to_str (ptid).c_str (), exception.what ());
     }
-  END_CATCH
 
   return tinfo;
 }