diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2017-04-16 16:02:53 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2017-04-16 16:02:53 +0000 |
| commit | ab0bf875a5f328a6710f4e48258979ae1bc8da1c (patch) | |
| tree | 66903cf9f73151825893dcc216b04c0930317a10 /lib/scudo/scudo_allocator.h | |
| parent | abacad30a54c59ad437ccf54ec5236a8dd7f3ba9 (diff) | |
| download | src-ab0bf875a5f328a6710f4e48258979ae1bc8da1c.tar.gz src-ab0bf875a5f328a6710f4e48258979ae1bc8da1c.zip | |
Vendor import of compiler-rt trunk r300422:vendor/compiler-rt/compiler-rt-trunk-r300422
Notes
Notes:
svn path=/vendor/compiler-rt/dist/; revision=317021
svn path=/vendor/compiler-rt/compiler-rt-trunk-r300422/; revision=317022; tag=vendor/compiler-rt/compiler-rt-trunk-r300422
Diffstat (limited to 'lib/scudo/scudo_allocator.h')
| -rw-r--r-- | lib/scudo/scudo_allocator.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/scudo/scudo_allocator.h b/lib/scudo/scudo_allocator.h index 6431a2aa07d7..5f5225b36286 100644 --- a/lib/scudo/scudo_allocator.h +++ b/lib/scudo/scudo_allocator.h @@ -18,7 +18,9 @@ #include "sanitizer_common/sanitizer_allocator.h" -#include <atomic> +#if !SANITIZER_LINUX +# error "The Scudo hardened allocator is currently only supported on Linux." +#endif namespace __scudo { @@ -54,7 +56,7 @@ struct UnpackedHeader { u64 Salt : 8; }; -typedef std::atomic<PackedHeader> AtomicPackedHeader; +typedef atomic_uint64_t AtomicPackedHeader; COMPILER_CHECK(sizeof(UnpackedHeader) == sizeof(PackedHeader)); // Minimum alignment of 8 bytes for 32-bit, 16 for 64-bit |