diff options
| author | Kostya Serebryany <kcc@google.com> | 2012-11-23 14:46:25 +0000 |
|---|---|---|
| committer | Kostya Serebryany <kcc@gcc.gnu.org> | 2012-11-23 14:46:25 +0000 |
| commit | e297eb600dd52acd73fb64ca45905b68f4e9b99b (patch) | |
| tree | a354102cd1c27b09eefe0b04f517d4ecac5bc566 /libsanitizer/asan/asan_allocator.cc | |
| parent | 8ddf5c28ea6be09213739c94f9765019be476bb0 (diff) | |
| download | gcc-e297eb600dd52acd73fb64ca45905b68f4e9b99b.tar.gz | |
[libsanitizer] merge from upstream r168514
From-SVN: r193756
Diffstat (limited to 'libsanitizer/asan/asan_allocator.cc')
| -rw-r--r-- | libsanitizer/asan/asan_allocator.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libsanitizer/asan/asan_allocator.cc b/libsanitizer/asan/asan_allocator.cc index 3a92802e972..63ff607f858 100644 --- a/libsanitizer/asan/asan_allocator.cc +++ b/libsanitizer/asan/asan_allocator.cc @@ -56,7 +56,7 @@ static const uptr kMallocSizeClassStepLog = 26; static const uptr kMallocSizeClassStep = 1UL << kMallocSizeClassStepLog; static const uptr kMaxAllowedMallocSize = - (__WORDSIZE == 32) ? 3UL << 30 : 8UL << 30; + (SANITIZER_WORDSIZE == 32) ? 3UL << 30 : 8UL << 30; static inline bool IsAligned(uptr a, uptr alignment) { return (a & (alignment - 1)) == 0; @@ -83,7 +83,7 @@ static inline uptr RoundUpToPowerOfTwo(uptr size) { unsigned long up; // NOLINT #if !defined(_WIN32) || defined(__clang__) - up = __WORDSIZE - 1 - __builtin_clzl(size); + up = SANITIZER_WORDSIZE - 1 - __builtin_clzl(size); #elif defined(_WIN64) _BitScanReverse64(&up, size); #else |