Index: ChangeLog.google-4_6
===================================================================
--- ChangeLog.google-4_6	(revision 192509)
+++ ChangeLog.google-4_6	(working copy)
@@ -1,3 +1,9 @@
+2012-10-16   DeLesley Hutchins  <delesley@google.com>
+
+	gcc/common.opt:
+	Add clang thread safety warning flags as supported, but ignored.
+	(-Wthread-safety-analysis/attributes/precise)
+
 2012-06-01   Doug Kwan  <dougkwan@google.com>
 
 	* contrib/testsuite-management/powerpc64-grtev2-linux-gnu.xfail:
Index: gcc/common.opt
===================================================================
--- gcc/common.opt	(revision 192509)
+++ gcc/common.opt	(working copy)
@@ -652,6 +652,18 @@
 Common Var(warn_thread_safety) Warning
 Warn about potential thread safety issues when the code is annotated with thread safety attributes
 
+Wthread-safety-analysis
+Common Ignore
+Does nothing.  For compatibility with clang thread safety analysis.
+
+Wthread-safety-attributes
+Common Ignore
+Does nothing.  For compatibility with clang thread safety analysis.
+
+Wthread-safety-precise
+Common Ignore
+Does nothing.  For compatibility with clang thread safety analysis.
+
 Wthread-unguarded-var
 Common Var(warn_thread_unguarded_var) Init(1) Warning
 Warn about shared variables not properly protected by locks specified in the attributes