Merge remote-tracking branch 'origin/master' into amd-common

[deliverable/binutils-gdb.git] / gdb / selftest-arch.c

diff --git a/gdb/selftest-arch.c b/gdb/selftest-arch.c
index 340056e73e000c966764b3971c5f01285f987f92..91d9f8673724e7b3160867bb5e6eb68b8afa3349 100644 (file)
--- a/gdb/selftest-arch.c
+++ b/gdb/selftest-arch.c
@@ -1,5 +1,5 @@
 /* GDB self-test for each gdbarch.
-   Copyright (C) 2017-2019 Free Software Foundation, Inc.
+   Copyright (C) 2017-2020 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -19,7 +19,7 @@
 #include "defs.h"
 
 #if GDB_SELF_TEST
-#include "common/selftest.h"
+#include "gdbsupport/selftest.h"
 #include "selftest-arch.h"
 #include "arch-utils.h"
 
@@ -72,7 +72,7 @@ struct gdbarch_selftest : public selftest
 
            function (gdbarch);
          }
-       catch (const gdb_exception_RETURN_MASK_ERROR &ex)
+       catch (const gdb_exception_error &ex)
          {
            pass = false;
            exception_fprintf (gdb_stderr, ex,