From 930d5023df9d1ab6a463a1588d6301df2b5db481 Mon Sep 17 00:00:00 2001 From: jason Date: Fri, 21 Jul 2006 21:06:19 +0000 Subject: [PATCH] * libsupc++/eh_personality.cc: Wrap extern C function definitions in namespace __cxxabiv1. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@115652 138bc75d-0d04-0410-961f-82ee72b054a4 --- libstdc++-v3/ChangeLog | 5 +++++ libstdc++-v3/libsupc++/eh_personality.cc | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index b16d571d3ac..3ffddbf0c55 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2006-07-21 Jason Merrill + + * libsupc++/eh_personality.cc: Wrap extern "C" function + definitions in namespace __cxxabiv1. + 2006-07-21 David Daney PR libgcj/28426 diff --git a/libstdc++-v3/libsupc++/eh_personality.cc b/libstdc++-v3/libsupc++/eh_personality.cc index 6832f7ceff1..7576d407da4 100644 --- a/libstdc++-v3/libsupc++/eh_personality.cc +++ b/libstdc++-v3/libsupc++/eh_personality.cc @@ -326,6 +326,9 @@ empty_exception_spec (lsda_header_info *info, _Unwind_Sword filter_value) 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 @@ -748,3 +751,5 @@ __cxa_call_unexpected (void *exc_obj_in) } } #endif + +} // namespace __cxxabiv1 -- 2.11.4.GIT