82 files changed, 95 insertions, 91 deletions
diff --git a/library/compiler-builtins/.github/workflows/main.yml b/library/compiler-builtins/.github/workflows/main.yml
index 50844a66c43..c337c26a272 100644
--- a/library/compiler-builtins/.github/workflows/main.yml
+++ b/library/compiler-builtins/.github/workflows/main.yml
@@ -4,7 +4,6 @@ on: [push, pull_request]
 env:
   RUSTDOCFLAGS: -Dwarnings
   RUSTFLAGS: -Dwarnings
-  RUST_COMPILER_RT_ROOT: ./compiler-rt
 
 jobs:
   test:
@@ -133,6 +132,8 @@ jobs:
       if: steps.cache-compiler-rt.outputs.cache-hit != 'true'
       run: ./ci/download-compiler-rt.sh
       shell: bash
+    - run: echo "RUST_COMPILER_RT_ROOT=$(realpath ./compiler-rt)" >> "$GITHUB_ENV"
+      shell: bash
 
     # Non-linux tests just use our raw script
     - run: ./ci/run.sh ${{ matrix.target }}
diff --git a/library/compiler-builtins/.github/workflows/publish.yml b/library/compiler-builtins/.github/workflows/publish.yml
index d568f375738..7d6a8df0305 100644
--- a/library/compiler-builtins/.github/workflows/publish.yml
+++ b/library/compiler-builtins/.github/workflows/publish.yml
@@ -22,7 +22,7 @@ jobs:
       - name: Install Rust (rustup)
         run: rustup update nightly --no-self-update && rustup default nightly
       - name: Publish `libm` as part of builtins, rather than its own crate
-        run: rm libm/Cargo.toml
+        run: rm compiler-builtins/libm/Cargo.toml
       - name: Run release-plz
         uses: MarcoIeni/release-plz-action@v0.5
         env:
diff --git a/library/compiler-builtins/.gitmodules b/library/compiler-builtins/.gitmodules
index 726b1c5c67c..a0b0d021dea 100644
--- a/library/compiler-builtins/.gitmodules
+++ b/library/compiler-builtins/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "libm"]
-	path = libm
+[submodule "compiler-builtins/libm"]
+	path = compiler-builtins/libm
 	url = https://github.com/rust-lang/libm.git
diff --git a/library/compiler-builtins/Cargo.toml b/library/compiler-builtins/Cargo.toml
index 60de27758d8..db4c45dfa4b 100644
--- a/library/compiler-builtins/Cargo.toml
+++ b/library/compiler-builtins/Cargo.toml
@@ -1,88 +1,16 @@
-[package]
-authors = ["Jorge Aparicio <japaricious@gmail.com>"]
-name = "compiler_builtins"
-version = "0.1.151"
-license = "MIT AND Apache-2.0 WITH LLVM-exception AND (MIT OR Apache-2.0)"
-readme = "README.md"
-repository = "https://github.com/rust-lang/compiler-builtins"
-homepage = "https://github.com/rust-lang/compiler-builtins"
-documentation = "https://docs.rs/compiler_builtins"
-edition = "2021"
-description = """
-Compiler intrinsics used by the Rust compiler. Also available for other targets
-if necessary!
-"""
-include = [
-  '/Cargo.toml',
-  '/build.rs',
-  '/configure.rs',
-  '/src/*',
-  '/examples/*',
-  '/LICENSE.txt',
-  '/README.md',
-  '/compiler-rt/*',
-  '/libm/src/math/*',
-]
-links = 'compiler-rt'
-
-[lib]
-test = false
-
-[dependencies]
-# For more information on this dependency see
-# https://github.com/rust-lang/rust/tree/master/library/rustc-std-workspace-core
-core = { version = "1.0.0", optional = true, package = 'rustc-std-workspace-core' }
-
-[build-dependencies]
-cc = { optional = true, version = "1.0" }
-
-[dev-dependencies]
-panic-handler = { path = 'crates/panic-handler' }
-
-[features]
-default = ["compiler-builtins"]
-
-# Enable compilation of C code in compiler-rt, filling in some more optimized
-# implementations and also filling in unimplemented intrinsics
-c = ["cc"]
-
-# Workaround for the Cranelift codegen backend. Disables any implementations
-# which use inline assembly and fall back to pure Rust versions (if avalible).
-no-asm = []
-
-# Workaround for codegen backends which haven't yet implemented `f16` and
-# `f128` support. Disabled any intrinsics which use those types.
-no-f16-f128 = []
-
-# Flag this library as the unstable compiler-builtins lib
-compiler-builtins = []
-
-# Generate memory-related intrinsics like memcpy
-mem = []
-
-# Mangle all names so this can be linked in with other versions or other
-# compiler-rt implementations. Also used for testing
-mangled-names = []
-
-# Only used in the compiler's build system
-rustc-dep-of-std = ['compiler-builtins', 'core']
-
-# This makes certain traits and function specializations public that
-# are not normally public but are required by the `testcrate`
-public-test-deps = []
-
 [workspace]
-resolver = "2"
+resolver = "3"
 members = [
-    # Note that builtins-test-intrinsics cannot be  a default member because it
+    # Note that builtins-test-intrinsics cannot be a default member because it
     # needs the `mangled-names` feature disabled, while `testcrate` needs it
     # enabled.
     "builtins-test-intrinsics",
+    "compiler-builtins",
     "testcrate",
 ]
 
 default-members = [
-    ".",
+    "compiler-builtins",
     "testcrate",
 ]
 
diff --git a/library/compiler-builtins/builtins-test-intrinsics/Cargo.toml b/library/compiler-builtins/builtins-test-intrinsics/Cargo.toml
index 9b2e5bb7c8a..9dbd3c32f96 100644
--- a/library/compiler-builtins/builtins-test-intrinsics/Cargo.toml
+++ b/library/compiler-builtins/builtins-test-intrinsics/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 publish = false
 
 [dependencies]
-compiler_builtins = { path = "../", features = ["compiler-builtins"]}
+compiler_builtins = { path = "../compiler-builtins", features = ["compiler-builtins"]}
 panic-handler = { path = '../crates/panic-handler' }
 
 [features]
diff --git a/library/compiler-builtins/builtins-test-intrinsics/build.rs b/library/compiler-builtins/builtins-test-intrinsics/build.rs
index a38c6c1ff71..89b126ff2b2 100644
--- a/library/compiler-builtins/builtins-test-intrinsics/build.rs
+++ b/library/compiler-builtins/builtins-test-intrinsics/build.rs
@@ -1,5 +1,5 @@
 mod builtins_configure {
-    include!("../configure.rs");
+    include!("../compiler-builtins/configure.rs");
 }
 
 fn main() {
diff --git a/library/compiler-builtins/ci/run-docker.sh b/library/compiler-builtins/ci/run-docker.sh
index 215ad71a3c1..5e19cf4d0cb 100755
--- a/library/compiler-builtins/ci/run-docker.sh
+++ b/library/compiler-builtins/ci/run-docker.sh
@@ -38,7 +38,7 @@ run() {
     fi
 
     if [ -d compiler-rt ]; then
-      export RUST_COMPILER_RT_ROOT=./compiler-rt
+      export RUST_COMPILER_RT_ROOT="/checkout/compiler-rt"
     fi
 
     if [ "${GITHUB_ACTIONS:-}" = "true" ]; then
diff --git a/library/compiler-builtins/ci/run.sh b/library/compiler-builtins/ci/run.sh
index 3625dde79ed..9abbf25a7e7 100755
--- a/library/compiler-builtins/ci/run.sh
+++ b/library/compiler-builtins/ci/run.sh
@@ -23,7 +23,7 @@ fi
 if [ "${NO_STD:-}" = "1" ]; then
     echo "nothing to do for no_std"
 else
-    run="cargo test --manifest-path testcrate/Cargo.toml --no-fail-fast --target $target"
+    run="cargo test --package testcrate --no-fail-fast --target $target"
     $run
     $run --release
     $run --features c
@@ -38,7 +38,7 @@ fi
 
 if [ "${TEST_VERBATIM:-}" = "1" ]; then
     verb_path=$(cmd.exe //C echo \\\\?\\%cd%\\testcrate\\target2)
-    cargo build --manifest-path testcrate/Cargo.toml \
+    cargo build --package testcrate \
         --target "$target" --target-dir "$verb_path" --features c
 fi
 
diff --git a/library/compiler-builtins/compiler-builtins/Cargo.toml b/library/compiler-builtins/compiler-builtins/Cargo.toml
new file mode 100644
index 00000000000..9797b5e65b5
--- /dev/null
+++ b/library/compiler-builtins/compiler-builtins/Cargo.toml
@@ -0,0 +1,72 @@
+[package]
+authors = ["Jorge Aparicio <japaricious@gmail.com>"]
+name = "compiler_builtins"
+version = "0.1.151"
+license = "MIT AND Apache-2.0 WITH LLVM-exception AND (MIT OR Apache-2.0)"
+readme = "../README.md"
+repository = "https://github.com/rust-lang/compiler-builtins"
+homepage = "https://github.com/rust-lang/compiler-builtins"
+documentation = "https://docs.rs/compiler_builtins"
+edition = "2021"
+description = """
+Compiler intrinsics used by the Rust compiler. Also available for other targets
+if necessary!
+"""
+include = [
+  '/Cargo.toml',
+  '/build.rs',
+  '/configure.rs',
+  '/src/*',
+  '../LICENSE.txt',
+  '../README.md',
+  '../compiler-rt/*',
+  'libm/src/math/*',
+]
+links = 'compiler-rt'
+
+[lib]
+test = false
+bench = false
+
+[dependencies]
+# For more information on this dependency see
+# https://github.com/rust-lang/rust/tree/master/library/rustc-std-workspace-core
+core = { version = "1.0.0", optional = true, package = 'rustc-std-workspace-core' }
+
+[build-dependencies]
+cc = { optional = true, version = "1.0" }
+
+[dev-dependencies]
+panic-handler = { path = '../crates/panic-handler' }
+
+[features]
+default = ["compiler-builtins"]
+
+# Enable compilation of C code in compiler-rt, filling in some more optimized
+# implementations and also filling in unimplemented intrinsics
+c = ["cc"]
+
+# Workaround for the Cranelift codegen backend. Disables any implementations
+# which use inline assembly and fall back to pure Rust versions (if avalible).
+no-asm = []
+
+# Workaround for codegen backends which haven't yet implemented `f16` and
+# `f128` support. Disabled any intrinsics which use those types.
+no-f16-f128 = []
+
+# Flag this library as the unstable compiler-builtins lib
+compiler-builtins = []
+
+# Generate memory-related intrinsics like memcpy
+mem = []
+
+# Mangle all names so this can be linked in with other versions or other
+# compiler-rt implementations. Also used for testing
+mangled-names = []
+
+# Only used in the compiler's build system
+rustc-dep-of-std = ['compiler-builtins', 'core']
+
+# This makes certain traits and function specializations public that
+# are not normally public but are required by the `testcrate`
+public-test-deps = []
diff --git a/library/compiler-builtins/build.rs b/library/compiler-builtins/compiler-builtins/build.rs
index 3003d51aff8..fdfb61b17df 100644
--- a/library/compiler-builtins/build.rs
+++ b/library/compiler-builtins/compiler-builtins/build.rs
@@ -1,7 +1,7 @@
-use std::{collections::BTreeMap, env, path::PathBuf, sync::atomic::Ordering};
-
 mod configure;
 
+use std::{collections::BTreeMap, env, path::PathBuf, sync::atomic::Ordering};
+
 use configure::{configure_aliases, configure_f16_f128, Target};
 
 fn main() {
diff --git a/library/compiler-builtins/configure.rs b/library/compiler-builtins/compiler-builtins/configure.rs
index 2f134e57818..2f134e57818 100644
--- a/library/compiler-builtins/configure.rs
+++ b/library/compiler-builtins/compiler-builtins/configure.rs
diff --git a/library/compiler-builtins/libm b/library/compiler-builtins/compiler-builtins/libm
-Subproject 69219c491ee9f05761d2068fd6d4c7c0de6faa3
+Subproject 69219c491ee9f05761d2068fd6d4c7c0de6faa3
diff --git a/library/compiler-builtins/src/aarch64.rs b/library/compiler-builtins/compiler-builtins/src/aarch64.rs
index cce485c4682..cce485c4682 100644
--- a/library/compiler-builtins/src/aarch64.rs
+++ b/library/compiler-builtins/compiler-builtins/src/aarch64.rs
diff --git a/library/compiler-builtins/src/aarch64_linux.rs b/library/compiler-builtins/compiler-builtins/src/aarch64_linux.rs
index caac3e6025d..caac3e6025d 100644
--- a/library/compiler-builtins/src/aarch64_linux.rs
+++ b/library/compiler-builtins/compiler-builtins/src/aarch64_linux.rs
diff --git a/library/compiler-builtins/src/arm.rs b/library/compiler-builtins/compiler-builtins/src/arm.rs
index 9e6608397a8..9e6608397a8 100644
--- a/library/compiler-builtins/src/arm.rs
+++ b/library/compiler-builtins/compiler-builtins/src/arm.rs
diff --git a/library/compiler-builtins/src/arm_linux.rs b/library/compiler-builtins/compiler-builtins/src/arm_linux.rs
index 8f22eb62866..8f22eb62866 100644
--- a/library/compiler-builtins/src/arm_linux.rs
+++ b/library/compiler-builtins/compiler-builtins/src/arm_linux.rs
diff --git a/library/compiler-builtins/src/float/add.rs b/library/compiler-builtins/compiler-builtins/src/float/add.rs
index ef04ddc165c..ef04ddc165c 100644
--- a/library/compiler-builtins/src/float/add.rs
+++ b/library/compiler-builtins/compiler-builtins/src/float/add.rs
diff --git a/library/compiler-builtins/src/float/cmp.rs b/library/compiler-builtins/compiler-builtins/src/float/cmp.rs
index b9b4d0114b7..b9b4d0114b7 100644
--- a/library/compiler-builtins/src/float/cmp.rs
+++ b/library/compiler-builtins/compiler-builtins/src/float/cmp.rs
diff --git a/library/compiler-builtins/src/float/conv.rs b/library/compiler-builtins/compiler-builtins/src/float/conv.rs
index 42a526bd524..42a526bd524 100644
--- a/library/compiler-builtins/src/float/conv.rs
+++ b/library/compiler-builtins/compiler-builtins/src/float/conv.rs
diff --git a/library/compiler-builtins/src/float/div.rs b/library/compiler-builtins/compiler-builtins/src/float/div.rs
index 21c757dd639..21c757dd639 100644
--- a/library/compiler-builtins/src/float/div.rs
+++ b/library/compiler-builtins/compiler-builtins/src/float/div.rs
diff --git a/library/compiler-builtins/src/float/extend.rs b/library/compiler-builtins/compiler-builtins/src/float/extend.rs
index ce00da31dc5..ce00da31dc5 100644
--- a/library/compiler-builtins/src/float/extend.rs
+++ b/library/compiler-builtins/compiler-builtins/src/float/extend.rs
diff --git a/library/compiler-builtins/src/float/mod.rs b/library/compiler-builtins/compiler-builtins/src/float/mod.rs
index 41b308626b3..41b308626b3 100644
--- a/library/compiler-builtins/src/float/mod.rs
+++ b/library/compiler-builtins/compiler-builtins/src/float/mod.rs
diff --git a/library/compiler-builtins/src/float/mul.rs b/library/compiler-builtins/compiler-builtins/src/float/mul.rs
index 58636cb5ebe..58636cb5ebe 100644
--- a/library/compiler-builtins/src/float/mul.rs
+++ b/library/compiler-builtins/compiler-builtins/src/float/mul.rs
diff --git a/library/compiler-builtins/src/float/pow.rs b/library/compiler-builtins/compiler-builtins/src/float/pow.rs
index dac768f7be3..dac768f7be3 100644
--- a/library/compiler-builtins/src/float/pow.rs
+++ b/library/compiler-builtins/compiler-builtins/src/float/pow.rs
diff --git a/library/compiler-builtins/src/float/sub.rs b/library/compiler-builtins/compiler-builtins/src/float/sub.rs
index 175b3a16500..175b3a16500 100644
--- a/library/compiler-builtins/src/float/sub.rs
+++ b/library/compiler-builtins/compiler-builtins/src/float/sub.rs
diff --git a/library/compiler-builtins/src/float/traits.rs b/library/compiler-builtins/compiler-builtins/src/float/traits.rs
index 8ccaa7bcbd7..8ccaa7bcbd7 100644
--- a/library/compiler-builtins/src/float/traits.rs
+++ b/library/compiler-builtins/compiler-builtins/src/float/traits.rs
diff --git a/library/compiler-builtins/src/float/trunc.rs b/library/compiler-builtins/compiler-builtins/src/float/trunc.rs
index 928eba0c8ef..928eba0c8ef 100644
--- a/library/compiler-builtins/src/float/trunc.rs
+++ b/library/compiler-builtins/compiler-builtins/src/float/trunc.rs
diff --git a/library/compiler-builtins/src/hexagon.rs b/library/compiler-builtins/compiler-builtins/src/hexagon.rs
index 91cf91c3142..91cf91c3142 100644
--- a/library/compiler-builtins/src/hexagon.rs
+++ b/library/compiler-builtins/compiler-builtins/src/hexagon.rs
diff --git a/library/compiler-builtins/src/hexagon/dfaddsub.s b/library/compiler-builtins/compiler-builtins/src/hexagon/dfaddsub.s
index 1f59e460be6..1f59e460be6 100644
--- a/library/compiler-builtins/src/hexagon/dfaddsub.s
+++ b/library/compiler-builtins/compiler-builtins/src/hexagon/dfaddsub.s
diff --git a/library/compiler-builtins/src/hexagon/dfdiv.s b/library/compiler-builtins/compiler-builtins/src/hexagon/dfdiv.s
index 6d65dbfc4df..6d65dbfc4df 100644
--- a/library/compiler-builtins/src/hexagon/dfdiv.s
+++ b/library/compiler-builtins/compiler-builtins/src/hexagon/dfdiv.s
diff --git a/library/compiler-builtins/src/hexagon/dffma.s b/library/compiler-builtins/compiler-builtins/src/hexagon/dffma.s
index 97d05eb1839..97d05eb1839 100644
--- a/library/compiler-builtins/src/hexagon/dffma.s
+++ b/library/compiler-builtins/compiler-builtins/src/hexagon/dffma.s
diff --git a/library/compiler-builtins/src/hexagon/dfminmax.s b/library/compiler-builtins/compiler-builtins/src/hexagon/dfminmax.s
index 953e773bf19..953e773bf19 100644
--- a/library/compiler-builtins/src/hexagon/dfminmax.s
+++ b/library/compiler-builtins/compiler-builtins/src/hexagon/dfminmax.s
diff --git a/library/compiler-builtins/src/hexagon/dfmul.s b/library/compiler-builtins/compiler-builtins/src/hexagon/dfmul.s
index 32fc674f975..32fc674f975 100644
--- a/library/compiler-builtins/src/hexagon/dfmul.s
+++ b/library/compiler-builtins/compiler-builtins/src/hexagon/dfmul.s
diff --git a/library/compiler-builtins/src/hexagon/dfsqrt.s b/library/compiler-builtins/compiler-builtins/src/hexagon/dfsqrt.s
index 14f584a1133..14f584a1133 100644
--- a/library/compiler-builtins/src/hexagon/dfsqrt.s
+++ b/library/compiler-builtins/compiler-builtins/src/hexagon/dfsqrt.s
diff --git a/library/compiler-builtins/src/hexagon/divdi3.s b/library/compiler-builtins/compiler-builtins/src/hexagon/divdi3.s
index 0fee6e70f06..0fee6e70f06 100644
--- a/library/compiler-builtins/src/hexagon/divdi3.s
+++ b/library/compiler-builtins/compiler-builtins/src/hexagon/divdi3.s
diff --git a/library/compiler-builtins/src/hexagon/divsi3.s b/library/compiler-builtins/compiler-builtins/src/hexagon/divsi3.s
index fc957a43146..fc957a43146 100644
--- a/library/compiler-builtins/src/hexagon/divsi3.s
+++ b/library/compiler-builtins/compiler-builtins/src/hexagon/divsi3.s
diff --git a/library/compiler-builtins/src/hexagon/fastmath2_dlib_asm.s b/library/compiler-builtins/compiler-builtins/src/hexagon/fastmath2_dlib_asm.s
index e77b7db0332..e77b7db0332 100644
--- a/library/compiler-builtins/src/hexagon/fastmath2_dlib_asm.s
+++ b/library/compiler-builtins/compiler-builtins/src/hexagon/fastmath2_dlib_asm.s
diff --git a/library/compiler-builtins/src/hexagon/fastmath2_ldlib_asm.s b/library/compiler-builtins/compiler-builtins/src/hexagon/fastmath2_ldlib_asm.s
index 3251057d78c..3251057d78c 100644
--- a/library/compiler-builtins/src/hexagon/fastmath2_ldlib_asm.s
+++ b/library/compiler-builtins/compiler-builtins/src/hexagon/fastmath2_ldlib_asm.s
diff --git a/library/compiler-builtins/src/hexagon/func_macro.s b/library/compiler-builtins/compiler-builtins/src/hexagon/func_macro.s
index 9a1e11aebcb..9a1e11aebcb 100644
--- a/library/compiler-builtins/src/hexagon/func_macro.s
+++ b/library/compiler-builtins/compiler-builtins/src/hexagon/func_macro.s
diff --git a/library/compiler-builtins/src/hexagon/memcpy_forward_vp4cp4n2.s b/library/compiler-builtins/compiler-builtins/src/hexagon/memcpy_forward_vp4cp4n2.s
index 89f69010aa4..89f69010aa4 100644
--- a/library/compiler-builtins/src/hexagon/memcpy_forward_vp4cp4n2.s
+++ b/library/compiler-builtins/compiler-builtins/src/hexagon/memcpy_forward_vp4cp4n2.s
diff --git a/library/compiler-builtins/src/hexagon/memcpy_likely_aligned.s b/library/compiler-builtins/compiler-builtins/src/hexagon/memcpy_likely_aligned.s
index 7e9b62f6a79..7e9b62f6a79 100644
--- a/library/compiler-builtins/src/hexagon/memcpy_likely_aligned.s
+++ b/library/compiler-builtins/compiler-builtins/src/hexagon/memcpy_likely_aligned.s
diff --git a/library/compiler-builtins/src/hexagon/moddi3.s b/library/compiler-builtins/compiler-builtins/src/hexagon/moddi3.s
index 53ea6d52a58..53ea6d52a58 100644
--- a/library/compiler-builtins/src/hexagon/moddi3.s
+++ b/library/compiler-builtins/compiler-builtins/src/hexagon/moddi3.s
diff --git a/library/compiler-builtins/src/hexagon/modsi3.s b/library/compiler-builtins/compiler-builtins/src/hexagon/modsi3.s
index c4ae7e59edc..c4ae7e59edc 100644
--- a/library/compiler-builtins/src/hexagon/modsi3.s
+++ b/library/compiler-builtins/compiler-builtins/src/hexagon/modsi3.s
diff --git a/library/compiler-builtins/src/hexagon/sfdiv_opt.s b/library/compiler-builtins/compiler-builtins/src/hexagon/sfdiv_opt.s
index 26c91f15cbb..26c91f15cbb 100644
--- a/library/compiler-builtins/src/hexagon/sfdiv_opt.s
+++ b/library/compiler-builtins/compiler-builtins/src/hexagon/sfdiv_opt.s
diff --git a/library/compiler-builtins/src/hexagon/sfsqrt_opt.s b/library/compiler-builtins/compiler-builtins/src/hexagon/sfsqrt_opt.s
index c90af179754..c90af179754 100644
--- a/library/compiler-builtins/src/hexagon/sfsqrt_opt.s
+++ b/library/compiler-builtins/compiler-builtins/src/hexagon/sfsqrt_opt.s
diff --git a/library/compiler-builtins/src/hexagon/udivdi3.s b/library/compiler-builtins/compiler-builtins/src/hexagon/udivdi3.s
index f0fffc23df0..f0fffc23df0 100644
--- a/library/compiler-builtins/src/hexagon/udivdi3.s
+++ b/library/compiler-builtins/compiler-builtins/src/hexagon/udivdi3.s
diff --git a/library/compiler-builtins/src/hexagon/udivmoddi4.s b/library/compiler-builtins/compiler-builtins/src/hexagon/udivmoddi4.s
index cbfb3987dd2..cbfb3987dd2 100644
--- a/library/compiler-builtins/src/hexagon/udivmoddi4.s
+++ b/library/compiler-builtins/compiler-builtins/src/hexagon/udivmoddi4.s
diff --git a/library/compiler-builtins/src/hexagon/udivmodsi4.s b/library/compiler-builtins/compiler-builtins/src/hexagon/udivmodsi4.s
index 83489c51431..83489c51431 100644
--- a/library/compiler-builtins/src/hexagon/udivmodsi4.s
+++ b/library/compiler-builtins/compiler-builtins/src/hexagon/udivmodsi4.s
diff --git a/library/compiler-builtins/src/hexagon/udivsi3.s b/library/compiler-builtins/compiler-builtins/src/hexagon/udivsi3.s
index e0b94aa9982..e0b94aa9982 100644
--- a/library/compiler-builtins/src/hexagon/udivsi3.s
+++ b/library/compiler-builtins/compiler-builtins/src/hexagon/udivsi3.s
diff --git a/library/compiler-builtins/src/hexagon/umoddi3.s b/library/compiler-builtins/compiler-builtins/src/hexagon/umoddi3.s
index c76011c3e7a..c76011c3e7a 100644
--- a/library/compiler-builtins/src/hexagon/umoddi3.s
+++ b/library/compiler-builtins/compiler-builtins/src/hexagon/umoddi3.s
diff --git a/library/compiler-builtins/src/hexagon/umodsi3.s b/library/compiler-builtins/compiler-builtins/src/hexagon/umodsi3.s
index 1b592a7c561..1b592a7c561 100644
--- a/library/compiler-builtins/src/hexagon/umodsi3.s
+++ b/library/compiler-builtins/compiler-builtins/src/hexagon/umodsi3.s
diff --git a/library/compiler-builtins/src/int/addsub.rs b/library/compiler-builtins/compiler-builtins/src/int/addsub.rs
index 1f84e8eb1e1..1f84e8eb1e1 100644
--- a/library/compiler-builtins/src/int/addsub.rs
+++ b/library/compiler-builtins/compiler-builtins/src/int/addsub.rs
diff --git a/library/compiler-builtins/src/int/big.rs b/library/compiler-builtins/compiler-builtins/src/int/big.rs
index 0ef3caaedff..0ef3caaedff 100644
--- a/library/compiler-builtins/src/int/big.rs
+++ b/library/compiler-builtins/compiler-builtins/src/int/big.rs
diff --git a/library/compiler-builtins/src/int/bswap.rs b/library/compiler-builtins/compiler-builtins/src/int/bswap.rs
index 9df80204d0e..9df80204d0e 100644
--- a/library/compiler-builtins/src/int/bswap.rs
+++ b/library/compiler-builtins/compiler-builtins/src/int/bswap.rs
diff --git a/library/compiler-builtins/src/int/leading_zeros.rs b/library/compiler-builtins/compiler-builtins/src/int/leading_zeros.rs
index ba735aa7462..ba735aa7462 100644
--- a/library/compiler-builtins/src/int/leading_zeros.rs
+++ b/library/compiler-builtins/compiler-builtins/src/int/leading_zeros.rs
diff --git a/library/compiler-builtins/src/int/mod.rs b/library/compiler-builtins/compiler-builtins/src/int/mod.rs
index 1f1be711bbd..1f1be711bbd 100644
--- a/library/compiler-builtins/src/int/mod.rs
+++ b/library/compiler-builtins/compiler-builtins/src/int/mod.rs
diff --git a/library/compiler-builtins/src/int/mul.rs b/library/compiler-builtins/compiler-builtins/src/int/mul.rs
index 040c69342d1..040c69342d1 100644
--- a/library/compiler-builtins/src/int/mul.rs
+++ b/library/compiler-builtins/compiler-builtins/src/int/mul.rs
diff --git a/library/compiler-builtins/src/int/sdiv.rs b/library/compiler-builtins/compiler-builtins/src/int/sdiv.rs
index 9630c7d7de3..9630c7d7de3 100644
--- a/library/compiler-builtins/src/int/sdiv.rs
+++ b/library/compiler-builtins/compiler-builtins/src/int/sdiv.rs
diff --git a/library/compiler-builtins/src/int/shift.rs b/library/compiler-builtins/compiler-builtins/src/int/shift.rs
index 317272988ce..317272988ce 100644
--- a/library/compiler-builtins/src/int/shift.rs
+++ b/library/compiler-builtins/compiler-builtins/src/int/shift.rs
diff --git a/library/compiler-builtins/src/int/specialized_div_rem/asymmetric.rs b/library/compiler-builtins/compiler-builtins/src/int/specialized_div_rem/asymmetric.rs
index 56ce188a373..56ce188a373 100644
--- a/library/compiler-builtins/src/int/specialized_div_rem/asymmetric.rs
+++ b/library/compiler-builtins/compiler-builtins/src/int/specialized_div_rem/asymmetric.rs
diff --git a/library/compiler-builtins/src/int/specialized_div_rem/binary_long.rs b/library/compiler-builtins/compiler-builtins/src/int/specialized_div_rem/binary_long.rs
index 2c61a45e06e..2c61a45e06e 100644
--- a/library/compiler-builtins/src/int/specialized_div_rem/binary_long.rs
+++ b/library/compiler-builtins/compiler-builtins/src/int/specialized_div_rem/binary_long.rs
diff --git a/library/compiler-builtins/src/int/specialized_div_rem/delegate.rs b/library/compiler-builtins/compiler-builtins/src/int/specialized_div_rem/delegate.rs
index f5c6e50239a..f5c6e50239a 100644
--- a/library/compiler-builtins/src/int/specialized_div_rem/delegate.rs
+++ b/library/compiler-builtins/compiler-builtins/src/int/specialized_div_rem/delegate.rs
diff --git a/library/compiler-builtins/src/int/specialized_div_rem/mod.rs b/library/compiler-builtins/compiler-builtins/src/int/specialized_div_rem/mod.rs
index a91fe6632ee..a91fe6632ee 100644
--- a/library/compiler-builtins/src/int/specialized_div_rem/mod.rs
+++ b/library/compiler-builtins/compiler-builtins/src/int/specialized_div_rem/mod.rs
diff --git a/library/compiler-builtins/src/int/specialized_div_rem/norm_shift.rs b/library/compiler-builtins/compiler-builtins/src/int/specialized_div_rem/norm_shift.rs
index 61b67b6bc3d..61b67b6bc3d 100644
--- a/library/compiler-builtins/src/int/specialized_div_rem/norm_shift.rs
+++ b/library/compiler-builtins/compiler-builtins/src/int/specialized_div_rem/norm_shift.rs
diff --git a/library/compiler-builtins/src/int/specialized_div_rem/trifecta.rs b/library/compiler-builtins/compiler-builtins/src/int/specialized_div_rem/trifecta.rs
index 7e104053b8b..7e104053b8b 100644
--- a/library/compiler-builtins/src/int/specialized_div_rem/trifecta.rs
+++ b/library/compiler-builtins/compiler-builtins/src/int/specialized_div_rem/trifecta.rs
diff --git a/library/compiler-builtins/src/int/trailing_zeros.rs b/library/compiler-builtins/compiler-builtins/src/int/trailing_zeros.rs
index dbc0cce9fac..dbc0cce9fac 100644
--- a/library/compiler-builtins/src/int/trailing_zeros.rs
+++ b/library/compiler-builtins/compiler-builtins/src/int/trailing_zeros.rs
diff --git a/library/compiler-builtins/src/int/traits.rs b/library/compiler-builtins/compiler-builtins/src/int/traits.rs
index 9b079e2aa59..9b079e2aa59 100644
--- a/library/compiler-builtins/src/int/traits.rs
+++ b/library/compiler-builtins/compiler-builtins/src/int/traits.rs
diff --git a/library/compiler-builtins/src/int/udiv.rs b/library/compiler-builtins/compiler-builtins/src/int/udiv.rs
index 1fa761212b2..1fa761212b2 100644
--- a/library/compiler-builtins/src/int/udiv.rs
+++ b/library/compiler-builtins/compiler-builtins/src/int/udiv.rs
diff --git a/library/compiler-builtins/src/lib.miri.rs b/library/compiler-builtins/compiler-builtins/src/lib.miri.rs
index 17288058e5e..17288058e5e 100644
--- a/library/compiler-builtins/src/lib.miri.rs
+++ b/library/compiler-builtins/compiler-builtins/src/lib.miri.rs
diff --git a/library/compiler-builtins/src/lib.rs b/library/compiler-builtins/compiler-builtins/src/lib.rs
index 6f5bd85981e..16de96b4da0 100644
--- a/library/compiler-builtins/src/lib.rs
+++ b/library/compiler-builtins/compiler-builtins/src/lib.rs
@@ -44,8 +44,7 @@ pub mod int;
 pub mod math;
 pub mod mem;
 
-// `libm` expects its `support` module to be available in the crate root. This config can be
-// cleaned up once `libm` is made always available.
+// `libm` expects its `support` module to be available in the crate root.
 use math::libm::support;
 
 #[cfg(target_arch = "arm")]
diff --git a/library/compiler-builtins/src/macros.rs b/library/compiler-builtins/compiler-builtins/src/macros.rs
index b1b71379cc9..b1b71379cc9 100644
--- a/library/compiler-builtins/src/macros.rs
+++ b/library/compiler-builtins/compiler-builtins/src/macros.rs
diff --git a/library/compiler-builtins/src/math.rs b/library/compiler-builtins/compiler-builtins/src/math.rs
index ccd9c54216c..ccd9c54216c 100644
--- a/library/compiler-builtins/src/math.rs
+++ b/library/compiler-builtins/compiler-builtins/src/math.rs
diff --git a/library/compiler-builtins/src/mem/impls.rs b/library/compiler-builtins/compiler-builtins/src/mem/impls.rs
index c602a67dbd7..c602a67dbd7 100644
--- a/library/compiler-builtins/src/mem/impls.rs
+++ b/library/compiler-builtins/compiler-builtins/src/mem/impls.rs
diff --git a/library/compiler-builtins/src/mem/mod.rs b/library/compiler-builtins/compiler-builtins/src/mem/mod.rs
index ec160039d0d..ec160039d0d 100644
--- a/library/compiler-builtins/src/mem/mod.rs
+++ b/library/compiler-builtins/compiler-builtins/src/mem/mod.rs
diff --git a/library/compiler-builtins/src/mem/x86_64.rs b/library/compiler-builtins/compiler-builtins/src/mem/x86_64.rs
index 40b67093f51..40b67093f51 100644
--- a/library/compiler-builtins/src/mem/x86_64.rs
+++ b/library/compiler-builtins/compiler-builtins/src/mem/x86_64.rs
diff --git a/library/compiler-builtins/src/probestack.rs b/library/compiler-builtins/compiler-builtins/src/probestack.rs
index 5b6abd21a1d..5b6abd21a1d 100644
--- a/library/compiler-builtins/src/probestack.rs
+++ b/library/compiler-builtins/compiler-builtins/src/probestack.rs
diff --git a/library/compiler-builtins/src/riscv.rs b/library/compiler-builtins/compiler-builtins/src/riscv.rs
index bf312553341..bf312553341 100644
--- a/library/compiler-builtins/src/riscv.rs
+++ b/library/compiler-builtins/compiler-builtins/src/riscv.rs
diff --git a/library/compiler-builtins/src/x86.rs b/library/compiler-builtins/compiler-builtins/src/x86.rs
index ad04d2108ea..ad04d2108ea 100644
--- a/library/compiler-builtins/src/x86.rs
+++ b/library/compiler-builtins/compiler-builtins/src/x86.rs
diff --git a/library/compiler-builtins/src/x86_64.rs b/library/compiler-builtins/compiler-builtins/src/x86_64.rs
index aae601f58bf..aae601f58bf 100644
--- a/library/compiler-builtins/src/x86_64.rs
+++ b/library/compiler-builtins/compiler-builtins/src/x86_64.rs
diff --git a/library/compiler-builtins/crates/panic-handler/Cargo.toml b/library/compiler-builtins/crates/panic-handler/Cargo.toml
index 96b83eaa226..a6764fc481b 100644
--- a/library/compiler-builtins/crates/panic-handler/Cargo.toml
+++ b/library/compiler-builtins/crates/panic-handler/Cargo.toml
@@ -5,4 +5,8 @@ authors = ["Alex Crichton <alex@alexcrichton.com>"]
 edition = "2024"
 publish = false
 
+[lib]
+test = false
+bench = false
+
 [dependencies]
diff --git a/library/compiler-builtins/testcrate/Cargo.toml b/library/compiler-builtins/testcrate/Cargo.toml
index 71c461c578c..be60e694fa9 100644
--- a/library/compiler-builtins/testcrate/Cargo.toml
+++ b/library/compiler-builtins/testcrate/Cargo.toml
@@ -18,7 +18,7 @@ rand_xoshiro = "0.6"
 rustc_apfloat = "0.2.1"
 
 [dependencies.compiler_builtins]
-path = ".."
+path = "../compiler-builtins"
 default-features = false
 features = ["public-test-deps"]
 
diff --git a/library/compiler-builtins/testcrate/build.rs b/library/compiler-builtins/testcrate/build.rs
index 566b985d246..e8f4eb4dd22 100644
--- a/library/compiler-builtins/testcrate/build.rs
+++ b/library/compiler-builtins/testcrate/build.rs
@@ -1,7 +1,7 @@
 use std::collections::HashSet;
 
 mod builtins_configure {
-    include!("../configure.rs");
+    include!("../compiler-builtins/configure.rs");
 }
 
 /// Features to enable