diff options
| author | Alex Shlyapnikov <alekseys@google.com> | 2017-04-21 00:36:29 +0000 |
|---|---|---|
| committer | Alex Shlyapnikov <alekseys@google.com> | 2017-04-21 00:36:29 +0000 |
| commit | 2c94915622b5855125f9042814c39e50aa1b1e74 (patch) | |
| tree | da2ea37e6de4d221b386c81626b3710611cad129 | |
| parent | b6eb475185726d40e2ff6d47e246e565c17237eb (diff) | |
Disable LSan on ppc64, some tests are failing.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@300933 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/lsan/lsan_allocator.h | 2 | ||||
| -rw-r--r-- | lib/lsan/lsan_common.h | 3 | ||||
| -rw-r--r-- | test/lsan/lit.common.cfg | 4 |
3 files changed, 4 insertions, 5 deletions
diff --git a/lib/lsan/lsan_allocator.h b/lib/lsan/lsan_allocator.h index fad5adb01..e5def17d4 100644 --- a/lib/lsan/lsan_allocator.h +++ b/lib/lsan/lsan_allocator.h @@ -59,7 +59,7 @@ typedef CompactSizeClassMap SizeClassMap; typedef SizeClassAllocator32<0, SANITIZER_MMAP_RANGE_SIZE, sizeof(ChunkMetadata), SizeClassMap, kRegionSizeLog, ByteMap> PrimaryAllocator; -#elif defined(__x86_64__) || defined(__powerpc64__) +#elif defined(__x86_64__) struct AP64 { // Allocator64 parameters. Deliberately using a short name. static const uptr kSpaceBeg = 0x600000000000ULL; static const uptr kSpaceSize = 0x40000000000ULL; // 4T. diff --git a/lib/lsan/lsan_common.h b/lib/lsan/lsan_common.h index beb31d6f4..121b9c082 100644 --- a/lib/lsan/lsan_common.h +++ b/lib/lsan/lsan_common.h @@ -32,8 +32,7 @@ // new architecture inside sanitizer library. #if (SANITIZER_LINUX && !SANITIZER_ANDROID || SANITIZER_MAC) && \ (SANITIZER_WORDSIZE == 64) && \ - (defined(__x86_64__) || defined(__mips64) || defined(__aarch64__) || \ - defined(__powerpc64__)) + (defined(__x86_64__) || defined(__mips64) || defined(__aarch64__)) #define CAN_SANITIZE_LEAKS 1 #elif defined(__i386__) && \ (SANITIZER_LINUX && !SANITIZER_ANDROID || SANITIZER_MAC) diff --git a/test/lsan/lit.common.cfg b/test/lsan/lit.common.cfg index 3441f6fdd..888ed424d 100644 --- a/test/lsan/lit.common.cfg +++ b/test/lsan/lit.common.cfg @@ -67,8 +67,8 @@ config.substitutions.append( ("%clangxx ", build_invocation(clang_cxxflags)) ) config.substitutions.append( ("%clang_lsan ", build_invocation(clang_lsan_cflags)) ) config.substitutions.append( ("%clangxx_lsan ", build_invocation(clang_lsan_cxxflags)) ) -# LeakSanitizer tests are currently supported on x86-64 Linux, PowerPC64 Linux, arm Linux, and mips64 Linux only. -if config.host_os not in ['Linux'] or config.host_arch not in ['x86_64', 'ppc64', 'mips64', 'arm', 'armhf', 'armv7l']: +# LeakSanitizer tests are currently supported on x86-64 Linux, arm Linux, and mips64 Linux only. +if config.host_os not in ['Linux'] or config.host_arch not in ['x86_64', 'mips64', 'arm', 'armhf', 'armv7l']: config.unsupported = True # Don't support Thumb due to broken fast unwinder |