X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fframe-unwind.c;h=61486652d4200ce7a2c47bd5fd61d295a725b0ae;hb=747cfc8c6bb23d40b3fa987f6c3df9d3a0d7b817;hp=46096c212b473d226de488007e53a9764ff10fb0;hpb=d55e5aa6b29906346c51ad00e6a9b112590aa294;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/frame-unwind.c b/gdb/frame-unwind.c
index 46096c212b..61486652d4 100644
--- a/gdb/frame-unwind.c
+++ b/gdb/frame-unwind.c
@@ -18,16 +18,15 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-
-/* Local non-gdb includes.  */
-#include "dummy-frame.h"
-#include "frame-unwind.h"
 #include "frame.h"
-#include "gdb_obstack.h"
+#include "frame-unwind.h"
+#include "dummy-frame.h"
 #include "inline-frame.h"
+#include "value.h"
 #include "regcache.h"
+#include "gdb_obstack.h"
 #include "target.h"
-#include "value.h"
+#include "gdbarch.h"
 
 static struct gdbarch_data *frame_unwind_data;
 
@@ -103,11 +102,11 @@ frame_unwind_try_unwinder (struct frame_info *this_frame, void **this_cache,
 
   frame_prepare_for_sniffer (this_frame, unwinder);
 
-  TRY
+  try
     {
       res = unwinder->sniffer (unwinder, this_frame, this_cache);
     }
-  CATCH (ex, RETURN_MASK_ALL)
+  catch (const gdb_exception &ex)
     {
       /* Catch all exceptions, caused by either interrupt or error.
 	 Reset *THIS_CACHE.  */
@@ -122,9 +121,8 @@ frame_unwind_try_unwinder (struct frame_info *this_frame, void **this_cache,
 	     should always accept the frame.  */
 	  return 0;
 	}
-      throw_exception (ex);
+      throw;
     }
-  END_CATCH
 
   if (res)
     return 1;