summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Vyukov <dvyukov@google.com>2015-11-12 11:54:25 +0000
committerDmitry Vyukov <dvyukov@google.com>2015-11-12 11:54:25 +0000
commit110094017ce85435ab55207efdb4aab4ad95a16d (patch)
tree97c78cf81701d92a5a5a1607b904ed1799d51659
parentba85da8482315fa1f5c364120004cd20dfa5c365 (diff)
downloadbcm5719-llvm-110094017ce85435ab55207efdb4aab4ad95a16d.tar.gz
bcm5719-llvm-110094017ce85435ab55207efdb4aab4ad95a16d.zip
tsan: fix Go build on linux
librt is not linked in in Go build. llvm-svn: 252877
-rw-r--r--compiler-rt/lib/sanitizer_common/sanitizer_posix_libcdep.cc2
-rwxr-xr-xcompiler-rt/lib/tsan/go/buildgo.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_posix_libcdep.cc b/compiler-rt/lib/sanitizer_common/sanitizer_posix_libcdep.cc
index d7b9f20414c..751df365b6f 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_posix_libcdep.cc
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_posix_libcdep.cc
@@ -228,7 +228,7 @@ void PrepareForSandboxing(__sanitizer_sandbox_arguments *args) {
#endif
}
-#if SANITIZER_ANDROID
+#if SANITIZER_ANDROID || SANITIZER_GO
int GetNamedMappingFd(const char *name, uptr size) {
return -1;
}
diff --git a/compiler-rt/lib/tsan/go/buildgo.sh b/compiler-rt/lib/tsan/go/buildgo.sh
index a7e12f18c3c..f31b7dad53e 100755
--- a/compiler-rt/lib/tsan/go/buildgo.sh
+++ b/compiler-rt/lib/tsan/go/buildgo.sh
@@ -36,7 +36,7 @@ SRCS="
if [ "`uname -a | grep Linux`" != "" ]; then
SUFFIX="linux_amd64"
OSCFLAGS="-fPIC -ffreestanding -Wno-maybe-uninitialized -Wno-unused-const-variable -Werror -Wno-unknown-warning-option"
- OSLDFLAGS="-lpthread -lrt -fPIC -fpie"
+ OSLDFLAGS="-lpthread -fPIC -fpie"
SRCS="
$SRCS
../rtl/tsan_platform_linux.cc
OpenPOWER on IntegriCloud