[compiler-rt] r182999 - [msan] Fix gcc build of msan runtime.

[Evgeniy Stepanov]

Author: eugenis
Date: Fri May 31 08:04:07 2013
New Revision: 182999

URL: http://llvm.org/viewvc/llvm-project?rev=182999&view=rev
Log:
[msan] Fix gcc build of msan runtime.

Modified:
    compiler-rt/trunk/lib/msan/msan.cc
    compiler-rt/trunk/lib/msan/msan_interceptors.cc

Modified: compiler-rt/trunk/lib/msan/msan.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/msan/msan.cc?rev=182999&r1=182998&r2=182999&view=diff
==============================================================================
--- compiler-rt/trunk/lib/msan/msan.cc (original)
+++ compiler-rt/trunk/lib/msan/msan.cc Fri May 31 08:04:07 2013
@@ -61,8 +61,7 @@ static THREADLOCAL struct {
 static THREADLOCAL bool is_in_symbolizer;
 static THREADLOCAL bool is_in_loader;
 
-SANITIZER_WEAK_ATTRIBUTE
-extern "C" const int __msan_track_origins;
+extern "C" SANITIZER_WEAK_ATTRIBUTE const int __msan_track_origins;
 
 int __msan_get_track_origins() {
   return &__msan_track_origins ? __msan_track_origins : 0;

Modified: compiler-rt/trunk/lib/msan/msan_interceptors.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/msan/msan_interceptors.cc?rev=182999&r1=182998&r2=182999&view=diff
==============================================================================
--- compiler-rt/trunk/lib/msan/msan_interceptors.cc (original)
+++ compiler-rt/trunk/lib/msan/msan_interceptors.cc Fri May 31 08:04:07 2013
@@ -28,8 +28,7 @@
 // ACHTUNG! No other system header includes in this file.
 // Ideally, we should get rid of stdarg.h as well.
 
-SANITIZER_WEAK_ATTRIBUTE
-extern "C" const int __msan_keep_going;
+extern "C" SANITIZER_WEAK_ATTRIBUTE const int __msan_keep_going;
 
 int __msan_get_keep_going() {
   return &__msan_keep_going ? __msan_keep_going : 0;