diff options
| author | bors <bors@rust-lang.org> | 2024-11-03 05:03:52 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-11-03 05:03:52 +0000 |
| commit | 89ab6559cc10ee3b24c4aef2f62b716f682cb926 (patch) | |
| tree | 1f74fc6ae4f19852ea9b8f83424d0821ea5109bc /src | |
| parent | 67395551d07b0eaf6a45ed3bf1759530ca2235d7 (diff) | |
| parent | c959f6e5fd13fc8312d96aeb0fa0ae7e70f0ad98 (diff) | |
| download | rust-89ab6559cc10ee3b24c4aef2f62b716f682cb926.tar.gz rust-89ab6559cc10ee3b24c4aef2f62b716f682cb926.zip | |
Auto merge of #132526 - bjorn3:sync_cg_clif-2024-11-02, r=bjorn3
Subtree sync for rustc_codegen_cranelift The highlight this time is an update to Cranelift 0.113, r? `@ghost` `@rustbot` label +A-codegen +A-cranelift +T-compiler
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/tidy/src/deps.rs | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/tools/tidy/src/deps.rs b/src/tools/tidy/src/deps.rs index f3bd72fe647..bad7b5783bc 100644 --- a/src/tools/tidy/src/deps.rs +++ b/src/tools/tidy/src/deps.rs @@ -203,7 +203,7 @@ const EXCEPTIONS_CRANELIFT: ExceptionList = &[ ("cranelift-module", "Apache-2.0 WITH LLVM-exception"), ("cranelift-native", "Apache-2.0 WITH LLVM-exception"), ("cranelift-object", "Apache-2.0 WITH LLVM-exception"), - ("mach", "BSD-2-Clause"), + ("mach2", "BSD-2-Clause OR MIT OR Apache-2.0"), ("regalloc2", "Apache-2.0 WITH LLVM-exception"), ("target-lexicon", "Apache-2.0 WITH LLVM-exception"), ("wasmtime-jit-icache-coherence", "Apache-2.0 WITH LLVM-exception"), @@ -537,7 +537,7 @@ const PERMITTED_CRANELIFT_DEPENDENCIES: &[&str] = &[ "libc", "libloading", "log", - "mach", + "mach2", "memchr", "object", "once_cell", @@ -554,9 +554,6 @@ const PERMITTED_CRANELIFT_DEPENDENCIES: &[&str] = &[ "unicode-ident", "version_check", "wasmtime-jit-icache-coherence", - "winapi", - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", "windows-sys", "windows-targets", "windows_aarch64_gnullvm", |