summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorian <ian@FreeBSD.org>2014-07-22 20:32:24 +0000
committerian <ian@FreeBSD.org>2014-07-22 20:32:24 +0000
commit1dcbe2ad0d2efff749092ccf0fad15eb18c82443 (patch)
tree9e456d6b6c3eb7bb2fd47d886a46bf14a918757f
parentf2c8c4c7d8375602f7f002c9b28991907a6a1021 (diff)
downloadFreeBSD-src-1dcbe2ad0d2efff749092ccf0fad15eb18c82443.zip
FreeBSD-src-1dcbe2ad0d2efff749092ccf0fad15eb18c82443.tar.gz
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++.
-rw-r--r--contrib/libstdc++/libsupc++/unwind-cxx.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/libstdc++/libsupc++/unwind-cxx.h b/contrib/libstdc++/libsupc++/unwind-cxx.h
index 7eb150e..2ccd11e 100644
--- a/contrib/libstdc++/libsupc++/unwind-cxx.h
+++ b/contrib/libstdc++/libsupc++/unwind-cxx.h
@@ -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
OpenPOWER on IntegriCloud