Patchwork [libitm] fix __cxa_end_catch declaration

login
register
mail settings
Submitter Patrick Marlier
Date May 21, 2012, 7:59 p.m.
Message ID <4FBA9EAE.1020808@gmail.com>
Download mbox | patch
Permalink /patch/160456/
State New
Headers show

Comments

Patrick Marlier - May 21, 2012, 7:59 p.m.
Hi,

__cxa_end_catch declaration was wrong. No functional change just 
correctness.

Ok for trunk?
Thanks.

2012-05-21  Patrick Marlier  <patrick.marlier@gmail.com>

	* eh_cpp.cc: Fix __cxa_end_catch declaration.

--
Patrick Marlier
Richard Henderson - May 21, 2012, 8:32 p.m.
On 05/21/12 12:59, Patrick Marlier wrote:
> 2012-05-21  Patrick Marlier  <patrick.marlier@gmail.com>
> 
>     * eh_cpp.cc: Fix __cxa_end_catch declaration.

Ok.


r~

Patch

Index: eh_cpp.cc
===================================================================
--- eh_cpp.cc	(revision 187371)
+++ eh_cpp.cc	(working copy)
@@ -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 */