summaryrefslogtreecommitdiffstats
path: root/compiler-rt/lib
diff options
context:
space:
mode:
authorKostya Serebryany <kcc@google.com>2013-01-23 14:07:17 +0000
committerKostya Serebryany <kcc@google.com>2013-01-23 14:07:17 +0000
commit7206a145dd83c3c39706c9a6c3581ae57d4c3630 (patch)
treefb9acddbe1c309f3c171a1b4b5426da5fb112253 /compiler-rt/lib
parent8f267137c21cb984c84268f64a5782eb9699004c (diff)
downloadbcm5719-llvm-7206a145dd83c3c39706c9a6c3581ae57d4c3630.tar.gz
bcm5719-llvm-7206a145dd83c3c39706c9a6c3581ae57d4c3630.zip
[sanitizer] increase the minimal mmap size in allocator to 2^16; fix the asan Mac build
llvm-svn: 173261
Diffstat (limited to 'compiler-rt/lib')
-rw-r--r--compiler-rt/lib/asan/asan_mapping.h1
-rw-r--r--compiler-rt/lib/sanitizer_common/sanitizer_allocator.h2
2 files changed, 2 insertions, 1 deletions
diff --git a/compiler-rt/lib/asan/asan_mapping.h b/compiler-rt/lib/asan/asan_mapping.h
index 06efabee624..48b24545b99 100644
--- a/compiler-rt/lib/asan/asan_mapping.h
+++ b/compiler-rt/lib/asan/asan_mapping.h
@@ -67,6 +67,7 @@ extern SANITIZER_INTERFACE_ATTRIBUTE uptr __asan_mapping_offset;
namespace __asan {
+SANITIZER_INTERFACE_ATTRIBUTE
extern uptr kHighMemEnd; // Initialized in __asan_init.
static inline bool AddrIsInLowMem(uptr a) {
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_allocator.h b/compiler-rt/lib/sanitizer_common/sanitizer_allocator.h
index ad89c3c870d..23d3b46a087 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_allocator.h
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_allocator.h
@@ -336,7 +336,7 @@ class SizeClassAllocator64 {
// or with one element if its size is greater.
static const uptr kPopulateSize = 1 << 14;
// Call mmap for user memory with at least this size.
- static const uptr kUserMapSize = 1 << 15;
+ static const uptr kUserMapSize = 1 << 16;
// Call mmap for metadata memory with at least this size.
static const uptr kMetaMapSize = 1 << 16;
OpenPOWER on IntegriCloud