2019-12-28 17:15:48

by Maciej S. Szmigiero

Subject: [PATCH] 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 <[email protected]>
---
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 a2b3f092d2f0..7d87075cd1c5 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;

2020-01-06 22:17:03

by Arnaldo Carvalho de Melo

Subject: Re: [PATCH] tools build: Fix test-clang.cpp with Clang 8+

Em Sat, Dec 28, 2019 at 06:13:13PM +0100, Maciej S. Szmigiero escreveu:
> 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.

Thanks, applied.

- Arnaldo

> Signed-off-by: Maciej S. Szmigiero <[email protected]>
> ---
> 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 a2b3f092d2f0..7d87075cd1c5 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;

--

- Arnaldo

2020-01-20 08:29:14

by tip-bot2 for Eric Biggers

Subject: [tip: perf/core] tools build: Fix test-clang.cpp with Clang 8+

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 <[email protected]>
AuthorDate: Sat, 28 Dec 2019 18:13:13 +01:00
Committer: Arnaldo Carvalho de Melo <[email protected]>
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 <[email protected]>
Cc: Alexander Shishkin <[email protected]>
Cc: Denis Pronin <[email protected]>
Cc: Dennis Schridde <[email protected]>
Cc: Jiri Olsa <[email protected]>
Cc: Mark Rutland <[email protected]>
Cc: Namhyung Kim <[email protected]>
Cc: Naohiro Aota <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: [email protected]
Link: http://lore.kernel.org/lkml/[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
---
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;