#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"
{
tinfo = linux_enable_btrace (ptid, conf);
}
- catch (const gdb_exception_RETURN_MASK_ERROR &exception)
+ catch (const gdb_exception_error &exception)
{
error (_("Could not enable branch tracing for %s: %s"),
target_pid_to_str (ptid).c_str (), exception.what ());