diff options
| author | dim <dim@FreeBSD.org> | 2015-01-31 23:31:45 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2015-01-31 23:31:45 +0000 |
| commit | 86d69c3d82531ea11c08fd6aa551c04cbd9dbc6e (patch) | |
| tree | 5103fdbfa69e7df81a1a90d69fe3c6afa8e52ccc /contrib/libcxxrt | |
| parent | bcc73245049473e101205b6de4927e0dea9b59b8 (diff) | |
| download | FreeBSD-src-86d69c3d82531ea11c08fd6aa551c04cbd9dbc6e.zip FreeBSD-src-86d69c3d82531ea11c08fd6aa551c04cbd9dbc6e.tar.gz | |
Import libcxxrt master 1cb607e89f6135bbc10f3d3b6fba1f983e258dcc.
Interesting fixes:
1cb607e Correct gcc version check for __cxa_begin_catch() declaration
with or without throw()
MFC after: 3 days
Diffstat (limited to 'contrib/libcxxrt')
| -rw-r--r-- | contrib/libcxxrt/exception.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/libcxxrt/exception.cc b/contrib/libcxxrt/exception.cc index d24aa0b..e428773 100644 --- a/contrib/libcxxrt/exception.cc +++ b/contrib/libcxxrt/exception.cc @@ -673,7 +673,7 @@ static _Unwind_Reason_Code trace(struct _Unwind_Context *context, void *c) * If the failure happened by falling off the end of the stack without finding * a handler, prints a back trace before aborting. */ -#if __GNUC__ > 3 && __GNUC_MINOR__ > 2 +#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) extern "C" void *__cxa_begin_catch(void *e) throw(); #else extern "C" void *__cxa_begin_catch(void *e); @@ -1191,7 +1191,7 @@ BEGIN_PERSONALITY_FUNCTION(__gxx_personality_v0) * pointer to the caught exception, which is either the adjusted pointer (for * C++ exceptions) of the unadjusted pointer (for foreign exceptions). */ -#if __GNUC__ > 3 && __GNUC_MINOR__ > 2 +#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) extern "C" void *__cxa_begin_catch(void *e) throw() #else extern "C" void *__cxa_begin_catch(void *e) |
