diff options
| author | bors <bors@rust-lang.org> | 2021-10-19 05:04:38 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-10-19 05:04:38 +0000 |
| commit | 2f22e63cc4b61d2f42b92eee11480a4f93dc2771 (patch) | |
| tree | 644a5c3af1367a2bd0afe7fbdefd7898d379f1db /compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp | |
| parent | cd8b56f528631b128f36605b28ae06e36377dc68 (diff) | |
| parent | 5bcaf04cbb7a3a6f11df3a4b9034e8d490e8c08c (diff) | |
| download | rust-2f22e63cc4b61d2f42b92eee11480a4f93dc2771.tar.gz rust-2f22e63cc4b61d2f42b92eee11480a4f93dc2771.zip | |
Auto merge of #90037 - matthiaskrgr:rollup-cdfhxtn, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - #89766 (RustWrapper: adapt for an LLVM API change) - #89867 (Fix macro_rules! duplication when reexported in the same module) - #89941 (removing TLS support in x86_64-unknown-none-hermitkernel) - #89956 (Suggest a case insensitive match name regardless of levenshtein distance) - #89988 (Do not promote values with const drop that need to be dropped) - #89997 (Add test for issue #84957 - `str.as_bytes()` in a `const` expression) - #90002 (:arrow_up: rust-analyzer) - #90034 (Tiny tweak to Iterator::unzip() doc comment example.) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp')
| -rw-r--r-- | compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp b/compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp index 87f423fb2d5..6d2e7d25336 100644 --- a/compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp +++ b/compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp @@ -21,6 +21,11 @@ #include "llvm/Support/CBindingWrapping.h" #include "llvm/Support/FileSystem.h" #include "llvm/Support/Host.h" +#if LLVM_VERSION_LT(14, 0) +#include "llvm/Support/TargetRegistry.h" +#else +#include "llvm/MC/TargetRegistry.h" +#endif #include "llvm/Target/TargetMachine.h" #include "llvm/Transforms/IPO/PassManagerBuilder.h" #include "llvm/Transforms/IPO/AlwaysInliner.h" |