2 files changed, 7 insertions, 8 deletions

diff --git a/compiler-rt/lib/tsan/rtl/tsan_flags.cc b/compiler-rt/lib/tsan/rtl/tsan_flags.cc
index 679ea992936..1eeb2af5ea1 100644
--- a/compiler-rt/lib/tsan/rtl/tsan_flags.cc
+++ b/compiler-rt/lib/tsan/rtl/tsan_flags.cc
@@ -53,7 +53,6 @@ void InitializeFlags(Flags *f, const char *env) {
   f->exitcode = 66;
   f->halt_on_error = false;
   f->atexit_sleep_ms = 1000;
-  f->verbosity = 0;
   f->profile_memory = "";
   f->flush_memory_ms = 0;
   f->flush_symbolizer_ms = 5000;
@@ -63,6 +62,13 @@ void InitializeFlags(Flags *f, const char *env) {
   f->history_size = kGoMode ? 1 : 2;  // There are a lot of goroutines in Go.
   f->io_sync = 1;
 
+  ParseCommonFlagsFromString("strip_path_prefix=");
+  ParseCommonFlagsFromString("log_path=stderr");
+  ParseCommonFlagsFromString("external_symbolizer_path=");
+  ParseCommonFlagsFromString("allocator_may_return_null=0");
+  ParseCommonFlagsFromString("verbosity=0");
+  *static_cast<CommonFlags*>(f) = *common_flags();
+
   // Let a frontend override.
   OverrideFlags(f);
 
@@ -83,7 +89,6 @@ void InitializeFlags(Flags *f, const char *env) {
   ParseFlag(env, &f->exitcode, "exitcode");
   ParseFlag(env, &f->halt_on_error, "halt_on_error");
   ParseFlag(env, &f->atexit_sleep_ms, "atexit_sleep_ms");
-  ParseFlag(env, &f->verbosity, "verbosity");
   ParseFlag(env, &f->profile_memory, "profile_memory");
   ParseFlag(env, &f->flush_memory_ms, "flush_memory_ms");
   ParseFlag(env, &f->flush_symbolizer_ms, "flush_symbolizer_ms");
@@ -111,10 +116,6 @@ void InitializeFlags(Flags *f, const char *env) {
   }
 
   *common_flags() = *f;
-  ParseCommonFlagsFromString("strip_path_prefix=");
-  ParseCommonFlagsFromString("log_path=stderr");
-  ParseCommonFlagsFromString("external_symbolizer_path=");
-  ParseCommonFlagsFromString("allocator_may_return_null=0");
   ParseCommonFlagsFromString(env);
   *static_cast<CommonFlags*>(f) = *common_flags();
 }
diff --git a/compiler-rt/lib/tsan/rtl/tsan_flags.h b/compiler-rt/lib/tsan/rtl/tsan_flags.h
index b240fdce4a2..3916df3cc9e 100644
--- a/compiler-rt/lib/tsan/rtl/tsan_flags.h
+++ b/compiler-rt/lib/tsan/rtl/tsan_flags.h
@@ -63,8 +63,6 @@ struct Flags : CommonFlags {
   // Sleep in main thread before exiting for that many ms
   // (useful to catch "at exit" races).
   int atexit_sleep_ms;
-  // Verbosity level (0 - silent, 1 - a bit of output, 2+ - more output).
-  int verbosity;
   // If set, periodically write memory profile to that file.
   const char *profile_memory;
   // Flush shadow memory every X ms.