summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexey Samsonov <samsonov@google.com>2012-05-29 09:39:01 +0000
committerAlexey Samsonov <samsonov@google.com>2012-05-29 09:39:01 +0000
commit1cbe656d6629acfe7c0b29bf111de1a0736a408f (patch)
treedfcfbb8094a33cae81aa7f8966595e6fc8673898
parent084d8f7d4c937922f6d6397aff4f6a251144206e (diff)
downloadbcm5719-llvm-1cbe656d6629acfe7c0b29bf111de1a0736a408f.tar.gz
bcm5719-llvm-1cbe656d6629acfe7c0b29bf111de1a0736a408f.zip
Fixing ASan build on Win: don't use __asan_default_options
llvm-svn: 157608
-rw-r--r--compiler-rt/lib/asan/asan_rtl.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/compiler-rt/lib/asan/asan_rtl.cc b/compiler-rt/lib/asan/asan_rtl.cc
index 7884d139b90..bcdbf24f93f 100644
--- a/compiler-rt/lib/asan/asan_rtl.cc
+++ b/compiler-rt/lib/asan/asan_rtl.cc
@@ -500,11 +500,13 @@ void __asan_init() {
// Make sure we are not statically linked.
AsanDoesNotSupportStaticLinkage();
+#if !defined(_WIN32)
if (__asan_default_options) {
Report("Using the defaults from __asan_default_options: %s\n",
__asan_default_options);
ParseAsanOptions(__asan_default_options);
}
+#endif
// flags
const char *options = AsanGetEnv("ASAN_OPTIONS");
ParseAsanOptions(options);
OpenPOWER on IntegriCloud