[compiler-rt] r224023 - tsan: fix Go build

Dmitry Vyukov dvyukov at google.com
Thu Dec 11 08:12:45 PST 2014


Author: dvyukov
Date: Thu Dec 11 10:12:45 2014
New Revision: 224023

URL: http://llvm.org/viewvc/llvm-project?rev=224023&view=rev
Log:
tsan: fix Go build

GetRSS is used in Go build.


Modified:
    compiler-rt/trunk/lib/sanitizer_common/sanitizer_linux.cc

Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_linux.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_linux.cc?rev=224023&r1=224022&r2=224023&view=diff
==============================================================================
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_linux.cc (original)
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_linux.cc Thu Dec 11 10:12:45 2014
@@ -379,6 +379,7 @@ static void ReadNullSepFileToArray(const
   }
   (*arr)[count] = 0;
 }
+#endif
 
 uptr GetRSS() {
   uptr fd = OpenFile("/proc/self/statm", false);
@@ -407,8 +408,6 @@ uptr GetRSS() {
   return rss * 4096;
 }
 
-#endif
-
 static void GetArgsAndEnv(char*** argv, char*** envp) {
 #if !SANITIZER_GO
   if (&__libc_stack_end) {





More information about the llvm-commits mailing list