16 files changed, 17 insertions, 17 deletions
diff --git a/compiler-rt/lib/asan/lit_tests/stack-frame-demangle.cc b/compiler-rt/lib/asan/lit_tests/stack-frame-demangle.cc
index 7f4d59fc583..a0de4bbc24b 100644
--- a/compiler-rt/lib/asan/lit_tests/stack-frame-demangle.cc
+++ b/compiler-rt/lib/asan/lit_tests/stack-frame-demangle.cc
@@ -16,7 +16,7 @@ struct YYY {
     // CHECK: {{Address 0x.* is .* frame <XXX::YYY::ZZZ(.*)>}}
   }
 };
-};
+}  // namespace XXX
 
 int main(int argc, char **argv) {
   int res = XXX::YYY::ZZZ(argc + 10);
diff --git a/compiler-rt/lib/msan/msan_interface_internal.h b/compiler-rt/lib/msan/msan_interface_internal.h
index a259ef688c7..f9656335c1d 100644
--- a/compiler-rt/lib/msan/msan_interface_internal.h
+++ b/compiler-rt/lib/msan/msan_interface_internal.h
@@ -18,7 +18,6 @@
 #include <sanitizer/common_interface_defs.h>
 
 extern "C" {
-
 // FIXME: document all interface functions.
 
 SANITIZER_INTERFACE_ATTRIBUTE
@@ -114,7 +113,6 @@ void __msan_partial_poison(void* data, void* shadow, uptr size);
 // Memory will be marked uninitialized, with origin at the call site.
 SANITIZER_INTERFACE_ATTRIBUTE
 void __msan_allocated_memory(void* data, uptr size);
-
 }  // extern "C"
 
 #endif  // MSAN_INTERFACE_INTERNAL_H
diff --git a/compiler-rt/lib/msan/msan_linux.cc b/compiler-rt/lib/msan/msan_linux.cc
index c41c26b7175..0b08b7defe9 100644
--- a/compiler-rt/lib/msan/msan_linux.cc
+++ b/compiler-rt/lib/msan/msan_linux.cc
@@ -87,6 +87,6 @@ static void MsanAtExit(void) {
 void InstallAtExitHandler() {
   atexit(MsanAtExit);
 }
-}
+}  // namespace __msan
 
 #endif  // __linux__
diff --git a/compiler-rt/lib/msan/msan_platform_limits_posix.cc b/compiler-rt/lib/msan/msan_platform_limits_posix.cc
index 19d6c5d0ab3..d37d42049b4 100644
--- a/compiler-rt/lib/msan/msan_platform_limits_posix.cc
+++ b/compiler-rt/lib/msan/msan_platform_limits_posix.cc
@@ -54,6 +54,6 @@ namespace __msan {
   uptr __msan_get_socklen_t(void* socklen_ptr) {
     return *(socklen_t*)socklen_ptr;
   }
-}
+}  // namespace __msan
 
 #endif  // __linux__
diff --git a/compiler-rt/lib/msan/msan_report.cc b/compiler-rt/lib/msan/msan_report.cc
index 87210899973..648cd81675f 100644
--- a/compiler-rt/lib/msan/msan_report.cc
+++ b/compiler-rt/lib/msan/msan_report.cc
@@ -97,4 +97,4 @@ void ReportAtExitStatistics() {
 }
 
 
-}  // namespace msan
+}  // namespace __msan
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_lfstack.h b/compiler-rt/lib/sanitizer_common/sanitizer_lfstack.h
index c26e45db8f8..08841390808 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_lfstack.h
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_lfstack.h
@@ -68,6 +68,6 @@ struct LFStack {
 
   atomic_uint64_t head_;
 };
-}
+}  // namespace __sanitizer
 
 #endif  // #ifndef SANITIZER_LFSTACK_H
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_quarantine.h b/compiler-rt/lib/sanitizer_common/sanitizer_quarantine.h
index ec90d2d6871..b756a706fed 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_quarantine.h
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_quarantine.h
@@ -167,6 +167,6 @@ class QuarantineCache {
     return b;
   }
 };
-}
+}  // namespace __sanitizer
 
 #endif  // #ifndef SANITIZER_QUARANTINE_H
diff --git a/compiler-rt/lib/sanitizer_common/scripts/check_lint.sh b/compiler-rt/lib/sanitizer_common/scripts/check_lint.sh
index e65794df0ce..587459d229b 100755
--- a/compiler-rt/lib/sanitizer_common/scripts/check_lint.sh
+++ b/compiler-rt/lib/sanitizer_common/scripts/check_lint.sh
@@ -13,7 +13,9 @@ fi
 # Cpplint setup
 cd ${SCRIPT_DIR}
 if [ ! -d cpplint ]; then
-  svn co -r83 http://google-styleguide.googlecode.com/svn/trunk/cpplint cpplint
+  svn co http://google-styleguide.googlecode.com/svn/trunk/cpplint cpplint
+else
+  (cd cpplint && svn up)
 fi
 CPPLINT=${SCRIPT_DIR}/cpplint/cpplint.py
 
diff --git a/compiler-rt/lib/sanitizer_common/tests/sanitizer_common_test.cc b/compiler-rt/lib/sanitizer_common/tests/sanitizer_common_test.cc
index 01d8b5a87c0..a32d9df3902 100644
--- a/compiler-rt/lib/sanitizer_common/tests/sanitizer_common_test.cc
+++ b/compiler-rt/lib/sanitizer_common/tests/sanitizer_common_test.cc
@@ -96,4 +96,4 @@ TEST(SanitizerCommon, SanitizerSetThreadName) {
 }
 #endif
 
-}  // namespace sanitizer
+}  // namespace __sanitizer
diff --git a/compiler-rt/lib/tsan/rtl/tsan_flags.h b/compiler-rt/lib/tsan/rtl/tsan_flags.h
index 6547911ec7a..77891bb3087 100644
--- a/compiler-rt/lib/tsan/rtl/tsan_flags.h
+++ b/compiler-rt/lib/tsan/rtl/tsan_flags.h
@@ -86,6 +86,6 @@ struct Flags {
 
 Flags *flags();
 void InitializeFlags(Flags *flags, const char *env);
-}
+}  // namespace __tsan
 
 #endif  // TSAN_FLAGS_H
diff --git a/compiler-rt/lib/tsan/rtl/tsan_interceptors.cc b/compiler-rt/lib/tsan/rtl/tsan_interceptors.cc
index 16a9d7f6f0b..d1a4a67a73f 100644
--- a/compiler-rt/lib/tsan/rtl/tsan_interceptors.cc
+++ b/compiler-rt/lib/tsan/rtl/tsan_interceptors.cc
@@ -127,7 +127,7 @@ struct SignalContext {
   int pending_signal_count;
   SignalDesc pending_signals[kSigCount];
 };
-}
+}  // namespace __tsan
 
 static SignalContext *SigCtx(ThreadState *thr) {
   SignalContext *ctx = (SignalContext*)thr->signal_ctx;
diff --git a/compiler-rt/lib/tsan/rtl/tsan_interface_java.cc b/compiler-rt/lib/tsan/rtl/tsan_interface_java.cc
index e425c75800b..ee1200107d1 100644
--- a/compiler-rt/lib/tsan/rtl/tsan_interface_java.cc
+++ b/compiler-rt/lib/tsan/rtl/tsan_interface_java.cc
@@ -152,7 +152,7 @@ SyncVar* GetAndRemoveJavaSync(ThreadState *thr, uptr pc, uptr addr) {
   return 0;
 }
 
-}  // namespace __tsan {
+}  // namespace __tsan
 
 #define SCOPED_JAVA_FUNC(func) \
   ThreadState *thr = cur_thread(); \
diff --git a/compiler-rt/lib/tsan/rtl/tsan_md5.cc b/compiler-rt/lib/tsan/rtl/tsan_md5.cc
index c9d671f5b59..66e82404315 100644
--- a/compiler-rt/lib/tsan/rtl/tsan_md5.cc
+++ b/compiler-rt/lib/tsan/rtl/tsan_md5.cc
@@ -242,4 +242,4 @@ MD5Hash md5_hash(const void *data, uptr size) {
   MD5_Final((unsigned char*)&res.hash[0], &ctx);
   return res;
 }
-}
+}  // namespace __tsan
diff --git a/compiler-rt/lib/tsan/rtl/tsan_rtl.cc b/compiler-rt/lib/tsan/rtl/tsan_rtl.cc
index 17a2e2d7332..b17c326da49 100644
--- a/compiler-rt/lib/tsan/rtl/tsan_rtl.cc
+++ b/compiler-rt/lib/tsan/rtl/tsan_rtl.cc
@@ -239,7 +239,7 @@ void Initialize(ThreadState *thr) {
     Printf("ThreadSanitizer is suspended at startup (pid %d)."
            " Call __tsan_resume().\n",
            GetPid());
-    while (__tsan_resumed == 0);
+    while (__tsan_resumed == 0) {}
   }
 }
 
diff --git a/compiler-rt/lib/tsan/rtl/tsan_vector.h b/compiler-rt/lib/tsan/rtl/tsan_vector.h
index d41063df3de..64328d0b5b0 100644
--- a/compiler-rt/lib/tsan/rtl/tsan_vector.h
+++ b/compiler-rt/lib/tsan/rtl/tsan_vector.h
@@ -105,6 +105,6 @@ class Vector {
   Vector(const Vector&);
   void operator=(const Vector&);
 };
-}
+}  // namespace __tsan
 
 #endif  // #ifndef TSAN_VECTOR_H
diff --git a/compiler-rt/lib/tsan/tests/rtl/tsan_test_util_linux.cc b/compiler-rt/lib/tsan/tests/rtl/tsan_test_util_linux.cc
index dce8db90de7..a2601486a2e 100644
--- a/compiler-rt/lib/tsan/tests/rtl/tsan_test_util_linux.cc
+++ b/compiler-rt/lib/tsan/tests/rtl/tsan_test_util_linux.cc
@@ -73,7 +73,7 @@ bool OnReport(const ReportDesc *rep, bool suppressed) {
   expect_report_reported = true;
   return true;
 }
-}
+}  // namespace __tsan
 
 static void* allocate_addr(int size, int offset_from_aligned = 0) {
   static uintptr_t foo;