[llvm-commits] [compiler-rt] r162762 - in /compiler-rt/trunk/lib: asan/asan_internal.h sanitizer_common/sanitizer_internal_defs.h

[Kostya Serebryany]

Author: kcc
Date: Tue Aug 28 10:25:07 2012
New Revision: 162762

URL: http://llvm.org/viewvc/llvm-project?rev=162762&view=rev
Log:
[asan] one more fix for windows build

Modified:
    compiler-rt/trunk/lib/asan/asan_internal.h
    compiler-rt/trunk/lib/sanitizer_common/sanitizer_internal_defs.h

Modified: compiler-rt/trunk/lib/asan/asan_internal.h
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_internal.h?rev=162762&r1=162761&r2=162762&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/asan_internal.h (original)
+++ compiler-rt/trunk/lib/asan/asan_internal.h Tue Aug 28 10:25:07 2012
@@ -24,11 +24,6 @@
 # error "This operating system is not supported by AddressSanitizer"
 #endif
 
-#if defined(_WIN32)
-extern "C" void* _ReturnAddress(void);
-# pragma intrinsic(_ReturnAddress)
-#endif  // defined(_WIN32)
-
 #define ASAN_DEFAULT_FAILURE_EXITCODE 1
 
 #if defined(__linux__)

Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_internal_defs.h
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_internal_defs.h?rev=162762&r1=162761&r2=162762&view=diff
==============================================================================
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_internal_defs.h (original)
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_internal_defs.h Tue Aug 28 10:25:07 2012
@@ -168,6 +168,8 @@
 # define GET_CALLER_PC() (uptr)__builtin_return_address(0)
 # define GET_CURRENT_FRAME() (uptr)__builtin_frame_address(0)
 #else
+extern "C" void* _ReturnAddress(void);
+# pragma intrinsic(_ReturnAddress)
 # define GET_CALLER_PC() (uptr)_ReturnAddress()
 // CaptureStackBackTrace doesn't need to know BP on Windows.
 // FIXME: This macro is still used when printing error reports though it's not