[src/trunk]: src/external/gpl3/gcc/dist/libstdc++-v3/libsupc++ fix inconsiste...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b93953a44c6a
branches:  trunk
changeset: 783147:b93953a44c6a
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Dec 08 01:38:26 2012 +0000

description:
fix inconsistencies in EABI decls.

diffstat:

 external/gpl3/gcc/dist/libstdc++-v3/libsupc++/eh_arm.cc    |  9 ++++++++-
 external/gpl3/gcc/dist/libstdc++-v3/libsupc++/unwind-cxx.h |  4 ++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diffs (41 lines):

diff -r 9d733e4248ca -r b93953a44c6a external/gpl3/gcc/dist/libstdc++-v3/libsupc++/eh_arm.cc
--- a/external/gpl3/gcc/dist/libstdc++-v3/libsupc++/eh_arm.cc   Fri Dec 07 22:21:03 2012 +0000
+++ b/external/gpl3/gcc/dist/libstdc++-v3/libsupc++/eh_arm.cc   Sat Dec 08 01:38:26 2012 +0000
@@ -92,7 +92,12 @@
 }
 
 // ABI defined routine called at the start of a cleanup handler.
-extern "C" bool
+extern "C"
+#ifdef __ARM_EABI_UNWINDER__
+void
+#else
+bool
+#endif
 __cxa_begin_cleanup(_Unwind_Exception* ue_header)
 {
   __cxa_eh_globals *globals = __cxa_get_globals();
@@ -121,7 +126,9 @@
       globals->propagatingExceptions = header;
     }
 
+#ifndef __ARM_EABI_UNWINDER__
   return true;
+#endif
 }
 
 // Do the work for __cxa_end_cleanup.  Returns the currently propagating
diff -r 9d733e4248ca -r b93953a44c6a external/gpl3/gcc/dist/libstdc++-v3/libsupc++/unwind-cxx.h
--- a/external/gpl3/gcc/dist/libstdc++-v3/libsupc++/unwind-cxx.h        Fri Dec 07 22:21:03 2012 +0000
+++ b/external/gpl3/gcc/dist/libstdc++-v3/libsupc++/unwind-cxx.h        Sat Dec 08 01:38:26 2012 +0000
@@ -196,8 +196,8 @@
   ctm_succeeded = 1,
   ctm_succeeded_with_ptr_to_base = 2
 } __cxa_type_match_result;
-extern "C" bool __cxa_type_match(_Unwind_Exception*, const std::type_info*,
-                                bool, void**);
+extern "C" __cxa_type_match_result __cxa_type_match(_Unwind_Exception*,
+    const std::type_info*, bool, void**);
 extern "C" void __cxa_begin_cleanup (_Unwind_Exception*);
 extern "C" void __cxa_end_cleanup (void);
 #endif