diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2015-01-31 23:14:24 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2015-01-31 23:14:24 +0000 |
| commit | 1666b1da2f386c2aef4af81f80e46f7677acff53 (patch) | |
| tree | c05056e92020efc412ad520f8ae878e5e50ce9c4 | |
| parent | c8c9adf9f575b5543893c29d7f37d94a4ce72e05 (diff) | |
| download | src-1666b1da2f386c2aef4af81f80e46f7677acff53.tar.gz src-1666b1da2f386c2aef4af81f80e46f7677acff53.zip | |
Import libcxxrt master 1cb607e89f6135bbc10f3d3b6fba1f983e258dcc.vendor/libcxxrt/2014-12-31-1cb607e89f6135bbc10f3d3b6fba1f983e258dcc
Interesting fixes:
1cb607e Correct gcc version check for __cxa_begin_catch() declaration
with or without throw()
Notes
Notes:
svn path=/vendor/libcxxrt/dist/; revision=278013
svn path=/vendor/libcxxrt/2014-12-31-1cb607e89f6135bbc10f3d3b6fba1f983e258dcc/; revision=278014; tag=vendor/libcxxrt/2014-12-31-1cb607e89f6135bbc10f3d3b6fba1f983e258dcc
| -rw-r--r-- | exception.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/exception.cc b/exception.cc index ed5ad2b98657..7781ebbebb9f 100644 --- a/exception.cc +++ b/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); @@ -1189,7 +1189,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) |