about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2023-06-15 19:04:13 +0000
committerbors <bors@rust-lang.org>2023-06-15 19:04:13 +0000
commit114fb86ca08cfa6a99087e0f0bc264d03590dc37 (patch)
treecc805a0e76d43a7218c72db02c2883b5d9ac641b /src
parent331249a94930adb3d2a7243d946733b63324b2d6 (diff)
parent8a120cc867a5a32b7879c62e02216a43d695e6e2 (diff)
Auto merge of #112671 - bjorn3:sync_cg_clif-2023-06-15, r=bjorn3
Sync rustc_codegen_cranelift

The main highlights this time are a cranelift update, some x86 vendor intrinsic implementations and preparations for testing cg_clif in CI here.

r? `@ghost`

`@rustbot` label +A-codegen +A-cranelift +T-compiler
Diffstat (limited to 'src')
-rw-r--r--src/tools/tidy/src/deps.rs15
1 files changed, 12 insertions, 3 deletions
diff --git a/src/tools/tidy/src/deps.rs b/src/tools/tidy/src/deps.rs
index df9c3989b6e..0bc50c64133 100644
--- a/src/tools/tidy/src/deps.rs
+++ b/src/tools/tidy/src/deps.rs
@@ -79,6 +79,7 @@ const EXCEPTIONS_CRANELIFT: &[(&str, &str)] = &[
     ("cranelift-codegen", "Apache-2.0 WITH LLVM-exception"),
     ("cranelift-codegen-meta", "Apache-2.0 WITH LLVM-exception"),
     ("cranelift-codegen-shared", "Apache-2.0 WITH LLVM-exception"),
+    ("cranelift-control", "Apache-2.0 WITH LLVM-exception"),
     ("cranelift-entity", "Apache-2.0 WITH LLVM-exception"),
     ("cranelift-frontend", "Apache-2.0 WITH LLVM-exception"),
     ("cranelift-isle", "Apache-2.0 WITH LLVM-exception"),
@@ -309,15 +310,16 @@ const PERMITTED_CRANELIFT_DEPENDENCIES: &[&str] = &[
     // tidy-alphabetical-start
     "ahash",
     "anyhow",
+    "arbitrary",
     "autocfg",
     "bitflags",
     "bumpalo",
-    "byteorder",
     "cfg-if",
     "cranelift-bforest",
     "cranelift-codegen",
     "cranelift-codegen-meta",
     "cranelift-codegen-shared",
+    "cranelift-control",
     "cranelift-entity",
     "cranelift-frontend",
     "cranelift-isle",
@@ -327,7 +329,6 @@ const PERMITTED_CRANELIFT_DEPENDENCIES: &[&str] = &[
     "cranelift-object",
     "crc32fast",
     "fallible-iterator",
-    "fxhash",
     "gimli",
     "hashbrown",
     "indexmap",
@@ -337,9 +338,9 @@ const PERMITTED_CRANELIFT_DEPENDENCIES: &[&str] = &[
     "mach",
     "memchr",
     "object",
-    "once_cell",
     "regalloc2",
     "region",
+    "rustc-hash",
     "slice-group-by",
     "smallvec",
     "stable_deref_trait",
@@ -350,6 +351,14 @@ const PERMITTED_CRANELIFT_DEPENDENCIES: &[&str] = &[
     "winapi-i686-pc-windows-gnu",
     "winapi-x86_64-pc-windows-gnu",
     "windows-sys",
+    "windows-targets",
+    "windows_aarch64_gnullvm",
+    "windows_aarch64_msvc",
+    "windows_i686_gnu",
+    "windows_i686_msvc",
+    "windows_x86_64_gnu",
+    "windows_x86_64_gnullvm",
+    "windows_x86_64_msvc",
     // tidy-alphabetical-end
 ];