diff options
| author | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2013-11-22 14:00:23 +0000 |
|---|---|---|
| committer | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2013-11-22 14:00:23 +0000 |
| commit | 43e7e4ec3743b46a1d2e8f268d02c976c9e8e5a6 (patch) | |
| tree | de05fa8bdbcb25b28fccfb5650dea55e3c40d786 | |
| parent | e1e68833ddbebf4827690218763c0be5b91104e7 (diff) | |
| download | compiler-rt-43e7e4ec3743b46a1d2e8f268d02c976c9e8e5a6.tar.gz | |
Merging r195433:
------------------------------------------------------------------------
r195433 | eugenis | 2013-11-22 13:26:10 +0400 (Fri, 22 Nov 2013) | 2 lines
[sanitizer] Fix build.
------------------------------------------------------------------------
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/branches/release_34@195461 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/sanitizer_common/sanitizer_common_syscalls.inc | 6 | ||||
| -rw-r--r-- | lib/sanitizer_common/sanitizer_platform_limits_linux.cc | 4 | ||||
| -rw-r--r-- | lib/sanitizer_common/sanitizer_platform_limits_posix.h | 1 |
3 files changed, 1 insertions, 10 deletions
diff --git a/lib/sanitizer_common/sanitizer_common_syscalls.inc b/lib/sanitizer_common/sanitizer_common_syscalls.inc index 328363737..00a9c301d 100644 --- a/lib/sanitizer_common/sanitizer_common_syscalls.inc +++ b/lib/sanitizer_common/sanitizer_common_syscalls.inc @@ -2707,11 +2707,7 @@ PRE_SYSCALL(perf_event_open)(void *attr_uptr, long pid, long cpu, long group_fd, long flags) {} POST_SYSCALL(perf_event_open)(long res, void *attr_uptr, long pid, long cpu, - long group_fd, long flags) { - if (res >= 0) { - if (attr_uptr) POST_WRITE(attr_uptr, struct_perf_event_attr_sz); - } -} + long group_fd, long flags) {} PRE_SYSCALL(mmap_pgoff)(long addr, long len, long prot, long flags, long fd, long pgoff) {} diff --git a/lib/sanitizer_common/sanitizer_platform_limits_linux.cc b/lib/sanitizer_common/sanitizer_platform_limits_linux.cc index 5331a91db..c8f6c4005 100644 --- a/lib/sanitizer_common/sanitizer_platform_limits_linux.cc +++ b/lib/sanitizer_common/sanitizer_platform_limits_linux.cc @@ -52,10 +52,6 @@ COMPILER_CHECK(struct_kernel_stat64_sz == sizeof(struct stat64)); COMPILER_CHECK(struct_io_event_sz == sizeof(struct io_event)); -#if !SANITIZER_ANDROID -COMPILER_CHECK(struct_perf_event_attr_sz == sizeof(struct perf_event_attr)); -#endif - COMPILER_CHECK(iocb_cmd_pread == IOCB_CMD_PREAD); COMPILER_CHECK(iocb_cmd_pwrite == IOCB_CMD_PWRITE); diff --git a/lib/sanitizer_common/sanitizer_platform_limits_posix.h b/lib/sanitizer_common/sanitizer_platform_limits_posix.h index 9df37121e..84f9d3b18 100644 --- a/lib/sanitizer_common/sanitizer_platform_limits_posix.h +++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.h @@ -59,7 +59,6 @@ namespace __sanitizer { const unsigned struct_kernel_stat64_sz = 96; #endif const unsigned struct_io_event_sz = 32; - const unsigned struct_perf_event_attr_sz = 72; extern unsigned struct_utimbuf_sz; extern unsigned struct_new_utsname_sz; |