Index: compiler-rt/trunk/lib/CMakeLists.txt
===================================================================
--- compiler-rt/trunk/lib/CMakeLists.txt
+++ compiler-rt/trunk/lib/CMakeLists.txt
@@ -10,6 +10,7 @@
 
 if(COMPILER_RT_HAS_SANITIZER_COMMON)
   add_subdirectory(sanitizer_common)
+  add_subdirectory(cfi)
   add_subdirectory(lsan)
   add_subdirectory(ubsan)
 endif()
Index: compiler-rt/trunk/lib/cfi/CMakeLists.txt
===================================================================
--- compiler-rt/trunk/lib/cfi/CMakeLists.txt
+++ compiler-rt/trunk/lib/cfi/CMakeLists.txt
@@ -0,0 +1,3 @@
+add_custom_target(cfi)
+add_compiler_rt_resource_file(cfi_blacklist cfi_blacklist.txt)
+add_dependencies(cfi cfi_blacklist)
Index: compiler-rt/trunk/lib/cfi/cfi_blacklist.txt
===================================================================
--- compiler-rt/trunk/lib/cfi/cfi_blacklist.txt
+++ compiler-rt/trunk/lib/cfi/cfi_blacklist.txt
@@ -0,0 +1,8 @@
+# Standard library types.
+type:std::*
+
+# The stdext namespace contains Microsoft standard library extensions.
+type:stdext::*
+
+# Types with a uuid attribute, i.e. COM types.
+type:attr:uuid