summaryrefslogtreecommitdiffstats
path: root/compiler-rt
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
commit7342857825bcdef06df1147b31c2796a75d8b211 (patch)
tree8ca375420b5dd8e3c359060decacb10118e68798 /compiler-rt
parentef1a950b48bca4275ba5d9ae27d80d64414492c5 (diff)
downloadbcm5719-llvm-7342857825bcdef06df1147b31c2796a75d8b211.tar.gz
bcm5719-llvm-7342857825bcdef06df1147b31c2796a75d8b211.zip
[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. llvm-svn: 193870
Diffstat (limited to 'compiler-rt')
-rw-r--r--compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_linux.cc2
-rw-r--r--compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h3
2 files changed, 1 insertions, 4 deletions
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_linux.cc b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_linux.cc
index 6efad767523..708a15185ce 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_linux.cc
+++ b/compiler-rt/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/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
index 2da0f7f8472..42b317b164d 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
+++ b/compiler-rt/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;
OpenPOWER on IntegriCloud