From f2f9a0977a9ea978a3bee7507bafa8d26445119d Mon Sep 17 00:00:00 2001
From: Patrick Marlier <patrick.marlier@gmail.com>
Date: Mon, 21 May 2012 22:48:00 +0000
Subject: [PATCH] eh_cpp.cc: Fix __cxa_end_catch declaration.
2012-05-21 Patrick Marlier <patrick.marlier@gmail.com>
* eh_cpp.cc: Fix __cxa_end_catch declaration.
From-SVN: r187747
---
libitm/ChangeLog | 4 ++++
libitm/eh_cpp.cc | 4 ++--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/libitm/ChangeLog b/libitm/ChangeLog
index 688eddac1593..0ccdf42c592d 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 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 */
--
GitLab