This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[v3] PATCH to eh_personality.cc
- From: Jason Merrill <jason at redhat dot com>
- To: "gcc-patches >> GCC Patches" <gcc-patches at gcc dot gnu dot org>
- Date: Fri, 21 Jul 2006 17:04:57 -0400
- Subject: [v3] PATCH to eh_personality.cc
The prototypes for the personality function and __cxa_call_unexpected
are in the __cxxabiv1 namespace, but the definitons are in the global
namespace. They should match so that the two declarations are merged.
Applied to trunk.
2006-07-21 Jason Merrill <jason@redhat.com>
* libsupc++/eh_personality.cc: Wrap extern "C" function
definitions in namespace __cxxabiv1.
Index: libsupc++/eh_personality.cc
===================================================================
*** libsupc++/eh_personality.cc (revision 115651)
--- libsupc++/eh_personality.cc (working copy)
*************** empty_exception_spec (lsda_header_info *
*** 326,331 ****
--- 326,334 ----
return tmp == 0;
}
+ namespace __cxxabiv1
+ {
+
// Using a different personality function name causes link failures
// when trying to mix code using different exception handling models.
#ifdef _GLIBCXX_SJLJ_EXCEPTIONS
*************** __cxa_call_unexpected (void *exc_obj_in)
*** 748,750 ****
--- 751,755 ----
}
}
#endif
+
+ } // namespace __cxxabiv1