svn commit: r268993 - head/contrib/libstdc++/libsupc++

Ian Lepore ian at FreeBSD.org
Tue Jul 22 20:32:25 UTC 2014


Author: ian
Date: Tue Jul 22 20:32:24 2014
New Revision: 268993
URL: http://svnweb.freebsd.org/changeset/base/268993

Log:
  Fix EABI unwind function declarations to match the function definitions.
  The mismatch was noticed by clang, when using it to compile the in-tree
  gcc and libstdc++.

Modified:
  head/contrib/libstdc++/libsupc++/unwind-cxx.h

Modified: head/contrib/libstdc++/libsupc++/unwind-cxx.h
==============================================================================
--- head/contrib/libstdc++/libsupc++/unwind-cxx.h	Tue Jul 22 20:13:46 2014	(r268992)
+++ head/contrib/libstdc++/libsupc++/unwind-cxx.h	Tue Jul 22 20:32:24 2014	(r268993)
@@ -142,9 +142,9 @@ typedef enum {
   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*,
+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" bool __cxa_begin_cleanup (_Unwind_Exception*);
 extern "C" void __cxa_end_cleanup (void);
 #endif
 


More information about the svn-src-head mailing list