[llvm-commits] [compiler-rt] r145743 - in /compiler-rt/trunk/lib/asan: Makefile.old asan_stats.cc

[Kostya Serebryany]

Author: kcc
Date: Fri Dec  2 20:23:25 2011
New Revision: 145743

URL: http://llvm.org/viewvc/llvm-project?rev=145743&view=rev
Log:
[asan] get rid of some more dependency on libstdc++

Modified:
    compiler-rt/trunk/lib/asan/Makefile.old
    compiler-rt/trunk/lib/asan/asan_stats.cc

Modified: compiler-rt/trunk/lib/asan/Makefile.old
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/Makefile.old?rev=145743&r1=145742&r2=145743&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/Makefile.old (original)
+++ compiler-rt/trunk/lib/asan/Makefile.old Fri Dec  2 20:23:25 2011
@@ -261,7 +261,7 @@
 	$(ASAN_CXX) $(GTEST_INCLUDE) -I. -g -c $< -O2 -o $@ -ObjC $(PIE) $(CFLAGS)
 
 $(BIN)/%$(SUFF).o: %.cc $(RTL_HDR) $(MAKEFILE)
-	$(CXX) $(PIE) $(CFLAGS) -fPIC -c -O2 -o $@ -g $< -Ithird_party \
+	$(CXX) $(PIE) $(CFLAGS) -fPIC -c -O2 -fno-exceptions -o $@ -g $< -Ithird_party \
 		-DASAN_USE_SYSINFO=1 \
 		-DASAN_NEEDS_SEGV=$(ASAN_NEEDS_SEGV) \
 		-DASAN_HAS_EXCEPTIONS=$(ASAN_HAS_EXCEPTIONS) \

Modified: compiler-rt/trunk/lib/asan/asan_stats.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_stats.cc?rev=145743&r1=145742&r2=145743&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/asan_stats.cc (original)
+++ compiler-rt/trunk/lib/asan/asan_stats.cc Fri Dec  2 20:23:25 2011
@@ -53,11 +53,12 @@
          malloc_large, malloc_small_slow);
 }
 
+static AsanLock print_lock(LINKER_INITIALIZED);
+
 static void PrintAccumulatedStats() {
   if (!FLAG_stats) return;
   AsanStats stats = asanThreadRegistry().GetAccumulatedStats();
   // Use lock to keep reports from mixing up.
-  static AsanLock print_lock(LINKER_INITIALIZED);
   ScopedLock lock(&print_lock);
   stats.Print();
 }