Imported Upstream version 1.6.0+dfsg1

[rustc.git] / src / compiler-rt / lib / asan / asan_preinit.cc

diff --git a/src/compiler-rt/lib/asan/asan_preinit.cc b/src/compiler-rt/lib/asan/asan_preinit.cc
index 586f551c23c323ac033d2510c089a49adb0a84aa..a3986d24f9c3b043fac24e0c25ca78cecfe03944 100644 (file)
--- a/src/compiler-rt/lib/asan/asan_preinit.cc
+++ b/src/compiler-rt/lib/asan/asan_preinit.cc
@@ -10,22 +10,16 @@
 // This file is a part of AddressSanitizer, an address sanity checker.
 //
 // Call __asan_init at the very early stage of process startup.
-// On Linux we use .preinit_array section (unless PIC macro is defined).
 //===----------------------------------------------------------------------===//
 #include "asan_internal.h"
 
-#if ASAN_USE_PREINIT_ARRAY && !defined(PIC)
-  // On Linux, we force __asan_init to be called before anyone else
-  // by placing it into .preinit_array section.
-  // FIXME: do we have anything like this on Mac?
+using namespace __asan;
+
+#if SANITIZER_CAN_USE_PREINIT_ARRAY
   // The symbol is called __local_asan_preinit, because it's not intended to be
   // exported.
+  // This code linked into the main executable when -fsanitize=address is in
+  // the link flags. It can only use exported interface functions.
   __attribute__((section(".preinit_array"), used))
   void (*__local_asan_preinit)(void) = __asan_init;
-#elif SANITIZER_WINDOWS && defined(_DLL)
-  // On Windows, when using dynamic CRT (/MD), we can put a pointer
-  // to __asan_init into the global list of C initializers.
-  // See crt0dat.c in the CRT sources for the details.
-  #pragma section(".CRT$XIB", long, read)  // NOLINT
-  __declspec(allocate(".CRT$XIB")) void (*__asan_preinit)() = __asan_init;
 #endif