--- build/config/sanitizers/sanitizers.gni.orig	2017-03-09 20:04:27 UTC
+++ build/config/sanitizers/sanitizers.gni
@@ -54,8 +54,8 @@ declare_args() {
   # See http://clang.llvm.org/docs/ControlFlowIntegrity.html
   #
   # TODO(pcc): Remove this flag if/when CFI is enabled in all official builds.
-  is_cfi = target_os == "linux" && !is_chromeos && target_cpu == "x64" &&
-           is_official_build && allow_posix_link_time_opt
+  is_cfi = (target_os == "linux" || target_os == "bsd") && !is_chromeos &&
+           target_cpu == "x64" && is_official_build && allow_posix_link_time_opt
 
   # Enable checks for bad casts: derived cast and unrelated cast.
   # TODO(krasin): remove this, when we're ready to add these checks by default.