[compiler-rt] r193870 - [sanitizer] Switch to an older version of struct iocb that is found in the latest Android NDK.

[Evgeniy Stepanov]

Author: eugenis
Date: Fri Nov  1 12:48:35 2013
New Revision: 193870

URL: http://llvm.org/viewvc/llvm-project?rev=193870&view=rev
Log:
[sanitizer] Switch to an older version of struct iocb that is found in the latest Android NDK.

They are binary compatible, and we don't use any of the new fields anyway.

Modified:
    compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_linux.cc
    compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_posix.h

Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_linux.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_linux.cc?rev=193870&r1=193869&r2=193870&view=diff
==============================================================================
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_linux.cc (original)
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_linux.cc Fri Nov  1 12:48:35 2013
@@ -68,7 +68,5 @@ CHECK_SIZE_AND_OFFSET(iocb, aio_fildes);
 CHECK_SIZE_AND_OFFSET(iocb, aio_buf);
 CHECK_SIZE_AND_OFFSET(iocb, aio_nbytes);
 CHECK_SIZE_AND_OFFSET(iocb, aio_offset);
-CHECK_SIZE_AND_OFFSET(iocb, aio_flags);
-CHECK_SIZE_AND_OFFSET(iocb, aio_resfd);
 
 #endif  // SANITIZER_LINUX

Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_posix.h
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_posix.h?rev=193870&r1=193869&r2=193870&view=diff
==============================================================================
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_posix.h (original)
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_posix.h Fri Nov  1 12:48:35 2013
@@ -82,8 +82,7 @@ namespace __sanitizer {
     u64   aio_nbytes;
     s64   aio_offset;
     u64   aio_reserved2;
-    u32   aio_flags;
-    u32   aio_resfd;
+    u64   aio_reserved3;
   };
 
   extern unsigned iocb_cmd_pread;