diff options
| author | Alexey Samsonov <samsonov@google.com> | 2013-01-18 09:20:06 +0000 |
|---|---|---|
| committer | Alexey Samsonov <samsonov@google.com> | 2013-01-18 09:20:06 +0000 |
| commit | 9585613334d032f6471b1ce6fd75099b025fbd77 (patch) | |
| tree | dd13700abd13ef7fe7ff988440d41a3eed4ad6b1 | |
| parent | 997b08ce3cb6d4de8c2ddb784884aea5f833c038 (diff) | |
| download | bcm5719-llvm-9585613334d032f6471b1ce6fd75099b025fbd77.tar.gz bcm5719-llvm-9585613334d032f6471b1ce6fd75099b025fbd77.zip | |
[ASan] fixes for Android build
llvm-svn: 172800
| -rw-r--r-- | compiler-rt/lib/asan/asan_linux.cc | 2 | ||||
| -rw-r--r-- | compiler-rt/lib/asan/tests/asan_noinst_test.cc | 2 | ||||
| -rw-r--r-- | compiler-rt/lib/asan/tests/asan_test.cc | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/compiler-rt/lib/asan/asan_linux.cc b/compiler-rt/lib/asan/asan_linux.cc index 1606ab25824..845493de095 100644 --- a/compiler-rt/lib/asan/asan_linux.cc +++ b/compiler-rt/lib/asan/asan_linux.cc @@ -127,7 +127,7 @@ void ReadContextStack(void *context, uptr *stack, uptr *ssize) { } #else void ReadContextStack(void *context, uptr *stack, uptr *ssize) { - return UNIMPLEMENTED(); + UNIMPLEMENTED(); } #endif diff --git a/compiler-rt/lib/asan/tests/asan_noinst_test.cc b/compiler-rt/lib/asan/tests/asan_noinst_test.cc index 80667ac7c70..576312bf319 100644 --- a/compiler-rt/lib/asan/tests/asan_noinst_test.cc +++ b/compiler-rt/lib/asan/tests/asan_noinst_test.cc @@ -390,7 +390,7 @@ TEST(AddressSanitizerInterface, GetAllocatedSizeAndOwnershipTest) { // allocated size. EXPECT_TRUE(__asan_get_ownership(zero_alloc)); // Allocated size is 0 or 1 depending on the allocator used. - EXPECT_LT(__asan_get_allocated_size(zero_alloc), 2); + EXPECT_LT(__asan_get_allocated_size(zero_alloc), 2U); } free(zero_alloc); } diff --git a/compiler-rt/lib/asan/tests/asan_test.cc b/compiler-rt/lib/asan/tests/asan_test.cc index ef7846dbc0d..5fa65b2af5d 100644 --- a/compiler-rt/lib/asan/tests/asan_test.cc +++ b/compiler-rt/lib/asan/tests/asan_test.cc @@ -1667,7 +1667,7 @@ TEST(AddressSanitizer, DISABLED_MemIntrinsicCallByPointerTest) { CallMemTransferByPointer(&memmove); } -#if defined(__linux__) && !defined(ANDROID) +#if defined(__linux__) && !defined(ANDROID) && !defined(__ANDROID__) #define READ_TEST(READ_N_BYTES) \ char *x = new char[10]; \ int fd = open("/proc/self/stat", O_RDONLY); \ @@ -1690,7 +1690,7 @@ TEST(AddressSanitizer, pread64) { TEST(AddressSanitizer, read) { READ_TEST(read(fd, x, 15)); } -#endif // defined(__linux__) && !defined(ANDROID) +#endif // defined(__linux__) && !defined(ANDROID) && !defined(__ANDROID__) // This test case fails // Clang optimizes memcpy/memset calls which lead to unaligned access |
