diff options
| author | dim <dim@FreeBSD.org> | 2014-12-30 20:01:06 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2014-12-30 20:01:06 +0000 |
| commit | 82d90d488027b4090723abca792814eb3ede87a4 (patch) | |
| tree | f7082c2eee697d11362cdbb5491f757462e35ad8 /contrib/libcxxrt/cxxabi.h | |
| parent | a1a2c6c54c310e3c91fc3b88eb17631255825698 (diff) | |
| download | FreeBSD-src-82d90d488027b4090723abca792814eb3ede87a4.zip FreeBSD-src-82d90d488027b4090723abca792814eb3ede87a4.tar.gz | |
Import libcxxrt master 00bc29eb6513624824a6d7db2ebc768a4216a604.
Interesting fixes:
76584a0 Reorganize code to use only 32bit atomic ops for 32bit platforms
30d2ae5 Implement __cxa_throw_bad_array_new_length
Reviewed by: bapt
MFC after: 1 month
Differential Revision: https://reviews.freebsd.org/D1390
Diffstat (limited to 'contrib/libcxxrt/cxxabi.h')
| -rw-r--r-- | contrib/libcxxrt/cxxabi.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/libcxxrt/cxxabi.h b/contrib/libcxxrt/cxxabi.h index 7c83360..411c4c7 100644 --- a/contrib/libcxxrt/cxxabi.h +++ b/contrib/libcxxrt/cxxabi.h @@ -110,7 +110,7 @@ struct __cxa_exception * handler count reaches 0 (which it doesn't with the top bit set). */ int handlerCount; -#ifdef __arm__ +#if defined(__arm__) && !defined(__ARM_DWARF_EH__) /** * The ARM EH ABI requires the unwind library to keep track of exceptions * during cleanups. These support nesting, so we need to keep a list of |
