about summary refs log tree commit diff
path: root/compiler/rustc_llvm/llvm-wrapper/LLVMWrapper.h
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2023-11-27 21:54:03 +0000
committerbors <bors@rust-lang.org>2023-11-27 21:54:03 +0000
commit49b3924bd4a34d3cf9c37b74120fba78d9712ab8 (patch)
treed5a8f3f48deccebd38ca64972b8c8d9f55af9988 /compiler/rustc_llvm/llvm-wrapper/LLVMWrapper.h
parent6eb95240477475f273bf086cd7ad7a855364dc36 (diff)
parent7de6d04bc8033644c09fd1273b6fb3164d04fab3 (diff)
downloadrust-49b3924bd4a34d3cf9c37b74120fba78d9712ab8.tar.gz
rust-49b3924bd4a34d3cf9c37b74120fba78d9712ab8.zip
Auto merge of #117947 - Dirbaio:drop-llvm-15, r=cuviper
Update the minimum external LLVM to 16.

With this change, we'll have stable support for LLVM 16 and 17.
For reference, the previous increase to LLVM 15 was #114148

[Relevant zulip discussion](https://rust-lang.zulipchat.com/#narrow/stream/131828-t-compiler/topic/riscv.20forced-atomics)
Diffstat (limited to 'compiler/rustc_llvm/llvm-wrapper/LLVMWrapper.h')
-rw-r--r--compiler/rustc_llvm/llvm-wrapper/LLVMWrapper.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/compiler/rustc_llvm/llvm-wrapper/LLVMWrapper.h b/compiler/rustc_llvm/llvm-wrapper/LLVMWrapper.h
index 142384e6d0c..ad97ede8e9c 100644
--- a/compiler/rustc_llvm/llvm-wrapper/LLVMWrapper.h
+++ b/compiler/rustc_llvm/llvm-wrapper/LLVMWrapper.h
@@ -42,11 +42,7 @@
 #include "llvm/IR/IRPrintingPasses.h"
 #include "llvm/Linker/Linker.h"
 
-#if LLVM_VERSION_GE(16, 0)
 #include "llvm/TargetParser/Triple.h"
-#else
-#include "llvm/ADT/Triple.h"
-#endif
 
 extern "C" void LLVMRustSetLastError(const char *);