summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDmitry Vyukov <dvyukov@google.com>2014-12-11 16:12:45 +0000
committerDmitry Vyukov <dvyukov@google.com>2014-12-11 16:12:45 +0000
commit97eeb3d1205e6d95cc75edcf5ee21d40de74ddc9 (patch)
treeb6b05a69fd06a0a6d9b222305733bd4789be8170 /lib
parentaec9b8a0619f2610ed70bfc7cca2eb119c026251 (diff)
tsan: fix Go build
GetRSS is used in Go build. git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@224023 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
-rw-r--r--lib/sanitizer_common/sanitizer_linux.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/sanitizer_common/sanitizer_linux.cc b/lib/sanitizer_common/sanitizer_linux.cc
index 502ea48b8..36de1ec70 100644
--- a/lib/sanitizer_common/sanitizer_linux.cc
+++ b/lib/sanitizer_common/sanitizer_linux.cc
@@ -379,6 +379,7 @@ static void ReadNullSepFileToArray(const char *path, char ***arr,
}
(*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) {