[llvm-commits] [compiler-rt] r172800 - in /compiler-rt/trunk/lib/asan: asan_linux.cc tests/asan_noinst_test.cc tests/asan_test.cc

[Alexey Samsonov]

Author: samsonov
Date: Fri Jan 18 03:20:06 2013
New Revision: 172800

URL: http://llvm.org/viewvc/llvm-project?rev=172800&view=rev
Log:
[ASan] fixes for Android build

Modified:
    compiler-rt/trunk/lib/asan/asan_linux.cc
    compiler-rt/trunk/lib/asan/tests/asan_noinst_test.cc
    compiler-rt/trunk/lib/asan/tests/asan_test.cc

Modified: compiler-rt/trunk/lib/asan/asan_linux.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_linux.cc?rev=172800&r1=172799&r2=172800&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/asan_linux.cc (original)
+++ compiler-rt/trunk/lib/asan/asan_linux.cc Fri Jan 18 03:20:06 2013
@@ -127,7 +127,7 @@
 }
 #else
 void ReadContextStack(void *context, uptr *stack, uptr *ssize) {
-  return UNIMPLEMENTED();
+  UNIMPLEMENTED();
 }
 #endif
 

Modified: compiler-rt/trunk/lib/asan/tests/asan_noinst_test.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/tests/asan_noinst_test.cc?rev=172800&r1=172799&r2=172800&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/tests/asan_noinst_test.cc (original)
+++ compiler-rt/trunk/lib/asan/tests/asan_noinst_test.cc Fri Jan 18 03:20:06 2013
@@ -390,7 +390,7 @@
     // 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);
 }

Modified: compiler-rt/trunk/lib/asan/tests/asan_test.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/tests/asan_test.cc?rev=172800&r1=172799&r2=172800&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/tests/asan_test.cc (original)
+++ compiler-rt/trunk/lib/asan/tests/asan_test.cc Fri Jan 18 03:20:06 2013
@@ -1667,7 +1667,7 @@
   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, 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