[asan] get rid of some more dependency on libstdc++

llvm-svn: 145743

compiler-rt/lib/asan/Makefile.old

@@ -261,7 +261,7 @@ $(BIN)/%_test$(SUFF).o: tests/%_test.mm $(RTL_HDR) $(MAKEFILE)
 	$(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) \

compiler-rt/lib/asan/asan_stats.cc

@@ -53,11 +53,12 @@ void AsanStats::Print() {
          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();
 }