[compiler-rt] r195624 - [ASan] Un-break the Windows build

[Timur Iskhodzhanov]

Author: timurrrr
Date: Mon Nov 25 01:54:55 2013
New Revision: 195624

URL: http://llvm.org/viewvc/llvm-project?rev=195624&view=rev
Log:
[ASan] Un-break the Windows build

Modified:
    compiler-rt/trunk/lib/sanitizer_common/sanitizer_common_interceptors.inc
    compiler-rt/trunk/lib/sanitizer_common/sanitizer_libc.cc

Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_common_interceptors.inc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_common_interceptors.inc?rev=195624&r1=195623&r2=195624&view=diff
==============================================================================
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_common_interceptors.inc (original)
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_common_interceptors.inc Mon Nov 25 01:54:55 2013
@@ -31,7 +31,7 @@
 
 #include <stdarg.h>
 
-#if SANITIZER_WINDOWS
+#if SANITIZER_WINDOWS && !defined(va_copy)
 #define va_copy(dst, src) ((dst) = (src))
 #endif // _WIN32
 

Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_libc.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_libc.cc?rev=195624&r1=195623&r2=195624&view=diff
==============================================================================
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_libc.cc (original)
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_libc.cc Mon Nov 25 01:54:55 2013
@@ -18,7 +18,12 @@ namespace __sanitizer {
 
 // Make the compiler think that something is going on there.
 static inline void break_optimization(void *arg) {
+#ifdef SANITIZER_WINDOWS
+  // FIXME: make sure this is actually enough.
+  __asm;
+#else
   __asm__ __volatile__("" : : "r" (arg) : "memory");
+#endif
 }
 
 s64 internal_atoll(const char *nptr) {