diff options
| author | bors <bors@rust-lang.org> | 2021-03-25 02:26:19 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-03-25 02:26:19 +0000 |
| commit | 26c7e55f47bf3a93a2e369d162dcc02ddf106f3a (patch) | |
| tree | 8b26562d9a9744a79f3d00dd9351e320132f251d /compiler/rustc_llvm/llvm-wrapper | |
| parent | 07e0e2ec268c140e607e1ac7f49f145612d0f597 (diff) | |
| parent | 67436c11c2a52e124af92e1e7eb91d81200452d7 (diff) | |
| download | rust-26c7e55f47bf3a93a2e369d162dcc02ddf106f3a.tar.gz rust-26c7e55f47bf3a93a2e369d162dcc02ddf106f3a.zip | |
Auto merge of #83454 - JohnTitor:rollup-9ae0565, r=JohnTitor
Rollup of 8 pull requests
Successful merges:
- #83041 (stabilize debug_non_exhaustive)
- #83349 (Remove Option::{unwrap_none, expect_none}.)
- #83420 (Add documentation for rustdoc-gui tests)
- #83421 (Add Result::into_err where the Ok variant is the never type)
- #83427 (small cleanups in rustc_errors / emitter)
- #83434 (Update RELEASES.md)
- #83440 (Use intra-doc link in core::cell)
- #83442 (LLVMWrapper: attractive nuisance macros)
Failed merges:
- #83438 (Update RELEASES.md)
r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_llvm/llvm-wrapper')
| -rw-r--r-- | compiler/rustc_llvm/llvm-wrapper/LLVMWrapper.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/compiler/rustc_llvm/llvm-wrapper/LLVMWrapper.h b/compiler/rustc_llvm/llvm-wrapper/LLVMWrapper.h index f67e06706ea..0b1b68d83b7 100644 --- a/compiler/rustc_llvm/llvm-wrapper/LLVMWrapper.h +++ b/compiler/rustc_llvm/llvm-wrapper/LLVMWrapper.h @@ -33,13 +33,6 @@ (LLVM_VERSION_MAJOR > (major) || \ LLVM_VERSION_MAJOR == (major) && LLVM_VERSION_MINOR >= (minor)) -#define LLVM_VERSION_EQ(major, minor) \ - (LLVM_VERSION_MAJOR == (major) && LLVM_VERSION_MINOR == (minor)) - -#define LLVM_VERSION_LE(major, minor) \ - (LLVM_VERSION_MAJOR < (major) || \ - LLVM_VERSION_MAJOR == (major) && LLVM_VERSION_MINOR <= (minor)) - #define LLVM_VERSION_LT(major, minor) (!LLVM_VERSION_GE((major), (minor))) #include "llvm/IR/LegacyPassManager.h" |