commit 627eb7e4e0cfaa17283e2afb922e65a31182f07c
author Hien Ho <hienho@google.com> Fri Apr 05 12:03:59 2019 -0700
committer James Zern <jzern@google.com> Sat Apr 06 00:43:48 2019 +0000
tree 3b5d643c2b808a78029524b9a0f8089130216161
parent f595b5c702a46d999c312b3bd82424e395682940

cmake: add cfi sanitizer for clang7

Change-Id: I964ae9528433352942c05633aa4e2aef2c7c52f0

build/cmake/sanitizers.cmake

diff --git a/build/cmake/sanitizers.cmake b/build/cmake/sanitizers.cmake
index 18efbe3..a8bd93c 100644
--- a/build/cmake/sanitizers.cmake
+++ b/build/cmake/sanitizers.cmake
@@ -21,9 +21,21 @@
 
 string(TOLOWER ${SANITIZE} SANITIZE)
 
-# Require the sanitizer requested.
-require_linker_flag("-fsanitize=${SANITIZE}")
-require_compiler_flag("-fsanitize=${SANITIZE}" YES)
+# Require the sanitizer requested. cfi sanitizer requires all the flags in order
+# for the compiler to accept it.
+if("${SANITIZE}" MATCHES "cfi" AND CMAKE_C_COMPILER_ID MATCHES "Clang")
+  require_linker_flag(
+    "-fsanitize=${SANITIZE} -flto -fno-sanitize-trap=cfi \
+    -fuse-ld=gold"
+    YES)
+  require_compiler_flag(
+    "-fsanitize=${SANITIZE} -flto -fvisibility=hidden \
+    -fno-sanitize-trap=cfi"
+    YES)
+else()
+  require_linker_flag("-fsanitize=${SANITIZE}")
+  require_compiler_flag("-fsanitize=${SANITIZE}" YES)
+endif()
 
 # Make callstacks accurate.
 require_compiler_flag("-fno-omit-frame-pointer -fno-optimize-sibling-calls" YES)