From f74f5f2568483fd1c688ac881458e8f3206dafd9 Mon Sep 17 00:00:00 2001 From: Vitaly Buka Date: Tue, 1 Oct 2019 00:58:26 +0000 Subject: [PATCH] Rename tsan_interceptors.cpp into tsan_interceptors_posix.cpp Summary: It's needed to use __GLIBC_PREREQ from tsan didn't let us to include by using --sysroot=. to disable system includes on anything that is not named as "tsan*posix*", "tsan*mac*", "tsan*linux*". See compiler-rt/lib/tsan/CMakeLists.txt Reviewers: eugenis, dvyukov, kcc Reviewed By: kcc Subscribers: mgorny, #sanitizers, llvm-commits Tags: #sanitizers, #llvm Differential Revision: https://reviews.llvm.org/D68176 llvm-svn: 373282 --- compiler-rt/lib/tsan/CMakeLists.txt | 2 +- .../rtl/{tsan_interceptors.cpp => tsan_interceptors_posix.cpp} | 2 +- compiler-rt/lib/tsan/rtl/tsan_report.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename compiler-rt/lib/tsan/rtl/{tsan_interceptors.cpp => tsan_interceptors_posix.cpp} (99%) diff --git a/compiler-rt/lib/tsan/CMakeLists.txt b/compiler-rt/lib/tsan/CMakeLists.txt index fcadacfe1bc5..9fd3e2d77924 100644 --- a/compiler-rt/lib/tsan/CMakeLists.txt +++ b/compiler-rt/lib/tsan/CMakeLists.txt @@ -32,7 +32,7 @@ set(TSAN_SOURCES rtl/tsan_fd.cpp rtl/tsan_flags.cpp rtl/tsan_ignoreset.cpp - rtl/tsan_interceptors.cpp + rtl/tsan_interceptors_posix.cpp rtl/tsan_interface.cpp rtl/tsan_interface_ann.cpp rtl/tsan_interface_atomic.cpp diff --git a/compiler-rt/lib/tsan/rtl/tsan_interceptors.cpp b/compiler-rt/lib/tsan/rtl/tsan_interceptors_posix.cpp similarity index 99% rename from compiler-rt/lib/tsan/rtl/tsan_interceptors.cpp rename to compiler-rt/lib/tsan/rtl/tsan_interceptors_posix.cpp index 4aa9086a2156..d1d83e23d558 100644 --- a/compiler-rt/lib/tsan/rtl/tsan_interceptors.cpp +++ b/compiler-rt/lib/tsan/rtl/tsan_interceptors_posix.cpp @@ -1,4 +1,4 @@ -//===-- tsan_interceptors.cpp ---------------------------------------------===// +//===-- tsan_interceptors_posix.cpp ---------------------------------------===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. diff --git a/compiler-rt/lib/tsan/rtl/tsan_report.cpp b/compiler-rt/lib/tsan/rtl/tsan_report.cpp index 655aa5f9123b..368f1ca8adf2 100644 --- a/compiler-rt/lib/tsan/rtl/tsan_report.cpp +++ b/compiler-rt/lib/tsan/rtl/tsan_report.cpp @@ -298,7 +298,7 @@ static bool FrameIsInternal(const SymbolizedStack *frame) { const char *file = frame->info.file; const char *module = frame->info.module; if (file != 0 && - (internal_strstr(file, "tsan_interceptors.cpp") || + (internal_strstr(file, "tsan_interceptors_posix.cpp") || internal_strstr(file, "sanitizer_common_interceptors.inc") || internal_strstr(file, "tsan_interface_"))) return true;