summaryrefslogtreecommitdiff
path: root/libitm/eh_cpp.cc
diff options
context:
space:
mode:
authorpmarlier <pmarlier@138bc75d-0d04-0410-961f-82ee72b054a4>2012-05-21 22:48:00 +0000
committerpmarlier <pmarlier@138bc75d-0d04-0410-961f-82ee72b054a4>2012-05-21 22:48:00 +0000
commit426fe22c1cf03ba359aec616e996d91e4b2ebd25 (patch)
tree947643df0c37d9581dbc9d0eb183eada4ef952b5 /libitm/eh_cpp.cc
parentc5d8940b9023ace106c50f5f98e4ff42051f4ffc (diff)
2012-05-21 Patrick Marlier <patrick.marlier@gmail.com>
* eh_cpp.cc: Fix __cxa_end_catch declaration. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@187747 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libitm/eh_cpp.cc')
-rw-r--r--libitm/eh_cpp.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/libitm/eh_cpp.cc b/libitm/eh_cpp.cc
index 5c4ca2843597..27e38542d434 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 */