[llvm-branch-commits] [compiler-rt-branch] r195461 - Merging r195433:

[Evgeniy Stepanov]

Author: eugenis
Date: Fri Nov 22 08:00:23 2013
New Revision: 195461

URL: http://llvm.org/viewvc/llvm-project?rev=195461&view=rev
Log:
Merging r195433:
------------------------------------------------------------------------
r195433 | eugenis | 2013-11-22 13:26:10 +0400 (Fri, 22 Nov 2013) | 2 lines

[sanitizer] Fix build.

------------------------------------------------------------------------

Modified:
    compiler-rt/branches/release_34/   (props changed)
    compiler-rt/branches/release_34/lib/sanitizer_common/sanitizer_common_syscalls.inc
    compiler-rt/branches/release_34/lib/sanitizer_common/sanitizer_platform_limits_linux.cc
    compiler-rt/branches/release_34/lib/sanitizer_common/sanitizer_platform_limits_posix.h

Propchange: compiler-rt/branches/release_34/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 22 08:00:23 2013
@@ -1 +1 @@
-/compiler-rt/trunk:195427
+/compiler-rt/trunk:195427,195433

Modified: compiler-rt/branches/release_34/lib/sanitizer_common/sanitizer_common_syscalls.inc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/branches/release_34/lib/sanitizer_common/sanitizer_common_syscalls.inc?rev=195461&r1=195460&r2=195461&view=diff
==============================================================================
--- compiler-rt/branches/release_34/lib/sanitizer_common/sanitizer_common_syscalls.inc (original)
+++ compiler-rt/branches/release_34/lib/sanitizer_common/sanitizer_common_syscalls.inc Fri Nov 22 08:00:23 2013
@@ -2707,11 +2707,7 @@ PRE_SYSCALL(perf_event_open)(void *attr_
                              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) {}

Modified: compiler-rt/branches/release_34/lib/sanitizer_common/sanitizer_platform_limits_linux.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/branches/release_34/lib/sanitizer_common/sanitizer_platform_limits_linux.cc?rev=195461&r1=195460&r2=195461&view=diff
==============================================================================
--- compiler-rt/branches/release_34/lib/sanitizer_common/sanitizer_platform_limits_linux.cc (original)
+++ compiler-rt/branches/release_34/lib/sanitizer_common/sanitizer_platform_limits_linux.cc Fri Nov 22 08:00:23 2013
@@ -52,10 +52,6 @@ COMPILER_CHECK(struct_kernel_stat64_sz =
 
 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);
 

Modified: compiler-rt/branches/release_34/lib/sanitizer_common/sanitizer_platform_limits_posix.h
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/branches/release_34/lib/sanitizer_common/sanitizer_platform_limits_posix.h?rev=195461&r1=195460&r2=195461&view=diff
==============================================================================
--- compiler-rt/branches/release_34/lib/sanitizer_common/sanitizer_platform_limits_posix.h (original)
+++ compiler-rt/branches/release_34/lib/sanitizer_common/sanitizer_platform_limits_posix.h Fri Nov 22 08:00:23 2013
@@ -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;