The following commit has been merged into the perf/core branch of tip: Commit-ID: d8007772a5541b4711d1286b788ad4295b2c7eaa Gitweb: https://git.kernel.org/tip/d8007772a5541b4711d1286b788ad4295b2c7eaa Author: Maciej S. Szmigiero <mail@xxxxxxxxxxxxxxxxxxxxx> AuthorDate: Sat, 28 Dec 2019 18:13:13 +01:00 Committer: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx> CommitterDate: Tue, 14 Jan 2020 12:02:19 -03:00 tools build: Fix test-clang.cpp with Clang 8+ LLVM rL344140 (included in Clang 8+) moved VFS from Clang to LLVM, so paths to its include files have changed. This broke the Clang test in tools/build - let's fix it. Signed-off-by: Maciej S. Szmigiero <mail@xxxxxxxxxxxxxxxxxxxxx> Cc: Alexander Shishkin <alexander.shishkin@xxxxxxxxxxxxxxx> Cc: Denis Pronin <dannftk@xxxxxxxxx> Cc: Dennis Schridde <devurandom@xxxxxxx> Cc: Jiri Olsa <jolsa@xxxxxxxxxx> Cc: Mark Rutland <mark.rutland@xxxxxxx> Cc: Namhyung Kim <namhyung@xxxxxxxxxx> Cc: Naohiro Aota <naota@xxxxxxxxx> Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx> Cc: clang-built-linux@xxxxxxxxxxxxxxxx Link: http://lore.kernel.org/lkml/20191228171314.946469-1-mail@xxxxxxxxxxxxxxxxxxxxx Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx> --- tools/build/feature/test-clang.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tools/build/feature/test-clang.cpp b/tools/build/feature/test-clang.cpp index a2b3f09..7d87075 100644 --- a/tools/build/feature/test-clang.cpp +++ b/tools/build/feature/test-clang.cpp @@ -1,9 +1,15 @@ // SPDX-License-Identifier: GPL-2.0 +#include "clang/Basic/Version.h" +#if CLANG_VERSION_MAJOR < 8 #include "clang/Basic/VirtualFileSystem.h" +#endif #include "clang/Driver/Driver.h" #include "clang/Frontend/TextDiagnosticPrinter.h" #include "llvm/ADT/IntrusiveRefCntPtr.h" #include "llvm/Support/ManagedStatic.h" +#if CLANG_VERSION_MAJOR >= 8 +#include "llvm/Support/VirtualFileSystem.h" +#endif #include "llvm/Support/raw_ostream.h" using namespace clang;
|