Yet more signed overflow fixes

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

diff --git a/gdb/selftest-arch.c b/gdb/selftest-arch.c
index 7a64295efa8e762addd167abe5c825771079ea97..e440a300d4e58d4868446476b54bbcb045945078 100644 (file)
--- a/gdb/selftest-arch.c
+++ b/gdb/selftest-arch.c
@@ -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"
 
@@ -60,7 +60,7 @@ struct gdbarch_selftest : public selftest
 
        QUIT;
 
-       TRY
+       try
          {
            struct gdbarch_info info;
 
@@ -72,13 +72,12 @@ struct gdbarch_selftest : public selftest
 
            function (gdbarch);
          }
-       CATCH (ex, RETURN_MASK_ERROR)
+       catch (const gdb_exception_error &ex)
          {
            pass = false;
            exception_fprintf (gdb_stderr, ex,
                               _("Self test failed: arch %s: "), arches[i]);
          }
-       END_CATCH
 
        reset ();
       }