Commit 879d18f0 authored by Evan Stade's avatar Evan Stade Committed by Commit Bot

Use inclusive terminology in //tools/cfi

The Android file has been unused since b63cf141

Bug: 1097271
Change-Id: I740d6483792113c73d9d0d47614dde0f73c673fe
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2317298
Commit-Queue: Evan Stade <estade@chromium.org>
Reviewed-by: default avatarDirk Pranke <dpranke@google.com>
Cr-Commit-Position: refs/heads/master@{#791942}
parent 2e258788
...@@ -333,7 +333,7 @@ config("cfi_flags") { ...@@ -333,7 +333,7 @@ config("cfi_flags") {
if (is_cfi && current_toolchain == default_toolchain) { if (is_cfi && current_toolchain == default_toolchain) {
if (!defined(cfi_blacklist_path)) { if (!defined(cfi_blacklist_path)) {
cfi_blacklist_path = cfi_blacklist_path =
rebase_path("//tools/cfi/blacklist.txt", root_build_dir) rebase_path("//tools/cfi/ignores.txt", root_build_dir)
} }
cflags += [ cflags += [
"-fsanitize=cfi-vcall", "-fsanitize=cfi-vcall",
......
...@@ -32,8 +32,8 @@ declare_args() { ...@@ -32,8 +32,8 @@ declare_args() {
gtest_enable_absl_printers = false gtest_enable_absl_printers = false
} }
# Allows different projects to specify their own suppressions and blacklist # Allows different projects to specify their own suppression/ignore lists for
# files for sanitizer tools. # sanitizer tools.
# asan_suppressions_file = "path/to/asan_suppressions.cc" # asan_suppressions_file = "path/to/asan_suppressions.cc"
# asan_blacklist_path = "path/to/asan/blacklist.txt" # asan_blacklist_path = "path/to/asan/blacklist.txt"
# asan_win_blacklist_path = "path/to/asan/blacklist_win.txt" # asan_win_blacklist_path = "path/to/asan/blacklist_win.txt"
...@@ -44,7 +44,7 @@ declare_args() { ...@@ -44,7 +44,7 @@ declare_args() {
# ubsan_blacklist_path = "path/to/ubsan/blacklist.txt" # ubsan_blacklist_path = "path/to/ubsan/blacklist.txt"
# ubsan_vptr_blacklist_path = "path/to/ubsan/vptr_blacklist.txt" # ubsan_vptr_blacklist_path = "path/to/ubsan/vptr_blacklist.txt"
# ubsan_security_blacklist_path = "path/to/ubsan/security_blacklist.txt" # ubsan_security_blacklist_path = "path/to/ubsan/security_blacklist.txt"
# cfi_blacklist_path = "path/to/cfi/blacklist.txt" # cfi_blacklist_path = "path/to/cfi/ignores.txt"
declare_args() { declare_args() {
# Android 32-bit non-component, non-clang builds cannot have symbol_level=2 # Android 32-bit non-component, non-clang builds cannot have symbol_level=2
......
# The Android port links against a prebuilt libc++.a from the NDK, and also
# links a prebuilt .a from third_party/gvr-android-sdk that uses libc++, so we
# cannot apply CFI to the standard library yet.
type:std::*
# This file defines which warnings should be ignored while running clang's
# control flow integrity sanitizer, as run by the cfi_flags build target.
[cfi-unrelated-cast|cfi-derived-cast] [cfi-unrelated-cast|cfi-derived-cast]
# e.g. RolloverProtectedTickClock # e.g. RolloverProtectedTickClock
...@@ -141,7 +144,7 @@ src:*ppapi/* ...@@ -141,7 +144,7 @@ src:*ppapi/*
src:*content/renderer/pepper* src:*content/renderer/pepper*
fun:*PpapiThread* fun:*PpapiThread*
fun:*BrokerProcessDispatcher* fun:*BrokerProcessDispatcher*
# Blacklist base::Callback due to https://crbug.com/845855 # Ignore base::Callback due to https://crbug.com/845855
fun:*FunctorTraits* fun:*FunctorTraits*
# PipeWire due to https://crbug.com/926115 # PipeWire due to https://crbug.com/926115
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment