commit b750c4c8af128bdd63543f3715f2c147fc3e95bf
author Alexey Samsonov <samsonov@google.com> Wed Jul 25 10:40:57 2012 +0000
committer Alexey Samsonov <samsonov@google.com> Wed Jul 25 10:40:57 2012 +0000
tree 0adc88c14486fb147d737963f1e4336bf991618a
parent 8a1dd56a284de3bb94ebcfaace49266bdf0d26c1

[ASan] fixup for r160712: provide a default definition for weak __asan_default_options()

git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@160718 91177308-0d34-0410-b5e6-96231b3b80d8

lib/asan/asan_flags.h

diff --git a/lib/asan/asan_flags.h b/lib/asan/asan_flags.h
index 43aa3a3..ca9cf84 100644
--- a/lib/asan/asan_flags.h
+++ b/lib/asan/asan_flags.h
@@ -19,15 +19,14 @@
 
 // ASan flag values can be defined in three ways:
 // 1) initialized with default values at startup.
-// 2) overriden from user-specified string __asan_default_options.
+// 2) overriden from string returned by user-specified function
+//    __asan_default_options().
 // 3) overriden from env variable ASAN_OPTIONS.
 
 extern "C" {
-#if !defined(_WIN32)
-  // We do not need to redefine the defaults right now on Windows.
-  const char *__asan_default_options() SANITIZER_WEAK_ATTRIBUTE;
-#endif
-}
+// Can be overriden by user.
+const char *__asan_default_options() SANITIZER_WEAK_ATTRIBUTE;
+}  // extern "C"
 
 namespace __asan {
 

lib/asan/asan_rtl.cc

diff --git a/lib/asan/asan_rtl.cc b/lib/asan/asan_rtl.cc
index 2f15445..5e6e815 100644
--- a/lib/asan/asan_rtl.cc
+++ b/lib/asan/asan_rtl.cc
@@ -98,6 +98,10 @@
   ParseFlag(str, &f->disable_core, "disable_core");
 }
 
+extern "C" {
+const char* WEAK __asan_default_options() { return ""; }
+}  // extern "C"
+
 void InitializeFlags(Flags *f, const char *env) {
   internal_memset(f, 0, sizeof(*f));
 
@@ -126,15 +130,11 @@
   f->disable_core = (__WORDSIZE == 64);
 
   // Override from user-specified string.
-#if !defined(_WIN32)
-  if (__asan_default_options) {
-    ParseFlagsFromString(f, __asan_default_options());
-    if (flags()->verbosity) {
-      Report("Using the defaults from __asan_default_options: %s\n",
-             __asan_default_options());
-    }
+  ParseFlagsFromString(f, __asan_default_options());
+  if (flags()->verbosity) {
+    Report("Using the defaults from __asan_default_options: %s\n",
+           __asan_default_options());
   }
-#endif
 
   // Override from command line.
   ParseFlagsFromString(f, env);