Auto merge of #152420 - tgross35:update-builtins, r=tgross35

compiler-builtins subtree update

Subtree update of `compiler-builtins` to rust-lang/compiler-builtins@6a67a9f.

Created using https://github.com/rust-lang/josh-sync.

r? @ghost

Author: bors

library/compiler-builtins/.github/workflows/main.yaml

@@ -70,12 +70,14 @@ jobs:
           os: ubuntu-24.04
         - target: powerpc64le-unknown-linux-gnu
           os: ubuntu-24.04
-        - target: powerpc64le-unknown-linux-gnu
-          os: ubuntu-24.04-ppc64le
+        # - target: powerpc64le-unknown-linux-gnu
+        #   os: ubuntu-24.04-ppc64le
+        #   # FIXME(rust#151807): remove once PPC builds work again.
+        #   channel: nightly-2026-01-23
         - target: riscv64gc-unknown-linux-gnu
           os: ubuntu-24.04
-        - target: s390x-unknown-linux-gnu
-          os: ubuntu-24.04-s390x
+        # - target: s390x-unknown-linux-gnu
+        #   os: ubuntu-24.04-s390x
         - target: thumbv6m-none-eabi
           os: ubuntu-24.04
         - target: thumbv7em-none-eabi
@@ -228,7 +230,27 @@ jobs:
         # poorly with build scripts)
         cargo build -p compiler_builtins -p libm \
           --target etc/thumbv7em-none-eabi-renamed.json \
-          -Zbuild-std=core
+          -Zbuild-std=core \
+          -Zjson-target-spec
+
+  # FIXME: move this target to test job once https://github.com/rust-lang/rust/pull/150138 merged.
+  build-thumbv6k:
+    name: Build thumbv6k
+    runs-on: ubuntu-24.04
+    timeout-minutes: 10
+    steps:
+    - uses: actions/checkout@v4
+    - name: Install Rust
+      run: |
+        rustup update nightly --no-self-update
+        rustup default nightly
+        rustup component add rust-src
+    - uses: Swatinem/rust-cache@v2
+    - run: |
+        cargo build -p compiler_builtins -p libm \
+          --target etc/thumbv6-none-eabi.json \
+          -Zbuild-std=core \
+          -Zjson-target-spec
 
   benchmarks:
     name: Benchmarks
@@ -354,6 +376,7 @@ jobs:
     needs:
       - benchmarks
       - build-custom
+      - build-thumbv6k
       - clippy
       - extensive
       - miri

library/compiler-builtins/.github/workflows/rustc-pull.yml

@@ -7,6 +7,9 @@ on:
     # Run at 04:00 UTC every Monday and Thursday
     - cron: '0 4 * * 1,4'
 
+env:
+  JOSH_SYNC_VERBOSE: true
+
 jobs:
   pull:
     if: github.repository == 'rust-lang/compiler-builtins'

library/compiler-builtins/Cargo.toml

@@ -31,6 +31,39 @@ exclude = [
     "compiler-builtins",
 ]
 
+[workspace.dependencies]
+anyhow = "1.0.101"
+assert_cmd = "2.1.2"
+cc = "1.2.55"
+compiler_builtins = { path = "builtins-shim", default-features = false }
+criterion = { version = "0.6.0", default-features = false, features = ["cargo_bench_support"] }
+getrandom = "0.3.4"
+gmp-mpfr-sys = { version = "1.6.8", default-features = false }
+gungraun = "0.17.0"
+heck = "0.5.0"
+indicatif = { version = "0.18.3", default-features = false }
+libm = { path = "libm", default-features = false }
+libm-macros = { path = "crates/libm-macros" }
+libm-test = { path = "libm-test", default-features = false }
+libtest-mimic = "0.8.1"
+musl-math-sys = { path = "crates/musl-math-sys" }
+no-panic = "0.1.35"
+object = { version = "0.37.3", features = ["wasm"] }
+panic-handler = { path = "crates/panic-handler" }
+paste = "1.0.15"
+proc-macro2 = "1.0.106"
+quote = "1.0.44"
+rand = "0.9.2"
+rand_chacha = "0.9.0"
+rand_xoshiro = "0.7"
+rayon = "1.11.0"
+regex = "1.12.3"
+rug = { version = "1.28.1", default-features = false, features = ["float", "integer", "std"] }
+rustc_apfloat = "0.2.3"
+serde_json = "1.0.149"
+syn = "2.0.114"
+tempfile = "3.24.0"
+
 [profile.release]
 panic = "abort"
 
@@ -51,6 +84,7 @@ codegen-units = 1
 lto = "fat"
 
 [profile.bench]
+codegen-units = 1
 # Required for gungraun
 debug = true
 strip = false

library/compiler-builtins/builtins-shim/Cargo.toml

@@ -7,6 +7,9 @@
 # manifest that is identical except for the `core` dependency and forwards
 # to the same sources, which acts as the `compiler-builtins` Cargo entrypoint
 # for out of tree testing
+#
+# Ideally we can eventually replace this with a patch in the workspace
+# manifest <https://github.com/rust-lang/cargo/issues/4648>.
 
 [package]
 name = "compiler_builtins"
@@ -33,7 +36,7 @@ doctest = false
 test = false
 
 [build-dependencies]
-cc = { optional = true, version = "1.2" }
+cc = { version = "1.2", optional = true }
 
 [features]
 default = ["compiler-builtins"]

library/compiler-builtins/builtins-test/Cargo.toml

@@ -6,23 +6,22 @@ publish = false
 license = "MIT AND Apache-2.0 WITH LLVM-exception AND (MIT OR Apache-2.0)"
 
 [dependencies]
+compiler_builtins = { workspace = true, features = ["unstable-public-internals"] }
+
 # For fuzzing tests we want a deterministic seedable RNG. We also eliminate potential
 # problems with system RNGs on the variety of platforms this crate is tested on.
 # `xoshiro128**` is used for its quality, size, and speed at generating `u32` shift amounts.
-rand_xoshiro = "0.7"
+rand_xoshiro.workspace = true
+
 # To compare float builtins against
-rustc_apfloat = "0.2.3"
-# Really a dev dependency, but dev dependencies can't be optional
-gungraun = { version = "0.17.0", optional = true }
+rustc_apfloat.workspace = true
 
-[dependencies.compiler_builtins]
-path = "../builtins-shim"
-default-features = false
-features = ["unstable-public-internals"]
+# Really a dev dependency, but dev dependencies can't be optional
+gungraun = { workspace = true, optional = true }
 
 [dev-dependencies]
-criterion = { version = "0.6.0", default-features = false, features = ["cargo_bench_support"] }
-paste = "1.0.15"
+criterion.workspace = true
+paste.workspace = true
 
 [target.'cfg(all(target_arch = "arm", not(any(target_env = "gnu", target_env = "musl")), target_os = "linux"))'.dev-dependencies]
 test = { git = "https://github.com/japaric/utest" }

library/compiler-builtins/ci/docker/aarch64-unknown-linux-gnu/Dockerfile

@@ -1,15 +1,15 @@
-ARG IMAGE=ubuntu:25.04
+ARG IMAGE=ubuntu:25.10
 FROM $IMAGE
 
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
     gcc libc6-dev ca-certificates \
     gcc-aarch64-linux-gnu m4 make libc6-dev-arm64-cross \
-    qemu-user-static
+    qemu-user
 
 ENV TOOLCHAIN_PREFIX=aarch64-linux-gnu-
 ENV CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER="$TOOLCHAIN_PREFIX"gcc \
-    CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_RUNNER=qemu-aarch64-static \
+    CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_RUNNER=qemu-aarch64 \
     AR_aarch64_unknown_linux_gnu="$TOOLCHAIN_PREFIX"ar \
     CC_aarch64_unknown_linux_gnu="$TOOLCHAIN_PREFIX"gcc \
     QEMU_LD_PREFIX=/usr/aarch64-linux-gnu \

library/compiler-builtins/ci/docker/arm-unknown-linux-gnueabi/Dockerfile

@@ -1,14 +1,14 @@
-ARG IMAGE=ubuntu:25.04
+ARG IMAGE=ubuntu:25.10
 FROM $IMAGE
 
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
     gcc libc6-dev ca-certificates \
-    gcc-arm-linux-gnueabi libc6-dev-armel-cross qemu-user-static
+    gcc-arm-linux-gnueabi libc6-dev-armel-cross qemu-user
 
 ENV TOOLCHAIN_PREFIX=arm-linux-gnueabi-
 ENV CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABI_LINKER="$TOOLCHAIN_PREFIX"gcc \
-    CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABI_RUNNER=qemu-arm-static \
+    CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABI_RUNNER=qemu-arm \
     AR_arm_unknown_linux_gnueabi="$TOOLCHAIN_PREFIX"ar \
     CC_arm_unknown_linux_gnueabi="$TOOLCHAIN_PREFIX"gcc \
     QEMU_LD_PREFIX=/usr/arm-linux-gnueabi \

library/compiler-builtins/ci/docker/arm-unknown-linux-gnueabihf/Dockerfile

@@ -1,14 +1,14 @@
-ARG IMAGE=ubuntu:25.04
+ARG IMAGE=ubuntu:25.10
 FROM $IMAGE
 
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
     gcc libc6-dev ca-certificates \
-    gcc-arm-linux-gnueabihf libc6-dev-armhf-cross qemu-user-static
+    gcc-arm-linux-gnueabihf libc6-dev-armhf-cross qemu-user
 
 ENV TOOLCHAIN_PREFIX=arm-linux-gnueabihf-
 ENV CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABIHF_LINKER="$TOOLCHAIN_PREFIX"gcc \
-    CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABIHF_RUNNER=qemu-arm-static \
+    CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABIHF_RUNNER=qemu-arm \
     AR_arm_unknown_linux_gnueabihf="$TOOLCHAIN_PREFIX"ar \
     CC_arm_unknown_linux_gnueabihf="$TOOLCHAIN_PREFIX"gcc \
     QEMU_LD_PREFIX=/usr/arm-linux-gnueabihf \

library/compiler-builtins/ci/docker/armv7-unknown-linux-gnueabihf/Dockerfile

@@ -1,14 +1,14 @@
-ARG IMAGE=ubuntu:25.04
+ARG IMAGE=ubuntu:25.10
 FROM $IMAGE
 
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
     gcc libc6-dev ca-certificates \
-    gcc-arm-linux-gnueabihf libc6-dev-armhf-cross qemu-user-static
+    gcc-arm-linux-gnueabihf libc6-dev-armhf-cross qemu-user
 
 ENV TOOLCHAIN_PREFIX=arm-linux-gnueabihf-
 ENV CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_LINKER="$TOOLCHAIN_PREFIX"gcc \
-    CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_RUNNER=qemu-arm-static \
+    CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_RUNNER=qemu-arm \
     AR_armv7_unknown_linux_gnueabihf="$TOOLCHAIN_PREFIX"ar \
     CC_armv7_unknown_linux_gnueabihf="$TOOLCHAIN_PREFIX"gcc \
     QEMU_LD_PREFIX=/usr/arm-linux-gnueabihf \

library/compiler-builtins/ci/docker/i586-unknown-linux-gnu/Dockerfile

@@ -1,4 +1,4 @@
-ARG IMAGE=ubuntu:25.04
+ARG IMAGE=ubuntu:25.10
 FROM $IMAGE
 
 RUN apt-get update && \