diff options
| author | The Miri Cronjob Bot <miri@cron.bot> | 2025-08-27 05:00:43 +0000 |
|---|---|---|
| committer | The Miri Cronjob Bot <miri@cron.bot> | 2025-08-27 05:00:43 +0000 |
| commit | aa583798abbead86c01450106088efba8dc0d54e (patch) | |
| tree | d3bde15db472993fc1d801f93f3c86ab8f669971 /compiler/rustc_codegen_llvm/src/llvm_util.rs | |
| parent | a10bdf93b153211e5daf1b1c147b955e690e30ef (diff) | |
| parent | b8160e9f38329c5c17f642f3e7e8ac702375dad5 (diff) | |
| download | rust-aa583798abbead86c01450106088efba8dc0d54e.tar.gz rust-aa583798abbead86c01450106088efba8dc0d54e.zip | |
Merge ref '269d5b56bcfd' from rust-lang/rust
Pull recent changes from https://github.com/rust-lang/rust via Josh. Upstream ref: 269d5b56bcfdf2be82213e72ef9a2e4c592a8c6b Filtered ref: a221b1d3ebb78ec8a01dcb1fe6bb165378e2f5c9 This merge was created using https://github.com/rust-lang/josh-sync.
Diffstat (limited to 'compiler/rustc_codegen_llvm/src/llvm_util.rs')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/llvm_util.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_codegen_llvm/src/llvm_util.rs b/compiler/rustc_codegen_llvm/src/llvm_util.rs index 90f7cd43268..d927ffd78c2 100644 --- a/compiler/rustc_codegen_llvm/src/llvm_util.rs +++ b/compiler/rustc_codegen_llvm/src/llvm_util.rs @@ -26,7 +26,7 @@ static INIT: Once = Once::new(); pub(crate) fn init(sess: &Session) { unsafe { // Before we touch LLVM, make sure that multithreading is enabled. - if llvm::LLVMIsMultithreaded() != 1 { + if !llvm::LLVMIsMultithreaded().is_true() { bug!("LLVM compiled without support for threads"); } INIT.call_once(|| { @@ -279,7 +279,7 @@ pub(crate) fn to_llvm_features<'a>(sess: &Session, s: &'a str) -> Option<LLVMFea } ("loongarch32" | "loongarch64", "32s") if get_version().0 < 21 => None, // Filter out features that are not supported by the current LLVM version - ("riscv32" | "riscv64", "zacas") if get_version().0 < 20 => None, + ("riscv32" | "riscv64", "zacas" | "rva23u64" | "supm") if get_version().0 < 20 => None, ( "s390x", "message-security-assist-extension12" |