diff options
| author | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2013-02-19 11:06:41 +0000 |
|---|---|---|
| committer | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2013-02-19 11:06:41 +0000 |
| commit | 3e2e32c618b8ce09a64ef078c6aef43e9ed2d96c (patch) | |
| tree | fedbcf655b360f103ce619874770a00ed57a30c1 | |
| parent | 2e9bd807e2f96de4816c5732a2a2f3a992ebb9c3 (diff) | |
| download | bcm5719-llvm-3e2e32c618b8ce09a64ef078c6aef43e9ed2d96c.tar.gz bcm5719-llvm-3e2e32c618b8ce09a64ef078c6aef43e9ed2d96c.zip | |
[sanitizer] Fix Android build.
llvm-svn: 175503
| -rw-r--r-- | compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc | 7 | ||||
| -rw-r--r-- | compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc index 12c50345388..0ba71a88de9 100644 --- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc +++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc @@ -40,13 +40,16 @@ namespace __sanitizer { #if defined(__linux__) unsigned struct_rlimit_sz = sizeof(struct rlimit); - unsigned struct_rlimit64_sz = sizeof(struct rlimit64); unsigned struct_dirent_sz = sizeof(struct dirent); unsigned struct_statfs_sz = sizeof(struct statfs); - unsigned struct_statfs64_sz = sizeof(struct statfs64); unsigned struct_epoll_event_sz = sizeof(struct epoll_event); #endif // __linux__ +#if defined(__linux__) && !defined(__ANDROID__) + unsigned struct_rlimit64_sz = sizeof(struct rlimit64); + unsigned struct_statfs64_sz = sizeof(struct statfs64); +#endif // __linux__ && !__ANDROID__ + void* __sanitizer_get_msghdr_iov_iov_base(void* msg, int idx) { return ((struct msghdr *)msg)->msg_iov[idx].iov_base; } 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 e327b99eff8..dd006630b8e 100644 --- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h +++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h @@ -24,13 +24,16 @@ namespace __sanitizer { #if defined(__linux__) extern unsigned struct_rlimit_sz; - extern unsigned struct_rlimit64_sz; extern unsigned struct_dirent_sz; extern unsigned struct_statfs_sz; - extern unsigned struct_statfs64_sz; extern unsigned struct_epoll_event_sz; #endif // __linux__ +#if defined(__linux__) && !defined(__ANDROID__) + extern unsigned struct_rlimit64_sz; + extern unsigned struct_statfs64_sz; +#endif // __linux__ && !__ANDROID__ + void* __sanitizer_get_msghdr_iov_iov_base(void* msg, int idx); uptr __sanitizer_get_msghdr_iov_iov_len(void* msg, int idx); uptr __sanitizer_get_msghdr_iovlen(void* msg); |
