diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2022-04-24 07:50:49 -0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2022-04-24 07:50:49 -0300 |
| commit | e0c1b8f9eba88173b30ba42eb492fd20582cf376 (patch) | |
| tree | 2e72692a8e4998d1a9512dd105939f59e7dbe42a /tools/perf/util/c++/clang.cpp | |
| parent | 4bbac9a1f58fb74b436fbef43ec16017a580019a (diff) | |
| parent | 22da5264abf497a10a4ed629f07f4ba28a7ed5eb (diff) | |
| download | lwn-e0c1b8f9eba88173b30ba42eb492fd20582cf376.tar.gz lwn-e0c1b8f9eba88173b30ba42eb492fd20582cf376.zip | |
Merge remote-tracking branch 'torvalds/master' into perf/core
To pick up fixes, such as the llvm one for ubuntu:22.04.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/util/c++/clang.cpp')
| -rw-r--r-- | tools/perf/util/c++/clang.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/perf/util/c++/clang.cpp b/tools/perf/util/c++/clang.cpp index df7b18fb6b6e..1aad7d6d34aa 100644 --- a/tools/perf/util/c++/clang.cpp +++ b/tools/perf/util/c++/clang.cpp @@ -20,7 +20,11 @@ #include "llvm/Option/Option.h" #include "llvm/Support/FileSystem.h" #include "llvm/Support/ManagedStatic.h" +#if CLANG_VERSION_MAJOR >= 14 +#include "llvm/MC/TargetRegistry.h" +#else #include "llvm/Support/TargetRegistry.h" +#endif #include "llvm/Support/TargetSelect.h" #include "llvm/Target/TargetMachine.h" #include "llvm/Target/TargetOptions.h" |