Author: dim
Date: Wed Feb 17 12:38:59 2016
New Revision: 261123
URL: http://llvm.org/viewvc/llvm-project?rev=261123&view=rev
Log:
Merging r260839:
------------------------------------------------------------------------
r260839 | dim | 2016-02-14 01:26:32 +0100 (Sun, 14 Feb 2016) | 8 lines
Fix lib/tsan/go/buildgo.sh for FreeBSD after r243051.
FreeBSD also needs to have sanitizer_linux_libcdep.cc included,
otherwise linking will fail with "undefined reference to
`__sanitizer::GetRSS()'".
While here, tabify the FreeBSD part, similar to the other parts.
------------------------------------------------------------------------
Modified:
compiler-rt/branches/release_38/ (props changed)
compiler-rt/branches/release_38/lib/tsan/go/buildgo.sh
Propchange: compiler-rt/branches/release_38/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 17 12:38:59 2016
@@ -1 +1 @@
-/compiler-rt/trunk:258916,259755
+/compiler-rt/trunk:258916,259755,260839
Modified: compiler-rt/branches/release_38/lib/tsan/go/buildgo.sh
URL:
http://llvm.org/viewvc/llvm-project/compiler-rt/branches/release_38/lib/tsan/go/buildgo.sh?rev=261123&r1=261122&r2=261123&view=diff
==============================================================================
--- compiler-rt/branches/release_38/lib/tsan/go/buildgo.sh (original)
+++ compiler-rt/branches/release_38/lib/tsan/go/buildgo.sh Wed Feb 17 12:38:59
2016
@@ -50,19 +50,20 @@ if [ "`uname -a | grep Linux`" != "" ];
../../sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc
"
elif [ "`uname -a | grep FreeBSD`" != "" ]; then
- SUFFIX="freebsd_amd64"
- OSCFLAGS="-fno-strict-aliasing -fPIC -Werror"
- OSLDFLAGS="-lpthread -fPIC -fpie"
- SRCS="
- $SRCS
- ../rtl/tsan_platform_linux.cc
- ../../sanitizer_common/sanitizer_posix.cc
- ../../sanitizer_common/sanitizer_posix_libcdep.cc
- ../../sanitizer_common/sanitizer_procmaps_common.cc
- ../../sanitizer_common/sanitizer_procmaps_freebsd.cc
- ../../sanitizer_common/sanitizer_linux.cc
- ../../sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc
- "
+ SUFFIX="freebsd_amd64"
+ OSCFLAGS="-fno-strict-aliasing -fPIC -Werror"
+ OSLDFLAGS="-lpthread -fPIC -fpie"
+ SRCS="
+ $SRCS
+ ../rtl/tsan_platform_linux.cc
+ ../../sanitizer_common/sanitizer_posix.cc
+ ../../sanitizer_common/sanitizer_posix_libcdep.cc
+ ../../sanitizer_common/sanitizer_procmaps_common.cc
+ ../../sanitizer_common/sanitizer_procmaps_freebsd.cc
+ ../../sanitizer_common/sanitizer_linux.cc
+ ../../sanitizer_common/sanitizer_linux_libcdep.cc
+ ../../sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc
+ "
elif [ "`uname -a | grep Darwin`" != "" ]; then
SUFFIX="darwin_amd64"
OSCFLAGS="-fPIC -Wno-unused-const-variable -Wno-unknown-warning-option"
_______________________________________________
llvm-branch-commits mailing list
llvm-branch-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
