diff options
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++-v3/libsupc++/eh_personality.cc | 5 |
2 files changed, 10 insertions, 0 deletions
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 <jason@redhat.com> + + * libsupc++/eh_personality.cc: Wrap extern "C" function + definitions in namespace __cxxabiv1. + 2006-07-21 David Daney <ddaney@avtrex.com> 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 |