diff options
| author | Patrick Marlier <patrick.marlier@gmail.com> | 2012-05-21 22:48:00 +0000 |
|---|---|---|
| committer | Patrick Marlier <patrick.marlier@gmail.com> | 2012-05-21 22:48:00 +0000 |
| commit | 9fe82107d58b8cb735f5ddb262eda56a6fe6e368 (patch) | |
| tree | 947643df0c37d9581dbc9d0eb183eada4ef952b5 /libitm | |
| parent | cab59e9fd06a9718f0bbdaec50c75d37bbf4ee07 (diff) | |
2012-05-21 Patrick Marlier <patrick.marlier@gmail.com>
* eh_cpp.cc: Fix __cxa_end_catch declaration.
git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@187747 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libitm')
| -rw-r--r-- | libitm/ChangeLog | 4 | ||||
| -rw-r--r-- | libitm/eh_cpp.cc | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/libitm/ChangeLog b/libitm/ChangeLog index 688eddac159..0ccdf42c592 100644 --- a/libitm/ChangeLog +++ b/libitm/ChangeLog @@ -1,3 +1,7 @@ +2012-05-21 Patrick Marlier <patrick.marlier@gmail.com> + + * eh_cpp.cc: Fix __cxa_end_catch declaration. + 2012-05-16 H.J. Lu <hongjiu.lu@intel.com> * configure: Regenerated. diff --git a/libitm/eh_cpp.cc b/libitm/eh_cpp.cc index 5c4ca284359..27e38542d43 100644 --- a/libitm/eh_cpp.cc +++ b/libitm/eh_cpp.cc @@ -36,14 +36,14 @@ extern "C" { extern void *__cxa_allocate_exception (size_t) WEAK; extern void __cxa_throw (void *, void *, void *) WEAK; extern void *__cxa_begin_catch (void *) WEAK; -extern void *__cxa_end_catch (void) WEAK; +extern void __cxa_end_catch (void) WEAK; extern void __cxa_tm_cleanup (void *, void *, unsigned int) WEAK; #if !defined (HAVE_ELF_STYLE_WEAKREF) && !defined (__MACH__) void *__cxa_allocate_exception (size_t) { return NULL; } void __cxa_throw (void *, void *, void *) { return; } void *__cxa_begin_catch (void *) { return NULL; } -void *__cxa_end_catch (void) { return NULL; } +void __cxa_end_catch (void) { return; } void __cxa_tm_cleanup (void *, void *, unsigned int) { return; } void _Unwind_DeleteException (_Unwind_Exception *) { return; } #endif /* HAVE_ELF_STYLE_WEAKREF */ |