linux-perf-users.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Ingo Molnar <mingo@kernel.org>, Thomas Gleixner <tglx@linutronix.de>
Cc: Jiri Olsa <jolsa@kernel.org>, Namhyung Kim <namhyung@kernel.org>,
	Clark Williams <williams@redhat.com>,
	linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org,
	"Maciej S. Szmigiero" <mail@maciej.szmigiero.name>,
	Alexander Shishkin <alexander.shishkin@linux.intel.com>,
	Denis Pronin <dannftk@yandex.ru>,
	Dennis Schridde <devurandom@gmx.net>,
	Jiri Olsa <jolsa@redhat.com>, Mark Rutland <mark.rutland@arm.com>,
	Naohiro Aota <naota@elisp.net>,
	Peter Zijlstra <peterz@infradead.org>,
	clang-built-linux@googlegroups.com,
	Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 02/12] tools build: Fix test-clang.cpp with Clang 8+
Date: Thu, 16 Jan 2020 10:48:04 -0300	[thread overview]
Message-ID: <20200116134814.8811-3-acme@kernel.org> (raw)
In-Reply-To: <20200116134814.8811-1-acme@kernel.org>

From: "Maciej S. Szmigiero" <mail@maciej.szmigiero.name>

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@maciej.szmigiero.name>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Denis Pronin <dannftk@yandex.ru>
Cc: Dennis Schridde <devurandom@gmx.net>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Naohiro Aota <naota@elisp.net>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: clang-built-linux@googlegroups.com
Link: http://lore.kernel.org/lkml/20191228171314.946469-1-mail@maciej.szmigiero.name
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 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;
-- 
2.21.1

  parent reply	other threads:[~2020-01-16 13:48 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-01-16 13:48 [GIT PULL] perf/core improvements and fixes Arnaldo Carvalho de Melo
2020-01-16 13:48 ` [PATCH 01/12] perf clang: Fix build with Clang 9 Arnaldo Carvalho de Melo
2020-01-16 13:48 ` Arnaldo Carvalho de Melo [this message]
2020-01-16 13:48 ` [PATCH 03/12] perf report: Clarify in help that --children is default Arnaldo Carvalho de Melo
2020-01-16 13:48 ` [PATCH 04/12] perf tools: Support --prefix/--prefix-strip Arnaldo Carvalho de Melo
2020-01-16 13:48 ` [PATCH 05/12] perf report: Fix no libunwind compiled warning break s390 issue Arnaldo Carvalho de Melo
2020-01-16 13:48 ` [PATCH 06/12] libperf: Setup initial evlist::all_cpus value Arnaldo Carvalho de Melo
2020-01-16 13:48 ` [PATCH 07/12] perf tools: Use %define api.pure full instead of %pure-parser Arnaldo Carvalho de Melo
2020-01-16 13:48 ` [PATCH 08/12] perf ui gtk: Add missing zalloc object Arnaldo Carvalho de Melo
2020-01-16 13:48 ` [PATCH 09/12] perf/ui/gtk: Fix gtk2 build Arnaldo Carvalho de Melo
2020-01-16 13:48 ` [PATCH 10/12] perf beauty sockaddr: Fix augmented syscall format warning Arnaldo Carvalho de Melo
2020-01-16 13:48 ` [PATCH 11/12] perf c2c: Fix return type for histogram sorting comparision functions Arnaldo Carvalho de Melo
2020-01-16 13:48 ` [PATCH 12/12] perf header: Use last modification time for timestamp Arnaldo Carvalho de Melo
2020-01-20  8:23 ` [GIT PULL] perf/core improvements and fixes Ingo Molnar

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200116134814.8811-3-acme@kernel.org \
    --to=acme@kernel.org \
    --cc=acme@redhat.com \
    --cc=alexander.shishkin@linux.intel.com \
    --cc=clang-built-linux@googlegroups.com \
    --cc=dannftk@yandex.ru \
    --cc=devurandom@gmx.net \
    --cc=jolsa@kernel.org \
    --cc=jolsa@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-perf-users@vger.kernel.org \
    --cc=mail@maciej.szmigiero.name \
    --cc=mark.rutland@arm.com \
    --cc=mingo@kernel.org \
    --cc=namhyung@kernel.org \
    --cc=naota@elisp.net \
    --cc=peterz@infradead.org \
    --cc=tglx@linutronix.de \
    --cc=williams@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).