From f007779dc207227afd301fdc6270a42bf4e0a89f Mon Sep 17 00:00:00 2001 From: David Chisnall Date: Wed, 23 Nov 2011 10:19:42 +0000 Subject: Use the ARM / Itanium EH abstraction layer. --- src/cxxabi.h | 2 +- src/dwarf_eh.h | 4 ++-- src/exception.cc | 8 ++------ 3 files changed, 5 insertions(+), 9 deletions(-) (limited to 'src') diff --git a/src/cxxabi.h b/src/cxxabi.h index db46247..b081806 100644 --- a/src/cxxabi.h +++ b/src/cxxabi.h @@ -1,7 +1,7 @@ #ifndef __CXXABI_H_ #define __CXXABI_H_ #include -#include +#include "unwind.h" namespace std { class type_info; diff --git a/src/dwarf_eh.h b/src/dwarf_eh.h index 0901751..35b9af1 100644 --- a/src/dwarf_eh.h +++ b/src/dwarf_eh.h @@ -16,10 +16,10 @@ // that it doesn't impact the rest of the program. #ifndef _GNU_SOURCE # define _GNU_SOURCE 1 -# include +# include "unwind.h" # undef _GNU_SOURCE #else -# include +# include "unwind.h" #endif #include diff --git a/src/exception.cc b/src/exception.cc index 66e0929..0abf18c 100644 --- a/src/exception.cc +++ b/src/exception.cc @@ -864,12 +864,8 @@ static handler_type check_action_record(_Unwind_Context *context, * DWARF metadata and is called by the unwind library for each C++ stack frame * containing catch or cleanup code. */ -extern "C" _Unwind_Reason_Code __gxx_personality_v0(int version, - _Unwind_Action actions, - uint64_t exceptionClass, - struct _Unwind_Exception *exceptionObject, - struct _Unwind_Context *context) -{ +extern "C" +BEGIN_PERSONALITY_FUNCTION(__gxx_personality_v0) // This personality function is for version 1 of the ABI. If you use it // with a future version of the ABI, it won't know what to do, so it // reports a fatal error and give up before it breaks anything. -- cgit v1.2.3