From 890e3c55b5d4900eadda98b7a20c74cdd0fa4507 Mon Sep 17 00:00:00 2001 From: Zarko Todorovski Date: Thu, 25 Nov 2021 08:18:08 -0500 Subject: [PATCH] [llvm][ubsan] Inclusive language: replace use of blacklist HandleLLVMOptions.cmake but use old option name Retry at https://reviews.llvm.org/D113689, this time with using the old option name to support older versions of clang. Reviewed By: bjope Differential Revision: https://reviews.llvm.org/D114033 --- llvm/cmake/modules/HandleLLVMOptions.cmake | 8 +++++--- .../{ubsan_blacklist.txt => ubsan_ignorelist.txt} | 0 2 files changed, 5 insertions(+), 3 deletions(-) rename llvm/utils/sanitizers/{ubsan_blacklist.txt => ubsan_ignorelist.txt} (100%) diff --git a/llvm/cmake/modules/HandleLLVMOptions.cmake b/llvm/cmake/modules/HandleLLVMOptions.cmake index 54eebb8d6b45..0280e1746ab0 100644 --- a/llvm/cmake/modules/HandleLLVMOptions.cmake +++ b/llvm/cmake/modules/HandleLLVMOptions.cmake @@ -870,9 +870,11 @@ if(LLVM_USE_SANITIZER) append("-fsanitize=fuzzer-no-link" CMAKE_C_FLAGS CMAKE_CXX_FLAGS) endif() if (LLVM_USE_SANITIZER MATCHES ".*Undefined.*") - set(BLACKLIST_FILE "${CMAKE_SOURCE_DIR}/utils/sanitizers/ubsan_blacklist.txt") - if (EXISTS "${BLACKLIST_FILE}") - append("-fsanitize-blacklist=${BLACKLIST_FILE}" + set(IGNORELIST_FILE "${CMAKE_SOURCE_DIR}/utils/sanitizers/ubsan_ignorelist.txt") + if (EXISTS "${IGNORELIST_FILE}") + # Use this option name version since -fsanitize-ignorelist is only + # accepted with clang 13.0 or newer. + append("-fsanitize-blacklist=${IGNORELIST_FILE}" CMAKE_C_FLAGS CMAKE_CXX_FLAGS) endif() endif() diff --git a/llvm/utils/sanitizers/ubsan_blacklist.txt b/llvm/utils/sanitizers/ubsan_ignorelist.txt similarity index 100% rename from llvm/utils/sanitizers/ubsan_blacklist.txt rename to llvm/utils/sanitizers/ubsan_ignorelist.txt -- 2.34.1