summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvgeniy Stepanov <eugeni.stepanov@gmail.com>2013-11-01 17:48:35 +0000
committerEvgeniy Stepanov <eugeni.stepanov@gmail.com>2013-11-01 17:48:35 +0000
commitc50f7962c823506109b6307209411b36e0d46abd (patch)
tree0be88e03463aec0ad6793ffba7e3bc2a4af41165
parent7f80655d8283dbdf77bfee4a849eed4d59e95c7a (diff)
downloadcompiler-rt-c50f7962c823506109b6307209411b36e0d46abd.tar.gz
compiler-rt-c50f7962c823506109b6307209411b36e0d46abd.tar.bz2
compiler-rt-c50f7962c823506109b6307209411b36e0d46abd.tar.xz
[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. git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@193870 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--lib/sanitizer_common/sanitizer_platform_limits_linux.cc2
-rw-r--r--lib/sanitizer_common/sanitizer_platform_limits_posix.h3
2 files changed, 1 insertions, 4 deletions
diff --git a/lib/sanitizer_common/sanitizer_platform_limits_linux.cc b/lib/sanitizer_common/sanitizer_platform_limits_linux.cc
index 6efad767..708a1518 100644
--- a/lib/sanitizer_common/sanitizer_platform_limits_linux.cc
+++ b/lib/sanitizer_common/sanitizer_platform_limits_linux.cc
@@ -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
diff --git a/lib/sanitizer_common/sanitizer_platform_limits_posix.h b/lib/sanitizer_common/sanitizer_platform_limits_posix.h
index 2da0f7f8..42b317b1 100644
--- a/lib/sanitizer_common/sanitizer_platform_limits_posix.h
+++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.h
@@ -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;