diff options
| author | Adrian Chadd <adrian@FreeBSD.org> | 2020-10-18 17:31:10 +0000 |
|---|---|---|
| committer | Adrian Chadd <adrian@FreeBSD.org> | 2020-10-18 17:31:10 +0000 |
| commit | d061adc48d54ebb91b1709b16c59e8ceca895be2 (patch) | |
| tree | c9b37b0d7bc84961419ccb05458744d49702a5f4 /contrib | |
| parent | 0c325f53f16731f608919a4489f96fbbe28d2344 (diff) | |
| download | src-test2-d061adc48d54ebb91b1709b16c59e8ceca895be2.tar.gz src-test2-d061adc48d54ebb91b1709b16c59e8ceca895be2.zip | |
[libcxx] Fix atomic type for mips32 on gcc to work w/out needing libatomic
When compiling this for mips32 on gcc-6.x, we'd hit issues where we
don't have 64 bit atomics on mips32.
gcc implements this using libatomic, which we don't currently include
in our freebsd-gcc compiler packages.
So for now add this work around so mips32 works. It's also fine for
mips64. We can fix this later once we get libatomic included.
Approved by: dim
Differential Revision: https://reviews.freebsd.org/D26774
Notes
Notes:
svn path=/head/; revision=366814
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/llvm-project/libcxx/include/atomic | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/llvm-project/libcxx/include/atomic b/contrib/llvm-project/libcxx/include/atomic index 9c2898653788..2dfb6f7b8131 100644 --- a/contrib/llvm-project/libcxx/include/atomic +++ b/contrib/llvm-project/libcxx/include/atomic @@ -1480,11 +1480,11 @@ struct __cxx_atomic_impl : public _Base { : _Base(value) {} }; -#ifdef __linux__ +#if defined(__linux__) || (defined(__FreeBSD__) && defined(__mips__)) using __cxx_contention_t = int32_t; #else using __cxx_contention_t = int64_t; -#endif //__linux__ +#endif #if _LIBCPP_STD_VER >= 11 |