diff options
| author | Alex Shlyapnikov <alekseys@google.com> | 2017-04-13 18:49:29 +0000 |
|---|---|---|
| committer | Alex Shlyapnikov <alekseys@google.com> | 2017-04-13 18:49:29 +0000 |
| commit | 4765f17738a9c257fee80deb022cf6b82aa70d40 (patch) | |
| tree | a2af2da1200186c475cff80d5bf6cb767a7af832 | |
| parent | 445d03bf00b77c194542692bec416fa5d6965cbb (diff) | |
| download | bcm5719-llvm-4765f17738a9c257fee80deb022cf6b82aa70d40.tar.gz bcm5719-llvm-4765f17738a9c257fee80deb022cf6b82aa70d40.zip | |
Revert "Enable LSan on PowerPC64."
This reverts commit r300204. Breaks ASAN tests on PPC.
llvm-svn: 300237
| -rw-r--r-- | compiler-rt/lib/lsan/lsan_allocator.h | 2 | ||||
| -rw-r--r-- | compiler-rt/lib/lsan/lsan_common.h | 3 | ||||
| -rw-r--r-- | compiler-rt/test/lsan/lit.common.cfg | 5 |
3 files changed, 4 insertions, 6 deletions
diff --git a/compiler-rt/lib/lsan/lsan_allocator.h b/compiler-rt/lib/lsan/lsan_allocator.h index fad5adb01a7..e5def17d4ee 100644 --- a/compiler-rt/lib/lsan/lsan_allocator.h +++ b/compiler-rt/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/compiler-rt/lib/lsan/lsan_common.h b/compiler-rt/lib/lsan/lsan_common.h index ad2eb6afa6b..919be0ec266 100644 --- a/compiler-rt/lib/lsan/lsan_common.h +++ b/compiler-rt/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/compiler-rt/test/lsan/lit.common.cfg b/compiler-rt/test/lsan/lit.common.cfg index c0107e77732..b90c7ef4860 100644 --- a/compiler-rt/test/lsan/lit.common.cfg +++ b/compiler-rt/test/lsan/lit.common.cfg @@ -52,9 +52,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. -# LSAN breaks on Thumb, so disabling from all ARM targets until we sort this out. PR32636. -if config.host_os not in ['Linux'] or config.host_arch not in ['x86_64', 'mips64', 'arm', 'armhf', 'armv7l', 'ppc64']: +# 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 |
