.fmf/version

@@ -0,0 +1 @@
+1

.gitignore

@@ -1,2 +1,459 @@
-SOURCES/rustc-1.84.1-src.tar.xz
+/rustc-1.10.0-src.tar.gz
-SOURCES/wasi-libc-wasi-sdk-25.tar.gz
+/rustc-1.9.0-i686-unknown-linux-gnu.tar.gz
+/rustc-1.9.0-x86_64-unknown-linux-gnu.tar.gz
+/rustc-1.11.0-src.tar.gz
+/rustc-1.10.0-i686-unknown-linux-gnu.tar.gz
+/rustc-1.10.0-x86_64-unknown-linux-gnu.tar.gz
+/rustc-1.10.0-armv7-unknown-linux-gnueabihf.tar.gz
+/rustc-1.11.0-aarch64-unknown-linux-gnu.tar.gz
+/rustc-1.11.0-armv7-unknown-linux-gnueabihf.tar.gz
+/rustc-1.11.0-i686-unknown-linux-gnu.tar.gz
+/rustc-1.11.0-x86_64-unknown-linux-gnu.tar.gz
+/rustc-1.12.0-src.tar.gz
+/rustc-1.12.1-src.tar.gz
+/rustc-1.13.0-src.tar.gz
+/rustc-1.12.1-aarch64-unknown-linux-gnu.tar.gz
+/rustc-1.12.1-armv7-unknown-linux-gnueabihf.tar.gz
+/rustc-1.12.1-i686-unknown-linux-gnu.tar.gz
+/rustc-1.12.1-x86_64-unknown-linux-gnu.tar.gz
+/rustc-beta-src.tar.gz
+/rustc-1.13.0-aarch64-unknown-linux-gnu.tar.gz
+/rustc-1.13.0-armv7-unknown-linux-gnueabihf.tar.gz
+/rustc-1.13.0-i686-unknown-linux-gnu.tar.gz
+/rustc-1.13.0-powerpc64le-unknown-linux-gnu.tar.gz
+/rustc-1.13.0-powerpc64-unknown-linux-gnu.tar.gz
+/rustc-1.13.0-s390x-unknown-linux-gnu.tar.gz
+/rustc-1.13.0-x86_64-unknown-linux-gnu.tar.gz
+/rustc-1.14.0-src.tar.gz
+/rustc-1.15.1-src.tar.gz
+/rustc-1.14.0-aarch64-unknown-linux-gnu.tar.gz
+/rustc-1.14.0-armv7-unknown-linux-gnueabihf.tar.gz
+/rustc-1.14.0-i686-unknown-linux-gnu.tar.gz
+/rustc-1.14.0-powerpc64le-unknown-linux-gnu.tar.gz
+/rustc-1.14.0-powerpc64-unknown-linux-gnu.tar.gz
+/rustc-1.14.0-s390x-unknown-linux-gnu.tar.gz
+/rustc-1.14.0-x86_64-unknown-linux-gnu.tar.gz
+/rust-1.15.1-aarch64-unknown-linux-gnu.tar.gz
+/rust-1.15.1-armv7-unknown-linux-gnueabihf.tar.gz
+/rust-1.15.1-i686-unknown-linux-gnu.tar.gz
+/rust-1.15.1-powerpc64le-unknown-linux-gnu.tar.gz
+/rust-1.15.1-powerpc64-unknown-linux-gnu.tar.gz
+/rust-1.15.1-s390x-unknown-linux-gnu.tar.gz
+/rust-1.15.1-x86_64-unknown-linux-gnu.tar.gz
+/rustc-1.16.0-src.tar.gz
+/rustc-1.17.0-src.tar.gz
+/rust-1.16.0-aarch64-unknown-linux-gnu.tar.gz
+/rust-1.16.0-armv7-unknown-linux-gnueabihf.tar.gz
+/rust-1.16.0-i686-unknown-linux-gnu.tar.gz
+/rust-1.16.0-powerpc64le-unknown-linux-gnu.tar.gz
+/rust-1.16.0-powerpc64-unknown-linux-gnu.tar.gz
+/rust-1.16.0-s390x-unknown-linux-gnu.tar.gz
+/rust-1.16.0-x86_64-unknown-linux-gnu.tar.gz
+/rustc-1.18.0-src.tar.gz
+/rust-1.17.0-aarch64-unknown-linux-gnu.tar.gz
+/rust-1.17.0-armv7-unknown-linux-gnueabihf.tar.gz
+/rust-1.17.0-i686-unknown-linux-gnu.tar.gz
+/rust-1.17.0-powerpc64le-unknown-linux-gnu.tar.gz
+/rust-1.17.0-powerpc64-unknown-linux-gnu.tar.gz
+/rust-1.17.0-s390x-unknown-linux-gnu.tar.gz
+/rust-1.17.0-x86_64-unknown-linux-gnu.tar.gz
+/rustc-1.19.0-src.tar.xz
+/rust-1.18.0-aarch64-unknown-linux-gnu.tar.gz
+/rust-1.18.0-armv7-unknown-linux-gnueabihf.tar.gz
+/rust-1.18.0-i686-unknown-linux-gnu.tar.gz
+/rust-1.18.0-powerpc64le-unknown-linux-gnu.tar.gz
+/rust-1.18.0-powerpc64-unknown-linux-gnu.tar.gz
+/rust-1.18.0-s390x-unknown-linux-gnu.tar.gz
+/rust-1.18.0-x86_64-unknown-linux-gnu.tar.gz
+/rustc-1.20.0-src.tar.xz
+/rust-1.19.0-aarch64-unknown-linux-gnu.tar.xz
+/rust-1.19.0-armv7-unknown-linux-gnueabihf.tar.xz
+/rust-1.19.0-i686-unknown-linux-gnu.tar.xz
+/rust-1.19.0-powerpc64le-unknown-linux-gnu.tar.xz
+/rust-1.19.0-powerpc64-unknown-linux-gnu.tar.xz
+/rust-1.19.0-s390x-unknown-linux-gnu.tar.xz
+/rust-1.19.0-x86_64-unknown-linux-gnu.tar.xz
+/rustc-1.21.0-src.tar.xz
+/rust-1.20.0-aarch64-unknown-linux-gnu.tar.xz
+/rust-1.20.0-armv7-unknown-linux-gnueabihf.tar.xz
+/rust-1.20.0-i686-unknown-linux-gnu.tar.xz
+/rust-1.20.0-powerpc64le-unknown-linux-gnu.tar.xz
+/rust-1.20.0-powerpc64-unknown-linux-gnu.tar.xz
+/rust-1.20.0-s390x-unknown-linux-gnu.tar.xz
+/rust-1.20.0-x86_64-unknown-linux-gnu.tar.xz
+/rustc-1.22.1-src.tar.xz
+/rust-1.21.0-aarch64-unknown-linux-gnu.tar.xz
+/rust-1.21.0-armv7-unknown-linux-gnueabihf.tar.xz
+/rust-1.21.0-i686-unknown-linux-gnu.tar.xz
+/rust-1.21.0-powerpc64le-unknown-linux-gnu.tar.xz
+/rust-1.21.0-powerpc64-unknown-linux-gnu.tar.xz
+/rust-1.21.0-s390x-unknown-linux-gnu.tar.xz
+/rust-1.21.0-x86_64-unknown-linux-gnu.tar.xz
+/rustc-1.23.0-src.tar.xz
+/rust-1.22.0-aarch64-unknown-linux-gnu.tar.xz
+/rust-1.22.0-armv7-unknown-linux-gnueabihf.tar.xz
+/rust-1.22.0-i686-unknown-linux-gnu.tar.xz
+/rust-1.22.0-powerpc64le-unknown-linux-gnu.tar.xz
+/rust-1.22.0-powerpc64-unknown-linux-gnu.tar.xz
+/rust-1.22.0-s390x-unknown-linux-gnu.tar.xz
+/rust-1.22.0-x86_64-unknown-linux-gnu.tar.xz
+/rustc-1.24.0-src.tar.xz
+/rust-1.23.0-aarch64-unknown-linux-gnu.tar.xz
+/rust-1.23.0-armv7-unknown-linux-gnueabihf.tar.xz
+/rust-1.23.0-i686-unknown-linux-gnu.tar.xz
+/rust-1.23.0-powerpc64le-unknown-linux-gnu.tar.xz
+/rust-1.23.0-powerpc64-unknown-linux-gnu.tar.xz
+/rust-1.23.0-s390x-unknown-linux-gnu.tar.xz
+/rust-1.23.0-x86_64-unknown-linux-gnu.tar.xz
+/rustc-1.24.1-src.tar.xz
+/rustc-1.25.0-src.tar.xz
+/rust-1.24.0-aarch64-unknown-linux-gnu.tar.xz
+/rust-1.24.0-armv7-unknown-linux-gnueabihf.tar.xz
+/rust-1.24.0-i686-unknown-linux-gnu.tar.xz
+/rust-1.24.0-powerpc64le-unknown-linux-gnu.tar.xz
+/rust-1.24.0-powerpc64-unknown-linux-gnu.tar.xz
+/rust-1.24.0-s390x-unknown-linux-gnu.tar.xz
+/rust-1.24.0-x86_64-unknown-linux-gnu.tar.xz
+/rustc-1.26.0-src.tar.xz
+/rust-1.25.0-aarch64-unknown-linux-gnu.tar.xz
+/rust-1.25.0-armv7-unknown-linux-gnueabihf.tar.xz
+/rust-1.25.0-i686-unknown-linux-gnu.tar.xz
+/rust-1.25.0-powerpc64le-unknown-linux-gnu.tar.xz
+/rust-1.25.0-powerpc64-unknown-linux-gnu.tar.xz
+/rust-1.25.0-s390x-unknown-linux-gnu.tar.xz
+/rust-1.25.0-x86_64-unknown-linux-gnu.tar.xz
+/rustc-1.26.1-src.tar.xz
+/rustc-1.26.2-src.tar.xz
+/rustc-1.27.0-src.tar.xz
+/rust-1.26.0-aarch64-unknown-linux-gnu.tar.xz
+/rust-1.26.0-armv7-unknown-linux-gnueabihf.tar.xz
+/rust-1.26.0-i686-unknown-linux-gnu.tar.xz
+/rust-1.26.0-powerpc64le-unknown-linux-gnu.tar.xz
+/rust-1.26.0-powerpc64-unknown-linux-gnu.tar.xz
+/rust-1.26.0-s390x-unknown-linux-gnu.tar.xz
+/rust-1.26.0-x86_64-unknown-linux-gnu.tar.xz
+/rustc-1.27.1-src.tar.xz
+/rustc-1.27.2-src.tar.xz
+/rustc-1.28.0-src.tar.xz
+/rust-1.27.2-aarch64-unknown-linux-gnu.tar.xz
+/rust-1.27.2-armv7-unknown-linux-gnueabihf.tar.xz
+/rust-1.27.2-i686-unknown-linux-gnu.tar.xz
+/rust-1.27.2-powerpc64le-unknown-linux-gnu.tar.xz
+/rust-1.27.2-powerpc64-unknown-linux-gnu.tar.xz
+/rust-1.27.2-s390x-unknown-linux-gnu.tar.xz
+/rust-1.27.2-x86_64-unknown-linux-gnu.tar.xz
+/rustc-1.29.0-src.tar.xz
+/rust-1.28.0-aarch64-unknown-linux-gnu.tar.xz
+/rust-1.28.0-armv7-unknown-linux-gnueabihf.tar.xz
+/rust-1.28.0-i686-unknown-linux-gnu.tar.xz
+/rust-1.28.0-powerpc64le-unknown-linux-gnu.tar.xz
+/rust-1.28.0-powerpc64-unknown-linux-gnu.tar.xz
+/rust-1.28.0-s390x-unknown-linux-gnu.tar.xz
+/rust-1.28.0-x86_64-unknown-linux-gnu.tar.xz
+/rustc-1.29.1-src.tar.xz
+/rustc-1.29.2-src.tar.xz
+/rustc-1.30.0-src.tar.xz
+/rust-1.29.2-aarch64-unknown-linux-gnu.tar.xz
+/rust-1.29.2-armv7-unknown-linux-gnueabihf.tar.xz
+/rust-1.29.2-i686-unknown-linux-gnu.tar.xz
+/rust-1.29.2-powerpc64le-unknown-linux-gnu.tar.xz
+/rust-1.29.2-powerpc64-unknown-linux-gnu.tar.xz
+/rust-1.29.2-s390x-unknown-linux-gnu.tar.xz
+/rust-1.29.2-x86_64-unknown-linux-gnu.tar.xz
+/rustc-1.30.1-src.tar.xz
+/rustc-1.31.0-src.tar.xz
+/rust-1.30.0-aarch64-unknown-linux-gnu.tar.xz
+/rust-1.30.0-armv7-unknown-linux-gnueabihf.tar.xz
+/rust-1.30.0-i686-unknown-linux-gnu.tar.xz
+/rust-1.30.0-powerpc64le-unknown-linux-gnu.tar.xz
+/rust-1.30.0-powerpc64-unknown-linux-gnu.tar.xz
+/rust-1.30.0-s390x-unknown-linux-gnu.tar.xz
+/rust-1.30.0-x86_64-unknown-linux-gnu.tar.xz
+/rustc-1.31.1-src.tar.xz
+/rustc-1.32.0-src.tar.xz
+/rust-1.31.1-aarch64-unknown-linux-gnu.tar.xz
+/rust-1.31.1-armv7-unknown-linux-gnueabihf.tar.xz
+/rust-1.31.1-i686-unknown-linux-gnu.tar.xz
+/rust-1.31.1-powerpc64le-unknown-linux-gnu.tar.xz
+/rust-1.31.1-powerpc64-unknown-linux-gnu.tar.xz
+/rust-1.31.1-s390x-unknown-linux-gnu.tar.xz
+/rust-1.31.1-x86_64-unknown-linux-gnu.tar.xz
+/rustc-1.33.0-src.tar.xz
+/rust-1.32.0-aarch64-unknown-linux-gnu.tar.xz
+/rust-1.32.0-armv7-unknown-linux-gnueabihf.tar.xz
+/rust-1.32.0-i686-unknown-linux-gnu.tar.xz
+/rust-1.32.0-powerpc64le-unknown-linux-gnu.tar.xz
+/rust-1.32.0-powerpc64-unknown-linux-gnu.tar.xz
+/rust-1.32.0-s390x-unknown-linux-gnu.tar.xz
+/rust-1.32.0-x86_64-unknown-linux-gnu.tar.xz
+/rustc-1.34.0-src.tar.xz
+/rust-1.33.0-aarch64-unknown-linux-gnu.tar.xz
+/rust-1.33.0-armv7-unknown-linux-gnueabihf.tar.xz
+/rust-1.33.0-i686-unknown-linux-gnu.tar.xz
+/rust-1.33.0-powerpc64le-unknown-linux-gnu.tar.xz
+/rust-1.33.0-powerpc64-unknown-linux-gnu.tar.xz
+/rust-1.33.0-s390x-unknown-linux-gnu.tar.xz
+/rust-1.33.0-x86_64-unknown-linux-gnu.tar.xz
+/rustc-1.34.1-src.tar.xz
+/rustc-1.34.2-src.tar.xz
+/rustc-1.35.0-src.tar.xz
+/rust-1.34.2-aarch64-unknown-linux-gnu.tar.xz
+/rust-1.34.2-armv7-unknown-linux-gnueabihf.tar.xz
+/rust-1.34.2-i686-unknown-linux-gnu.tar.xz
+/rust-1.34.2-powerpc64le-unknown-linux-gnu.tar.xz
+/rust-1.34.2-powerpc64-unknown-linux-gnu.tar.xz
+/rust-1.34.2-s390x-unknown-linux-gnu.tar.xz
+/rust-1.34.2-x86_64-unknown-linux-gnu.tar.xz
+/rustc-1.36.0-src.tar.xz
+/rust-1.35.0-aarch64-unknown-linux-gnu.tar.xz
+/rust-1.35.0-armv7-unknown-linux-gnueabihf.tar.xz
+/rust-1.35.0-i686-unknown-linux-gnu.tar.xz
+/rust-1.35.0-powerpc64le-unknown-linux-gnu.tar.xz
+/rust-1.35.0-powerpc64-unknown-linux-gnu.tar.xz
+/rust-1.35.0-s390x-unknown-linux-gnu.tar.xz
+/rust-1.35.0-x86_64-unknown-linux-gnu.tar.xz
+/rustc-1.37.0-src.tar.xz
+/rust-1.36.0-aarch64-unknown-linux-gnu.tar.xz
+/rust-1.36.0-armv7-unknown-linux-gnueabihf.tar.xz
+/rust-1.36.0-i686-unknown-linux-gnu.tar.xz
+/rust-1.36.0-powerpc64le-unknown-linux-gnu.tar.xz
+/rust-1.36.0-powerpc64-unknown-linux-gnu.tar.xz
+/rust-1.36.0-s390x-unknown-linux-gnu.tar.xz
+/rust-1.36.0-x86_64-unknown-linux-gnu.tar.xz
+/rustc-1.38.0-src.tar.xz
+/rust-1.37.0-aarch64-unknown-linux-gnu.tar.xz
+/rust-1.37.0-armv7-unknown-linux-gnueabihf.tar.xz
+/rust-1.37.0-i686-unknown-linux-gnu.tar.xz
+/rust-1.37.0-powerpc64le-unknown-linux-gnu.tar.xz
+/rust-1.37.0-powerpc64-unknown-linux-gnu.tar.xz
+/rust-1.37.0-s390x-unknown-linux-gnu.tar.xz
+/rust-1.37.0-x86_64-unknown-linux-gnu.tar.xz
+/rustc-1.39.0-src.tar.xz
+/rust-1.38.0-aarch64-unknown-linux-gnu.tar.xz
+/rust-1.38.0-armv7-unknown-linux-gnueabihf.tar.xz
+/rust-1.38.0-i686-unknown-linux-gnu.tar.xz
+/rust-1.38.0-powerpc64le-unknown-linux-gnu.tar.xz
+/rust-1.38.0-powerpc64-unknown-linux-gnu.tar.xz
+/rust-1.38.0-s390x-unknown-linux-gnu.tar.xz
+/rust-1.38.0-x86_64-unknown-linux-gnu.tar.xz
+/rustc-1.40.0-src.tar.xz
+/rust-1.39.0-aarch64-unknown-linux-gnu.tar.xz
+/rust-1.39.0-armv7-unknown-linux-gnueabihf.tar.xz
+/rust-1.39.0-i686-unknown-linux-gnu.tar.xz
+/rust-1.39.0-powerpc64le-unknown-linux-gnu.tar.xz
+/rust-1.39.0-powerpc64-unknown-linux-gnu.tar.xz
+/rust-1.39.0-s390x-unknown-linux-gnu.tar.xz
+/rust-1.39.0-x86_64-unknown-linux-gnu.tar.xz
+/rustc-1.41.0-src.tar.xz
+/rust-1.40.0-aarch64-unknown-linux-gnu.tar.xz
+/rust-1.40.0-armv7-unknown-linux-gnueabihf.tar.xz
+/rust-1.40.0-i686-unknown-linux-gnu.tar.xz
+/rust-1.40.0-powerpc64le-unknown-linux-gnu.tar.xz
+/rust-1.40.0-powerpc64-unknown-linux-gnu.tar.xz
+/rust-1.40.0-s390x-unknown-linux-gnu.tar.xz
+/rust-1.40.0-x86_64-unknown-linux-gnu.tar.xz
+/rustc-1.41.1-src.tar.xz
+/rustc-1.42.0-src.tar.xz
+/rust-1.41.1-aarch64-unknown-linux-gnu.tar.xz
+/rust-1.41.1-armv7-unknown-linux-gnueabihf.tar.xz
+/rust-1.41.1-i686-unknown-linux-gnu.tar.xz
+/rust-1.41.1-powerpc64le-unknown-linux-gnu.tar.xz
+/rust-1.41.1-powerpc64-unknown-linux-gnu.tar.xz
+/rust-1.41.1-s390x-unknown-linux-gnu.tar.xz
+/rust-1.41.1-x86_64-unknown-linux-gnu.tar.xz
+/rustc-1.43.0-src.tar.xz
+/rust-1.42.0-aarch64-unknown-linux-gnu.tar.xz
+/rust-1.42.0-armv7-unknown-linux-gnueabihf.tar.xz
+/rust-1.42.0-i686-unknown-linux-gnu.tar.xz
+/rust-1.42.0-powerpc64le-unknown-linux-gnu.tar.xz
+/rust-1.42.0-powerpc64-unknown-linux-gnu.tar.xz
+/rust-1.42.0-s390x-unknown-linux-gnu.tar.xz
+/rust-1.42.0-x86_64-unknown-linux-gnu.tar.xz
+/rustc-1.43.1-src.tar.xz
+/rustc-1.44.0-src.tar.xz
+/rust-1.43.1-aarch64-unknown-linux-gnu.tar.xz
+/rust-1.43.1-armv7-unknown-linux-gnueabihf.tar.xz
+/rust-1.43.1-i686-unknown-linux-gnu.tar.xz
+/rust-1.43.1-powerpc64le-unknown-linux-gnu.tar.xz
+/rust-1.43.1-powerpc64-unknown-linux-gnu.tar.xz
+/rust-1.43.1-s390x-unknown-linux-gnu.tar.xz
+/rust-1.43.1-x86_64-unknown-linux-gnu.tar.xz
+/rustc-1.44.1-src.tar.xz
+/rustc-1.45.0-src.tar.xz
+/rust-1.44.0-x86_64-unknown-linux-gnu.tar.xz
+/rust-1.44.0-i686-unknown-linux-gnu.tar.xz
+/rust-1.44.0-armv7-unknown-linux-gnueabihf.tar.xz
+/rust-1.44.0-aarch64-unknown-linux-gnu.tar.xz
+/rust-1.44.0-powerpc64-unknown-linux-gnu.tar.xz
+/rust-1.44.0-powerpc64le-unknown-linux-gnu.tar.xz
+/rust-1.44.0-s390x-unknown-linux-gnu.tar.xz
+/rustc-1.45.1-src.tar.xz
+/rustc-1.45.2-src.tar.xz
+/rustc-1.46.0-src.tar.xz
+/rust-1.45.2-aarch64-unknown-linux-gnu.tar.xz
+/rust-1.45.2-armv7-unknown-linux-gnueabihf.tar.xz
+/rust-1.45.2-i686-unknown-linux-gnu.tar.xz
+/rust-1.45.2-powerpc64le-unknown-linux-gnu.tar.xz
+/rust-1.45.2-powerpc64-unknown-linux-gnu.tar.xz
+/rust-1.45.2-s390x-unknown-linux-gnu.tar.xz
+/rust-1.45.2-x86_64-unknown-linux-gnu.tar.xz
+/rustc-1.47.0-src.tar.xz
+/rust-1.46.0-aarch64-unknown-linux-gnu.tar.xz
+/rust-1.46.0-armv7-unknown-linux-gnueabihf.tar.xz
+/rust-1.46.0-i686-unknown-linux-gnu.tar.xz
+/rust-1.46.0-powerpc64le-unknown-linux-gnu.tar.xz
+/rust-1.46.0-powerpc64-unknown-linux-gnu.tar.xz
+/rust-1.46.0-s390x-unknown-linux-gnu.tar.xz
+/rust-1.46.0-x86_64-unknown-linux-gnu.tar.xz
+/rustc-1.48.0-src.tar.xz
+/rust-1.47.0-aarch64-unknown-linux-gnu.tar.xz
+/rust-1.47.0-armv7-unknown-linux-gnueabihf.tar.xz
+/rust-1.47.0-i686-unknown-linux-gnu.tar.xz
+/rust-1.47.0-powerpc64le-unknown-linux-gnu.tar.xz
+/rust-1.47.0-powerpc64-unknown-linux-gnu.tar.xz
+/rust-1.47.0-s390x-unknown-linux-gnu.tar.xz
+/rust-1.47.0-x86_64-unknown-linux-gnu.tar.xz
+/rustc-1.49.0-src.tar.xz
+/rust-1.48.0-aarch64-unknown-linux-gnu.tar.xz
+/rust-1.48.0-armv7-unknown-linux-gnueabihf.tar.xz
+/rust-1.48.0-i686-unknown-linux-gnu.tar.xz
+/rust-1.48.0-powerpc64le-unknown-linux-gnu.tar.xz
+/rust-1.48.0-powerpc64-unknown-linux-gnu.tar.xz
+/rust-1.48.0-s390x-unknown-linux-gnu.tar.xz
+/rust-1.48.0-x86_64-unknown-linux-gnu.tar.xz
+/rustc-1.50.0-src.tar.xz
+/rust-1.49.0-aarch64-unknown-linux-gnu.tar.xz
+/rust-1.49.0-armv7-unknown-linux-gnueabihf.tar.xz
+/rust-1.49.0-i686-unknown-linux-gnu.tar.xz
+/rust-1.49.0-powerpc64le-unknown-linux-gnu.tar.xz
+/rust-1.49.0-s390x-unknown-linux-gnu.tar.xz
+/rust-1.49.0-x86_64-unknown-linux-gnu.tar.xz
+/rustc-1.51.0-src.tar.xz
+/rust-1.50.0-aarch64-unknown-linux-gnu.tar.xz
+/rust-1.50.0-armv7-unknown-linux-gnueabihf.tar.xz
+/rust-1.50.0-i686-unknown-linux-gnu.tar.xz
+/rust-1.50.0-powerpc64le-unknown-linux-gnu.tar.xz
+/rust-1.50.0-s390x-unknown-linux-gnu.tar.xz
+/rust-1.50.0-x86_64-unknown-linux-gnu.tar.xz
+/rustc-1.52.0-src.tar.xz
+/rust-1.51.0-aarch64-unknown-linux-gnu.tar.xz
+/rust-1.51.0-armv7-unknown-linux-gnueabihf.tar.xz
+/rust-1.51.0-i686-unknown-linux-gnu.tar.xz
+/rust-1.51.0-powerpc64le-unknown-linux-gnu.tar.xz
+/rust-1.51.0-s390x-unknown-linux-gnu.tar.xz
+/rust-1.51.0-x86_64-unknown-linux-gnu.tar.xz
+/rustc-1.52.1-src.tar.xz
+/rustc-1.53.0-src.tar.xz
+/rust-1.52.0-aarch64-unknown-linux-gnu.tar.xz
+/rust-1.52.0-armv7-unknown-linux-gnueabihf.tar.xz
+/rust-1.52.0-i686-unknown-linux-gnu.tar.xz
+/rust-1.52.0-powerpc64le-unknown-linux-gnu.tar.xz
+/rust-1.52.0-s390x-unknown-linux-gnu.tar.xz
+/rust-1.52.0-x86_64-unknown-linux-gnu.tar.xz
+/rustc-1.54.0-src.tar.xz
+/rust-1.53.0-aarch64-unknown-linux-gnu.tar.xz
+/rust-1.53.0-armv7-unknown-linux-gnueabihf.tar.xz
+/rust-1.53.0-i686-unknown-linux-gnu.tar.xz
+/rust-1.53.0-powerpc64le-unknown-linux-gnu.tar.xz
+/rust-1.53.0-powerpc64-unknown-linux-gnu.tar.xz
+/rust-1.53.0-s390x-unknown-linux-gnu.tar.xz
+/rust-1.53.0-x86_64-unknown-linux-gnu.tar.xz
+/rustc-1.55.0-src.tar.xz
+/rust-1.54.0-aarch64-unknown-linux-gnu.tar.xz
+/rust-1.54.0-armv7-unknown-linux-gnueabihf.tar.xz
+/rust-1.54.0-i686-unknown-linux-gnu.tar.xz
+/rust-1.54.0-powerpc64le-unknown-linux-gnu.tar.xz
+/rust-1.54.0-powerpc64-unknown-linux-gnu.tar.xz
+/rust-1.54.0-s390x-unknown-linux-gnu.tar.xz
+/rust-1.54.0-x86_64-unknown-linux-gnu.tar.xz
+/rustc-1.56.0-src.tar.xz
+/rust-1.55.0-aarch64-unknown-linux-gnu.tar.xz
+/rust-1.55.0-armv7-unknown-linux-gnueabihf.tar.xz
+/rust-1.55.0-i686-unknown-linux-gnu.tar.xz
+/rust-1.55.0-powerpc64-unknown-linux-gnu.tar.xz
+/rust-1.55.0-powerpc64le-unknown-linux-gnu.tar.xz
+/rust-1.55.0-s390x-unknown-linux-gnu.tar.xz
+/rust-1.55.0-x86_64-unknown-linux-gnu.tar.xz
+/rustc-1.56.1-src.tar.xz
+/rustc-1.57.0-src.tar.xz
+/wasi-libc-ad5133410f66b93a2381db5b542aad5e0964db96.tar.gz
+/rust-1.56.1-aarch64-unknown-linux-gnu.tar.xz
+/rust-1.56.1-armv7-unknown-linux-gnueabihf.tar.xz
+/rust-1.56.1-i686-unknown-linux-gnu.tar.xz
+/rust-1.56.1-powerpc64le-unknown-linux-gnu.tar.xz
+/rust-1.56.1-s390x-unknown-linux-gnu.tar.xz
+/rust-1.56.1-x86_64-unknown-linux-gnu.tar.xz
+/rustc-1.58.0-src.tar.xz
+/rust-1.57.0-aarch64-unknown-linux-gnu.tar.xz
+/rust-1.57.0-armv7-unknown-linux-gnueabihf.tar.xz
+/rust-1.57.0-i686-unknown-linux-gnu.tar.xz
+/rust-1.57.0-powerpc64le-unknown-linux-gnu.tar.xz
+/rust-1.57.0-s390x-unknown-linux-gnu.tar.xz
+/rust-1.57.0-x86_64-unknown-linux-gnu.tar.xz
+/rustc-1.58.1-src.tar.xz
+/rustc-1.59.0-src.tar.xz
+/rust-1.58.0-aarch64-unknown-linux-gnu.tar.xz
+/rust-1.58.0-armv7-unknown-linux-gnueabihf.tar.xz
+/rust-1.58.0-i686-unknown-linux-gnu.tar.xz
+/rust-1.58.0-powerpc64le-unknown-linux-gnu.tar.xz
+/rust-1.58.0-s390x-unknown-linux-gnu.tar.xz
+/rust-1.58.0-x86_64-unknown-linux-gnu.tar.xz
+/rustc-1.60.0-src.tar.xz
+/rustc-1.61.0-src.tar.xz
+/wasi-libc-9886d3d6200fcc3726329966860fc058707406cd.tar.gz
+/rustc-1.62.0-src.tar.xz
+/rustc-1.62.1-src.tar.xz
+/rustc-1.63.0-src.tar.xz
+/rustc-1.64.0-src.tar.xz
+/rustc-1.65.0-src.tar.xz
+/wasi-libc-wasi-sdk-16.tar.gz
+/rustc-1.66.0-src.tar.xz
+/wasi-libc-wasi-sdk-17.tar.gz
+/rustc-1.66.1-src.tar.xz
+/rustc-1.67.0-src.tar.xz
+/rustc-1.67.1-src.tar.xz
+/rustc-1.68.0-src.tar.xz
+/wasi-libc-wasi-sdk-19.tar.gz
+/rustc-1.68.1-src.tar.xz
+/rustc-1.68.2-src.tar.xz
+/rustc-1.69.0-src.tar.xz
+/wasi-libc-1dfe5c302d1c5ab621f7abf04620fae92700fd22.tar.gz
+/rustc-1.70.0-src.tar.xz
+/wasi-libc-wasi-sdk-20.tar.gz
+/rustc-1.71.0-src.tar.xz
+/rustc-1.71.1-src.tar.xz
+/rustc-1.72.0-src.tar.xz
+/wasi-libc-7018e24d8fe248596819d2e884761676f3542a04.tar.gz
+/rustc-1.72.1-src.tar.xz
+/wasi-libc-bd950eb128bff337153de217b11270f948d04bb4.tar.gz
+/rustc-1.73.0-src.tar.xz
+/rustc-1.74.0-src.tar.xz
+/rustc-1.74.1-src.tar.xz
+/rustc-1.75.0-src.tar.xz
+/rustc-1.76.0-src.tar.xz
+/wasi-libc-03b228e46bb02fcc5927253e1b8ad715072b1ae4.tar.gz
+/rustc-1.77.0-src.tar.xz
+/rustc-1.77.2-src.tar.xz
+/rustc-1.78.0-src.tar.xz
+/rustc-1.79.0-src.tar.xz
+/wasi-libc-wasi-sdk-22.tar.gz
+/rustc-1.80.0-src.tar.xz
+/rustc-1.80.1-src.tar.xz
+/wasi-libc-3f43ea9abb24ed8d24d760989e1d87ea385f8eaa.tar.gz
+/rustc-1.81.0-src.tar.xz
+/wasi-libc-b9ef79d7dbd47c6c5bafdae760823467c2f60b70.tar.gz
+/rustc-1.82.0-src.tar.xz
+/wasi-libc-wasi-sdk-24.tar.gz
+/rustc-1.83.0-src.tar.xz
+/rustc-1.84.0-src.tar.xz
+/wasi-libc-wasi-sdk-25.tar.gz
+/rustc-1.84.1-src.tar.xz
+/rustc-1.85.0-src.tar.xz
+/rustc-1.85.1-src.tar.xz
+/rustc-1.86.0-src.tar.xz
+/wasi-libc-640c0cfc19a96b099e0791824be5ef0105ce2084.tar.gz
+/rustc-1.87.0-src.tar.xz
+/rustc-1.88.0-src.tar.xz
+/wasi-libc-wasi-sdk-27.tar.gz
+/rustc-1.89.0-src.tar.xz
+/rustc-1.90.0-src.tar.xz

.rust.metadata

@@ -1,2 +0,0 @@
-787899153e848b012d8bbd6ec0baf0ed5e189831 SOURCES/rustc-1.84.1-src.tar.xz
-c42dc30854ecbce5380304c38bd48b5911d1ce62 SOURCES/wasi-libc-wasi-sdk-25.tar.gz

0001-Allow-linking-a-prebuilt-optimized-compiler-rt-built.patch

@@ -0,0 +1,278 @@
+From 4815c3cd733812bec777970ff4b1e73c2fcad1a6 Mon Sep 17 00:00:00 2001
+From: Paul Murphy <paumurph@redhat.com>
+Date: Tue, 24 Jun 2025 11:07:54 -0500
+Subject: [PATCH] Allow linking a prebuilt optimized compiler-rt builtins
+ library
+
+Extend the <target>.optimized-compiler-builtins bootstrap option to accept a
+path to a prebuilt compiler-rt builtins library, and update compiler-builtins
+to enable optimized builtins without building compiler-rt builtins.
+
+(cherry picked from commit b382478bba7b8f75c73673c239fa86a29db66223)
+---
+ bootstrap.example.toml                        |  4 +-
+ .../compiler-builtins/build.rs                | 55 ++++++++++++++++---
+ src/bootstrap/src/core/build_steps/compile.rs | 44 ++++++++-------
+ src/bootstrap/src/core/config/config.rs       | 10 +++-
+ src/bootstrap/src/core/config/tests.rs        |  4 +-
+ src/bootstrap/src/core/config/toml/target.rs  |  4 +-
+ 6 files changed, 87 insertions(+), 34 deletions(-)
+
+diff --git a/bootstrap.example.toml b/bootstrap.example.toml
+index 82041167b444..a11aec1b60e5 100644
+--- a/bootstrap.example.toml
++++ b/bootstrap.example.toml
+@@ -1038,7 +1038,9 @@
+ # sources are available.
+ #
+ # Setting this to `false` generates slower code, but removes the requirement for a C toolchain in
+-# order to run `x check`.
++# order to run `x check`. This may also be given a path to an existing build of the builtins
++# runtime library from LLVM's compiler-rt. This option will override the same option under [build]
++# section.
+ #optimized-compiler-builtins = build.optimized-compiler-builtins (bool)
+ 
+ # Link the compiler and LLVM against `jemalloc` instead of the default libc allocator.
+diff --git a/library/compiler-builtins/compiler-builtins/build.rs b/library/compiler-builtins/compiler-builtins/build.rs
+index 8f51c12b535d..b8de1789ebc7 100644
+--- a/library/compiler-builtins/compiler-builtins/build.rs
++++ b/library/compiler-builtins/compiler-builtins/build.rs
+@@ -547,12 +547,20 @@ pub fn compile(llvm_target: &[&str], target: &Target) {
+             sources.extend(&[("__emutls_get_address", "emutls.c")]);
+         }
+ 
++        // Optionally, link against a prebuilt llvm compiler-rt containing the builtins
++        // library. Only the builtins library is required. On many platforms, this is
++        // available as a library named libclang_rt.builtins.a.
++        let link_against_prebuilt_rt = env::var_os("LLVM_COMPILER_RT_LIB").is_some();
++
+         // When compiling the C code we require the user to tell us where the
+         // source code is, and this is largely done so when we're compiling as
+         // part of rust-lang/rust we can use the same llvm-project repository as
+         // rust-lang/rust.
+         let root = match env::var_os("RUST_COMPILER_RT_ROOT") {
+             Some(s) => PathBuf::from(s),
++            // If a prebuild libcompiler-rt is provided, set a valid
++            // path to simplify later logic. Nothing should be compiled.
++            None if link_against_prebuilt_rt => PathBuf::new(),
+             None => {
+                 panic!(
+                     "RUST_COMPILER_RT_ROOT is not set. You may need to run \
+@@ -560,7 +568,7 @@ pub fn compile(llvm_target: &[&str], target: &Target) {
+                 );
+             }
+         };
+-        if !root.exists() {
++        if !link_against_prebuilt_rt && !root.exists() {
+             panic!("RUST_COMPILER_RT_ROOT={} does not exist", root.display());
+         }
+ 
+@@ -576,7 +584,7 @@ pub fn compile(llvm_target: &[&str], target: &Target) {
+         let src_dir = root.join("lib/builtins");
+         if target.arch == "aarch64" && target.env != "msvc" && target.os != "uefi" {
+             // See below for why we're building these as separate libraries.
+-            build_aarch64_out_of_line_atomics_libraries(&src_dir, cfg);
++            build_aarch64_out_of_line_atomics_libraries(&src_dir, cfg, link_against_prebuilt_rt);
+ 
+             // Some run-time CPU feature detection is necessary, as well.
+             let cpu_model_src = if src_dir.join("cpu_model.c").exists() {
+@@ -590,20 +598,45 @@ pub fn compile(llvm_target: &[&str], target: &Target) {
+         let mut added_sources = HashSet::new();
+         for (sym, src) in sources.map.iter() {
+             let src = src_dir.join(src);
+-            if added_sources.insert(src.clone()) {
++            if !link_against_prebuilt_rt && added_sources.insert(src.clone()) {
+                 cfg.file(&src);
+                 println!("cargo:rerun-if-changed={}", src.display());
+             }
+             println!("cargo:rustc-cfg={}=\"optimized-c\"", sym);
+         }
+ 
+-        cfg.compile("libcompiler-rt.a");
++        if link_against_prebuilt_rt {
++            let rt_builtins_ext = PathBuf::from(env::var_os("LLVM_COMPILER_RT_LIB").unwrap());
++            if !rt_builtins_ext.exists() {
++                panic!(
++                    "LLVM_COMPILER_RT_LIB={} does not exist",
++                    rt_builtins_ext.display()
++                );
++            }
++            if let Some(dir) = rt_builtins_ext.parent() {
++                println!("cargo::rustc-link-search=native={}", dir.display());
++            }
++            if let Some(lib) = rt_builtins_ext.file_name() {
++                println!(
++                    "cargo::rustc-link-lib=static:+verbatim={}",
++                    lib.to_str().unwrap()
++                );
++            }
++        } else {
++            cfg.compile("libcompiler-rt.a");
++        }
+     }
+ 
+-    fn build_aarch64_out_of_line_atomics_libraries(builtins_dir: &Path, cfg: &mut cc::Build) {
++    fn build_aarch64_out_of_line_atomics_libraries(
++        builtins_dir: &Path,
++        cfg: &mut cc::Build,
++        link_against_prebuilt_rt: bool,
++    ) {
+         let out_dir = PathBuf::from(env::var("OUT_DIR").unwrap());
+         let outlined_atomics_file = builtins_dir.join("aarch64").join("lse.S");
+-        println!("cargo:rerun-if-changed={}", outlined_atomics_file.display());
++        if !link_against_prebuilt_rt {
++            println!("cargo:rerun-if-changed={}", outlined_atomics_file.display());
++        }
+ 
+         cfg.include(&builtins_dir);
+ 
+@@ -616,6 +649,13 @@ fn build_aarch64_out_of_line_atomics_libraries(builtins_dir: &Path, cfg: &mut cc
+                 for (model_number, model_name) in
+                     &[(1, "relax"), (2, "acq"), (3, "rel"), (4, "acq_rel")]
+                 {
++                    let sym = format!("__aarch64_{}{}_{}", instruction_type, size, model_name);
++                    println!("cargo:rustc-cfg={}=\"optimized-c\"", sym);
++
++                    if link_against_prebuilt_rt {
++                        continue;
++                    }
++
+                     // The original compiler-rt build system compiles the same
+                     // source file multiple times with different compiler
+                     // options. Here we do something slightly different: we
+@@ -639,9 +679,6 @@ fn build_aarch64_out_of_line_atomics_libraries(builtins_dir: &Path, cfg: &mut cc
+                     .unwrap();
+                     drop(file);
+                     cfg.file(path);
+-
+-                    let sym = format!("__aarch64_{}{}_{}", instruction_type, size, model_name);
+-                    println!("cargo:rustc-cfg={}=\"optimized-c\"", sym);
+                 }
+             }
+         }
+diff --git a/src/bootstrap/src/core/build_steps/compile.rs b/src/bootstrap/src/core/build_steps/compile.rs
+index 7a5533346adf..39c9db3d6c35 100644
+--- a/src/bootstrap/src/core/build_steps/compile.rs
++++ b/src/bootstrap/src/core/build_steps/compile.rs
+@@ -572,25 +572,31 @@ pub fn std_cargo(builder: &Builder<'_>, target: TargetSelection, stage: u32, car
+     // `compiler-builtins` crate is enabled and it's configured to learn where
+     // `compiler-rt` is located.
+     let compiler_builtins_c_feature = if builder.config.optimized_compiler_builtins(target) {
+-        // NOTE: this interacts strangely with `llvm-has-rust-patches`. In that case, we enforce `submodules = false`, so this is a no-op.
+-        // But, the user could still decide to manually use an in-tree submodule.
+-        //
+-        // NOTE: if we're using system llvm, we'll end up building a version of `compiler-rt` that doesn't match the LLVM we're linking to.
+-        // That's probably ok? At least, the difference wasn't enforced before. There's a comment in
+-        // the compiler_builtins build script that makes me nervous, though:
+-        // https://github.com/rust-lang/compiler-builtins/blob/31ee4544dbe47903ce771270d6e3bea8654e9e50/build.rs#L575-L579
+-        builder.require_submodule(
+-            "src/llvm-project",
+-            Some(
+-                "The `build.optimized-compiler-builtins` config option \
+-                 requires `compiler-rt` sources from LLVM.",
+-            ),
+-        );
+-        let compiler_builtins_root = builder.src.join("src/llvm-project/compiler-rt");
+-        assert!(compiler_builtins_root.exists());
+-        // The path to `compiler-rt` is also used by `profiler_builtins` (above),
+-        // so if you're changing something here please also change that as appropriate.
+-        cargo.env("RUST_COMPILER_RT_ROOT", &compiler_builtins_root);
++        if let Some(path) = builder.config.optimized_compiler_builtins_path(target) {
++            cargo.env("LLVM_COMPILER_RT_LIB", path);
++        } else {
++            // NOTE: this interacts strangely with `llvm-has-rust-patches`. In that case, we enforce
++            // `submodules = false`, so this is a no-op. But, the user could still decide to
++            //  manually use an in-tree submodule.
++            //
++            // NOTE: if we're using system llvm, we'll end up building a version of `compiler-rt`
++            // that doesn't match the LLVM we're linking to. That's probably ok? At least, the
++            // difference wasn't enforced before. There's a comment in the compiler_builtins build
++            // script that makes me nervous, though:
++            // https://github.com/rust-lang/compiler-builtins/blob/31ee4544dbe47903ce771270d6e3bea8654e9e50/build.rs#L575-L579
++            builder.require_submodule(
++                "src/llvm-project",
++                Some(
++                    "The `build.optimized-compiler-builtins` config option \
++                     requires `compiler-rt` sources from LLVM.",
++                ),
++            );
++            let compiler_builtins_root = builder.src.join("src/llvm-project/compiler-rt");
++            assert!(compiler_builtins_root.exists());
++            // The path to `compiler-rt` is also used by `profiler_builtins` (above),
++            // so if you're changing something here please also change that as appropriate.
++            cargo.env("RUST_COMPILER_RT_ROOT", &compiler_builtins_root);
++        }
+         " compiler-builtins-c"
+     } else {
+         ""
+diff --git a/src/bootstrap/src/core/config/config.rs b/src/bootstrap/src/core/config/config.rs
+index 6055876c4757..588c3489f898 100644
+--- a/src/bootstrap/src/core/config/config.rs
++++ b/src/bootstrap/src/core/config/config.rs
+@@ -1769,10 +1769,18 @@ pub fn rpath_enabled(&self, target: TargetSelection) -> bool {
+     pub fn optimized_compiler_builtins(&self, target: TargetSelection) -> bool {
+         self.target_config
+             .get(&target)
+-            .and_then(|t| t.optimized_compiler_builtins)
++            .and_then(|t| t.optimized_compiler_builtins.as_ref())
++            .map(StringOrBool::is_string_or_true)
+             .unwrap_or(self.optimized_compiler_builtins)
+     }
+ 
++    pub fn optimized_compiler_builtins_path(&self, target: TargetSelection) -> Option<&str> {
++        match self.target_config.get(&target)?.optimized_compiler_builtins.as_ref()? {
++            StringOrBool::String(s) => Some(s),
++            StringOrBool::Bool(_) => None,
++        }
++    }
++
+     pub fn llvm_enabled(&self, target: TargetSelection) -> bool {
+         self.codegen_backends(target).contains(&CodegenBackendKind::Llvm)
+     }
+diff --git a/src/bootstrap/src/core/config/tests.rs b/src/bootstrap/src/core/config/tests.rs
+index 50eba12aba74..c32e4384cf62 100644
+--- a/src/bootstrap/src/core/config/tests.rs
++++ b/src/bootstrap/src/core/config/tests.rs
+@@ -17,7 +17,7 @@
+ use crate::core::build_steps::llvm;
+ use crate::core::build_steps::llvm::LLVM_INVALIDATION_PATHS;
+ use crate::core::config::toml::TomlConfig;
+-use crate::core::config::{LldMode, Target, TargetSelection};
++use crate::core::config::{LldMode, StringOrBool, Target, TargetSelection};
+ use crate::utils::tests::git::git_test;
+ 
+ pub(crate) fn parse(config: &str) -> Config {
+@@ -212,7 +212,7 @@ fn override_toml() {
+     let darwin = TargetSelection::from_user("aarch64-apple-darwin");
+     let darwin_values = Target {
+         runner: Some("apple".into()),
+-        optimized_compiler_builtins: Some(false),
++        optimized_compiler_builtins: Some(StringOrBool::Bool(false)),
+         ..Default::default()
+     };
+     assert_eq!(
+diff --git a/src/bootstrap/src/core/config/toml/target.rs b/src/bootstrap/src/core/config/toml/target.rs
+index 69afa8af3419..5ddb8c50c146 100644
+--- a/src/bootstrap/src/core/config/toml/target.rs
++++ b/src/bootstrap/src/core/config/toml/target.rs
+@@ -45,7 +45,7 @@ struct TomlTarget {
+         no_std: Option<bool> = "no-std",
+         codegen_backends: Option<Vec<String>> = "codegen-backends",
+         runner: Option<String> = "runner",
+-        optimized_compiler_builtins: Option<bool> = "optimized-compiler-builtins",
++        optimized_compiler_builtins: Option<StringOrBool> = "optimized-compiler-builtins",
+         jemalloc: Option<bool> = "jemalloc",
+         self_contained: Option<bool> = "self-contained",
+     }
+@@ -78,7 +78,7 @@ pub struct Target {
+     pub runner: Option<String>,
+     pub no_std: bool,
+     pub codegen_backends: Option<Vec<CodegenBackendKind>>,
+-    pub optimized_compiler_builtins: Option<bool>,
++    pub optimized_compiler_builtins: Option<StringOrBool>,
+     pub jemalloc: Option<bool>,
+     pub self_contained: bool,
+ }
+-- 
+2.50.1
+

0001-Let-environment-variables-override-some-default-CPUs.patch

@@ -1,4 +1,4 @@
-From 5273432acfae75d6e509bbebcf8d28b0f3d820d0 Mon Sep 17 00:00:00 2001
+From e54c0a4cc8bd8a76b155714b23a61d1d32a8d069 Mon Sep 17 00:00:00 2001
 From: Josh Stone <jistone@redhat.com>
 Date: Fri, 9 Jun 2023 15:23:08 -0700
 Subject: [PATCH] Let environment variables override some default CPUs
@@ -10,10 +10,10 @@ Subject: [PATCH] Let environment variables override some default CPUs
  3 files changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/compiler/rustc_target/src/spec/targets/powerpc64le_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/targets/powerpc64le_unknown_linux_gnu.rs
-index 23913687a1fd..3253fbc84c74 100644
+index 9e406af53b5..9104903673f 100644
 --- a/compiler/rustc_target/src/spec/targets/powerpc64le_unknown_linux_gnu.rs
 +++ b/compiler/rustc_target/src/spec/targets/powerpc64le_unknown_linux_gnu.rs
-@@ -2,7 +2,7 @@
+@@ -4,7 +4,7 @@
  
  pub(crate) fn target() -> Target {
      let mut base = base::linux_gnu::opts();
@@ -23,23 +23,23 @@ index 23913687a1fd..3253fbc84c74 100644
      base.max_atomic_width = Some(64);
      base.stack_probes = StackProbeType::Inline;
 diff --git a/compiler/rustc_target/src/spec/targets/s390x_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/targets/s390x_unknown_linux_gnu.rs
-index a84a18a433ff..441af1018ff3 100644
+index cdcf7d62a3e..02f24274ed2 100644
 --- a/compiler/rustc_target/src/spec/targets/s390x_unknown_linux_gnu.rs
 +++ b/compiler/rustc_target/src/spec/targets/s390x_unknown_linux_gnu.rs
-@@ -5,7 +5,7 @@ pub(crate) fn target() -> Target {
+@@ -6,7 +6,7 @@ pub(crate) fn target() -> Target {
      let mut base = base::linux_gnu::opts();
      base.endian = Endian::Big;
      // z10 is the oldest CPU supported by LLVM
 -    base.cpu = "z10".into();
 +    base.cpu = option_env!("RUSTC_TARGET_CPU_S390X").unwrap_or("z10").into();
      base.max_atomic_width = Some(128);
-     base.min_global_align = Some(16);
+     base.min_global_align = Some(Align::from_bits(16).unwrap());
      base.stack_probes = StackProbeType::Inline;
 diff --git a/compiler/rustc_target/src/spec/targets/x86_64_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/targets/x86_64_unknown_linux_gnu.rs
-index 59ec6c7f9d5f..b6f1be890b20 100644
+index 0c8353fad18..c2515e700bb 100644
 --- a/compiler/rustc_target/src/spec/targets/x86_64_unknown_linux_gnu.rs
 +++ b/compiler/rustc_target/src/spec/targets/x86_64_unknown_linux_gnu.rs
-@@ -2,7 +2,7 @@
+@@ -4,7 +4,7 @@
  
  pub(crate) fn target() -> Target {
      let mut base = base::linux_gnu::opts();
@@ -49,5 +49,5 @@ index 59ec6c7f9d5f..b6f1be890b20 100644
      base.max_atomic_width = Some(64);
      base.add_pre_link_args(LinkerFlavor::Gnu(Cc::Yes, Lld::No), &["-m64"]);
 -- 
-2.47.1
+2.49.0
 

0001-Use-lld-provided-by-system.patch

@@ -1,4 +1,4 @@
-From 3d8c6d095581e8d7585f3772cfd16f6367f3c008 Mon Sep 17 00:00:00 2001
+From 0641fdd833785914f1ead6e1ab374beea5b55437 Mon Sep 17 00:00:00 2001
 From: Josh Stone <jistone@redhat.com>
 Date: Fri, 16 Aug 2024 10:12:58 -0700
 Subject: [PATCH] Use lld provided by system
@@ -12,10 +12,10 @@ Subject: [PATCH] Use lld provided by system
  5 files changed, 5 insertions(+), 4 deletions(-)
 
 diff --git a/compiler/rustc_target/src/spec/base/wasm.rs b/compiler/rustc_target/src/spec/base/wasm.rs
-index f237391016e7..08bcd9699b4a 100644
+index 88e7af5e669..14100a683f9 100644
 --- a/compiler/rustc_target/src/spec/base/wasm.rs
 +++ b/compiler/rustc_target/src/spec/base/wasm.rs
-@@ -85,8 +85,7 @@ macro_rules! args {
+@@ -86,8 +86,7 @@ macro_rules! args {
          // arguments just yet
          limit_rdylib_exports: false,
  
@@ -26,10 +26,10 @@ index f237391016e7..08bcd9699b4a 100644
  
          pre_link_args,
 diff --git a/compiler/rustc_target/src/spec/targets/aarch64_unknown_none_softfloat.rs b/compiler/rustc_target/src/spec/targets/aarch64_unknown_none_softfloat.rs
-index 222d5651b521..4b780bc8a8e7 100644
+index 35a4dd72b86..a9c8fc5edb8 100644
 --- a/compiler/rustc_target/src/spec/targets/aarch64_unknown_none_softfloat.rs
 +++ b/compiler/rustc_target/src/spec/targets/aarch64_unknown_none_softfloat.rs
-@@ -14,7 +14,7 @@ pub fn target() -> Target {
+@@ -15,7 +15,7 @@ pub(crate) fn target() -> Target {
      let opts = TargetOptions {
          abi: "softfloat".into(),
          linker_flavor: LinkerFlavor::Gnu(Cc::No, Lld::Yes),
@@ -39,10 +39,10 @@ index 222d5651b521..4b780bc8a8e7 100644
          relocation_model: RelocModel::Static,
          disable_redzone: true,
 diff --git a/compiler/rustc_target/src/spec/targets/aarch64_unknown_uefi.rs b/compiler/rustc_target/src/spec/targets/aarch64_unknown_uefi.rs
-index 429303170b6b..19d4ec53f6d8 100644
+index 327b52389b9..17313d7e8b3 100644
 --- a/compiler/rustc_target/src/spec/targets/aarch64_unknown_uefi.rs
 +++ b/compiler/rustc_target/src/spec/targets/aarch64_unknown_uefi.rs
-@@ -9,6 +9,7 @@ pub fn target() -> Target {
+@@ -9,6 +9,7 @@ pub(crate) fn target() -> Target {
      base.max_atomic_width = Some(128);
      base.add_pre_link_args(LinkerFlavor::Msvc(Lld::No), &["/machine:arm64"]);
      base.features = "+v8a".into();
@@ -51,30 +51,30 @@ index 429303170b6b..19d4ec53f6d8 100644
      Target {
          llvm_target: "aarch64-unknown-windows".into(),
 diff --git a/compiler/rustc_target/src/spec/targets/x86_64_unknown_none.rs b/compiler/rustc_target/src/spec/targets/x86_64_unknown_none.rs
-index 549706998d46..b7e9158ddef5 100644
+index 1a6343595f5..8015b082cd1 100644
 --- a/compiler/rustc_target/src/spec/targets/x86_64_unknown_none.rs
 +++ b/compiler/rustc_target/src/spec/targets/x86_64_unknown_none.rs
-@@ -17,7 +17,7 @@ pub fn target() -> Target {
+@@ -19,7 +19,7 @@ pub(crate) fn target() -> Target {
          static_position_independent_executables: true,
          relro_level: RelroLevel::Full,
          linker_flavor: LinkerFlavor::Gnu(Cc::No, Lld::Yes),
 -        linker: Some("rust-lld".into()),
 +        linker: Some("lld".into()),
+         rustc_abi: Some(RustcAbi::X86Softfloat),
          features: "-mmx,-sse,-sse2,-sse3,-ssse3,-sse4.1,-sse4.2,-avx,-avx2,+soft-float".into(),
          supported_sanitizers: SanitizerSet::KCFI | SanitizerSet::KERNELADDRESS,
-         disable_redzone: true,
 diff --git a/compiler/rustc_target/src/spec/targets/x86_64_unknown_uefi.rs b/compiler/rustc_target/src/spec/targets/x86_64_unknown_uefi.rs
-index 6da1fcca58c8..c84ae44576d4 100644
+index 0cf6a879462..3677fc662de 100644
 --- a/compiler/rustc_target/src/spec/targets/x86_64_unknown_uefi.rs
 +++ b/compiler/rustc_target/src/spec/targets/x86_64_unknown_uefi.rs
-@@ -16,6 +16,7 @@ pub fn target() -> Target {
+@@ -15,6 +15,7 @@ pub(crate) fn target() -> Target {
      base.plt_by_default = false;
      base.max_atomic_width = Some(64);
-     base.entry_abi = Conv::X86_64Win64;
+     base.entry_abi = CanonAbi::X86(X86Call::Win64);
 +    base.linker = Some("lld".into());
  
      // We disable MMX and SSE for now, even though UEFI allows using them. Problem is, you have to
      // enable these CPU features explicitly before their first use, otherwise their instructions
 -- 
-2.46.0
+2.49.0
 

0001-bootstrap-allow-disabling-target-self-contained.patch

@@ -1,36 +1,33 @@
-From 8d4d52446347872816ab51958e9f3162cf722ee6 Mon Sep 17 00:00:00 2001
+From b51b8d1854e7e2e7b7b431da26adad6b3677f6d2 Mon Sep 17 00:00:00 2001
 From: Josh Stone <jistone@redhat.com>
-Date: Thu, 28 Sep 2023 18:14:28 -0700
+Date: Mon, 18 Aug 2025 17:11:07 -0700
 Subject: [PATCH 1/2] bootstrap: allow disabling target self-contained
 
 ---
- config.example.toml                           | 5 +++++
+ bootstrap.example.toml                        | 5 +++++
  src/bootstrap/src/core/build_steps/compile.rs | 4 ++++
- src/bootstrap/src/core/config/config.rs       | 8 ++++++++
+ src/bootstrap/src/core/config/toml/target.rs  | 8 ++++++++
  src/bootstrap/src/lib.rs                      | 5 +++++
  4 files changed, 22 insertions(+)
 
-diff --git a/config.example.toml b/config.example.toml
+diff --git a/bootstrap.example.toml b/bootstrap.example.toml
-index d3233ad17b51..6a1f097c20cb 100644
+index 31966af33012..82041167b444 100644
---- a/config.example.toml
+--- a/bootstrap.example.toml
-+++ b/config.example.toml
++++ b/bootstrap.example.toml
-@@ -916,6 +916,11 @@
+@@ -1044,3 +1044,8 @@
- # argument as the test binary.
+ # Link the compiler and LLVM against `jemalloc` instead of the default libc allocator.
- #runner = <none> (string)
+ # This overrides the global `rust.jemalloc` option. See that option for more info.
- 
+ #jemalloc = rust.jemalloc (bool)
++
 +# Copy libc and CRT objects into the target lib/self-contained/ directory.
 +# Enabled by default on `musl`, `wasi`, and `windows-gnu` targets. Other
 +# targets may ignore this setting if they have nothing to be contained.
 +#self-contained = <platform-specific> (bool)
-+
- # =============================================================================
- # Distribution options
- #
 diff --git a/src/bootstrap/src/core/build_steps/compile.rs b/src/bootstrap/src/core/build_steps/compile.rs
-index 8e088682f92d..843b7123b120 100644
+index 59541bf12def..7a5533346adf 100644
 --- a/src/bootstrap/src/core/build_steps/compile.rs
 +++ b/src/bootstrap/src/core/build_steps/compile.rs
-@@ -346,6 +346,10 @@ fn copy_self_contained_objects(
+@@ -370,6 +370,10 @@ fn copy_self_contained_objects(
      compiler: &Compiler,
      target: TargetSelection,
  ) -> Vec<(PathBuf, DependencyType)> {
@@ -41,19 +38,27 @@ index 8e088682f92d..843b7123b120 100644
      let libdir_self_contained =
          builder.sysroot_target_libdir(*compiler, target).join("self-contained");
      t!(fs::create_dir_all(&libdir_self_contained));
-diff --git a/src/bootstrap/src/core/config/config.rs b/src/bootstrap/src/core/config/config.rs
+diff --git a/src/bootstrap/src/core/config/toml/target.rs b/src/bootstrap/src/core/config/toml/target.rs
-index e706aba977b6..a55d98e94dd8 100644
+index 9dedadff3a19..69afa8af3419 100644
---- a/src/bootstrap/src/core/config/config.rs
+--- a/src/bootstrap/src/core/config/toml/target.rs
-+++ b/src/bootstrap/src/core/config/config.rs
++++ b/src/bootstrap/src/core/config/toml/target.rs
-@@ -627,6 +627,7 @@ pub struct Target {
+@@ -47,6 +47,7 @@ struct TomlTarget {
-     pub runner: Option<String>,
+         runner: Option<String> = "runner",
-     pub no_std: bool,
+         optimized_compiler_builtins: Option<bool> = "optimized-compiler-builtins",
-     pub codegen_backends: Option<Vec<String>>,
+         jemalloc: Option<bool> = "jemalloc",
++        self_contained: Option<bool> = "self-contained",
+     }
+ }
+ 
+@@ -79,6 +80,7 @@ pub struct Target {
+     pub codegen_backends: Option<Vec<CodegenBackendKind>>,
+     pub optimized_compiler_builtins: Option<bool>,
+     pub jemalloc: Option<bool>,
 +    pub self_contained: bool,
  }
  
  impl Target {
-@@ -638,6 +639,9 @@ pub fn from_triple(triple: &str) -> Self {
+@@ -90,6 +92,9 @@ pub fn from_triple(triple: &str) -> Self {
          if triple.contains("emscripten") {
              target.runner = Some("node".into());
          }
@@ -63,15 +68,7 @@ index e706aba977b6..a55d98e94dd8 100644
          target
      }
  }
-@@ -1213,6 +1217,7 @@ struct TomlTarget {
+@@ -126,6 +131,9 @@ pub fn apply_target_config(&mut self, toml_target: Option<HashMap<String, TomlTa
-         no_std: Option<bool> = "no-std",
-         codegen_backends: Option<Vec<String>> = "codegen-backends",
-         runner: Option<String> = "runner",
-+        self_contained: Option<bool> = "self-contained",
-     }
- }
- 
-@@ -2038,6 +2043,9 @@ fn get_table(option: &str) -> Result<TomlConfig, toml::de::Error> {
                  if let Some(s) = cfg.no_std {
                      target.no_std = s;
                  }
@@ -82,10 +79,10 @@ index e706aba977b6..a55d98e94dd8 100644
                  target.cxx = cfg.cxx.map(PathBuf::from);
                  target.ar = cfg.ar.map(PathBuf::from);
 diff --git a/src/bootstrap/src/lib.rs b/src/bootstrap/src/lib.rs
-index c384fd6bf435..a101c010b740 100644
+index 011b52df97bb..77b2d9205a43 100644
 --- a/src/bootstrap/src/lib.rs
 +++ b/src/bootstrap/src/lib.rs
-@@ -1351,6 +1351,11 @@ fn no_std(&self, target: TargetSelection) -> Option<bool> {
+@@ -1423,6 +1423,11 @@ fn no_std(&self, target: TargetSelection) -> Option<bool> {
          self.config.target_config.get(&target).map(|t| t.no_std)
      }
  
@@ -98,5 +95,5 @@ index c384fd6bf435..a101c010b740 100644
      /// and `remote-test-server` binaries.
      fn remote_tested(&self, target: TargetSelection) -> bool {
 -- 
-2.47.1
+2.50.1
 

0001-only-copy-rustlib-into-stage0-sysroot.patch

@@ -0,0 +1,28 @@
+From 7d83bae4e2577ffa2afaf2fddb6948c1756a403c Mon Sep 17 00:00:00 2001
+From: Paul Murphy <paumurph@redhat.com>
+Date: Thu, 10 Jul 2025 09:06:22 -0500
+Subject: [PATCH] only copy rustlib into stage0 sysroot
+
+Otherwise, much more is copied, and doing so likely runs into
+permissions errors if the bootstrap toolchain lives in the host's
+sysroot.
+---
+ src/bootstrap/src/core/build_steps/compile.rs | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/bootstrap/src/core/build_steps/compile.rs b/src/bootstrap/src/core/build_steps/compile.rs
+index 4d0ae54e1ef..4ef70dd9b97 100644
+--- a/src/bootstrap/src/core/build_steps/compile.rs
++++ b/src/bootstrap/src/core/build_steps/compile.rs
+@@ -811,7 +811,7 @@ fn run(self, builder: &Builder<'_>) {
+                 let _ = fs::remove_dir_all(sysroot.join("lib/rustlib/src/rust"));
+             }
+ 
+-            builder.cp_link_r(&builder.initial_sysroot.join("lib"), &sysroot.join("lib"));
++            builder.cp_link_r(&builder.initial_sysroot.join("lib/rustlib"), &sysroot.join("lib/rustlib"));
+         } else {
+             if builder.download_rustc() {
+                 // Ensure there are no CI-rustc std artifacts.
+-- 
+2.49.0
+

0001-rustc_expand-ensure-stack-in-InvocationCollector-vis.patch

@@ -0,0 +1,49 @@
+From 8ff00974436f25585850e3029d8e5a3e2a8340da Mon Sep 17 00:00:00 2001
+From: Josh Stone <jistone@redhat.com>
+Date: Thu, 14 Aug 2025 16:02:31 -0700
+Subject: [PATCH] rustc_expand: ensure stack in
+ `InvocationCollector::visit_expr`
+
+In Fedora, when we built rustc with PGO on ppc64le, we started failing
+the test `issue-74564-if-expr-stack-overflow.rs`. This could also be
+reproduced on other arches by setting a smaller `RUST_MIN_STACK`, so
+it's probably just unlucky that ppc64le PGO created a large stack frame
+somewhere in this recursion path. Adding an `ensure_sufficient_stack`
+solves the stack overflow.
+
+Historically, that test and its fix were added in rust-lang/rust#74708,
+which was also an `ensure_sufficient_stack` in this area of code at the
+time. However, the refactor in rust-lang/rust#92573 basically left that
+to the general `MutVisitor`, and then rust-lang/rust#142240 removed even
+that ensure call. It may be luck that our tier-1 tested targets did not
+regress the original issue across those refactors.
+
+(cherry picked from commit f68bcb376da2a34b6809ba76dad20ca400bd9966)
+---
+ compiler/rustc_expand/src/expand.rs | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/compiler/rustc_expand/src/expand.rs b/compiler/rustc_expand/src/expand.rs
+index f02aa6c120f9..0cfda7c4739f 100644
+--- a/compiler/rustc_expand/src/expand.rs
++++ b/compiler/rustc_expand/src/expand.rs
+@@ -15,6 +15,7 @@
+ use rustc_ast_pretty::pprust;
+ use rustc_attr_parsing::{EvalConfigResult, ShouldEmit};
+ use rustc_data_structures::flat_map_in_place::FlatMapInPlace;
++use rustc_data_structures::stack::ensure_sufficient_stack;
+ use rustc_errors::PResult;
+ use rustc_feature::Features;
+ use rustc_parse::parser::{
+@@ -2439,7 +2440,7 @@ fn visit_expr(&mut self, node: &mut ast::Expr) {
+         if let Some(attr) = node.attrs.first() {
+             self.cfg().maybe_emit_expr_attr_err(attr);
+         }
+-        self.visit_node(node)
++        ensure_sufficient_stack(|| self.visit_node(node))
+     }
+ 
+     fn visit_method_receiver_expr(&mut self, node: &mut ast::Expr) {
+-- 
+2.50.1
+

0002-set-an-external-library-path-for-wasm32-wasi.patch

@@ -1,19 +1,20 @@
-From 21d53eca2af5f04c0aa6b898f99f58e0e093cfdd Mon Sep 17 00:00:00 2001
+From 3730abcf2b86d650da97a11190af8dcbfeae311a Mon Sep 17 00:00:00 2001
 From: Josh Stone <jistone@redhat.com>
-Date: Thu, 28 Sep 2023 18:18:16 -0700
+Date: Mon, 18 Aug 2025 17:13:28 -0700
 Subject: [PATCH 2/2] set an external library path for wasm32-wasi
 
 ---
  compiler/rustc_codegen_ssa/src/back/link.rs            | 10 ++++++++++
- compiler/rustc_target/src/spec/mod.rs                  |  4 ++++
+ compiler/rustc_target/src/spec/json.rs                 |  4 ++++
+ compiler/rustc_target/src/spec/mod.rs                  |  2 ++
  .../rustc_target/src/spec/targets/wasm32_wasip1.rs     |  7 ++++---
- 3 files changed, 18 insertions(+), 3 deletions(-)
+ 4 files changed, 20 insertions(+), 3 deletions(-)
 
 diff --git a/compiler/rustc_codegen_ssa/src/back/link.rs b/compiler/rustc_codegen_ssa/src/back/link.rs
-index 5149e3a12f23..cf62fbdc7f59 100644
+index 162fbf3d6e24..2acfd6dd96b2 100644
 --- a/compiler/rustc_codegen_ssa/src/back/link.rs
 +++ b/compiler/rustc_codegen_ssa/src/back/link.rs
-@@ -1663,6 +1663,12 @@ fn get_object_file_path(sess: &Session, name: &str, self_contained: bool) -> Pat
+@@ -1548,6 +1548,12 @@ fn get_object_file_path(sess: &Session, name: &str, self_contained: bool) -> Pat
              return file_path;
          }
      }
@@ -26,10 +27,10 @@ index 5149e3a12f23..cf62fbdc7f59 100644
      for search_path in sess.target_filesearch().search_paths(PathKind::Native) {
          let file_path = search_path.dir.join(name);
          if file_path.exists() {
-@@ -2163,6 +2169,10 @@ fn add_library_search_dirs(
+@@ -2121,6 +2127,10 @@ fn add_library_search_dirs(
-             ControlFlow::<()>::Continue(())
+         }
-         },
+         ControlFlow::<()>::Continue(())
-     );
+     });
 +
 +    if let Some(lib_path) = &sess.target.options.external_lib_path {
 +        cmd.include_path(Path::new(lib_path.as_ref()));
@@ -37,35 +38,19 @@ index 5149e3a12f23..cf62fbdc7f59 100644
  }
  
  /// Add options making relocation sections in the produced ELF files read-only
-diff --git a/compiler/rustc_target/src/spec/mod.rs b/compiler/rustc_target/src/spec/mod.rs
+diff --git a/compiler/rustc_target/src/spec/json.rs b/compiler/rustc_target/src/spec/json.rs
-index 321ab40403a3..54791c8892d8 100644
+index d27c1929aef7..b995896450e0 100644
---- a/compiler/rustc_target/src/spec/mod.rs
+--- a/compiler/rustc_target/src/spec/json.rs
-+++ b/compiler/rustc_target/src/spec/mod.rs
++++ b/compiler/rustc_target/src/spec/json.rs
-@@ -2155,6 +2155,7 @@ pub struct TargetOptions {
+@@ -84,6 +84,7 @@ macro_rules! forward_opt {
-     /// Objects to link before and after all other object code.
+         forward!(linker_is_gnu_json);
-     pub pre_link_objects: CrtObjects,
+         forward!(pre_link_objects);
-     pub post_link_objects: CrtObjects,
+         forward!(post_link_objects);
-+    pub external_lib_path: Option<StaticCow<str>>,
++        forward_opt!(external_lib_path);
-     /// Same as `(pre|post)_link_objects`, but when self-contained linking mode is enabled.
+         forward!(pre_link_objects_self_contained);
-     pub pre_link_objects_self_contained: CrtObjects,
+         forward!(post_link_objects_self_contained);
-     pub post_link_objects_self_contained: CrtObjects,
+ 
-@@ -2651,6 +2652,7 @@ fn default() -> TargetOptions {
+@@ -306,6 +307,7 @@ macro_rules! target_option_val {
-             relro_level: RelroLevel::None,
-             pre_link_objects: Default::default(),
-             post_link_objects: Default::default(),
-+            external_lib_path: None,
-             pre_link_objects_self_contained: Default::default(),
-             post_link_objects_self_contained: Default::default(),
-             link_self_contained: LinkSelfContainedDefault::False,
-@@ -3355,6 +3357,7 @@ macro_rules! key {
-         key!(linker_is_gnu_json = "linker-is-gnu", bool);
-         key!(pre_link_objects = "pre-link-objects", link_objects);
-         key!(post_link_objects = "post-link-objects", link_objects);
-+        key!(external_lib_path, optional);
-         key!(pre_link_objects_self_contained = "pre-link-objects-fallback", link_objects);
-         key!(post_link_objects_self_contained = "post-link-objects-fallback", link_objects);
-         // Deserializes the backwards-compatible variants of `-Clink-self-contained`
-@@ -3636,6 +3639,7 @@ macro_rules! target_option_val {
          target_option_val!(linker_is_gnu_json, "linker-is-gnu");
          target_option_val!(pre_link_objects);
          target_option_val!(post_link_objects);
@@ -73,11 +58,40 @@ index 321ab40403a3..54791c8892d8 100644
          target_option_val!(pre_link_objects_self_contained, "pre-link-objects-fallback");
          target_option_val!(post_link_objects_self_contained, "post-link-objects-fallback");
          target_option_val!(link_args - pre_link_args_json, "pre-link-args");
+@@ -490,6 +492,8 @@ struct TargetSpecJson {
+     pre_link_objects: Option<CrtObjects>,
+     #[serde(rename = "post-link-objects")]
+     post_link_objects: Option<CrtObjects>,
++    #[serde(rename = "external-lib-path")]
++    external_lib_path: Option<StaticCow<str>>,
+     #[serde(rename = "pre-link-objects-fallback")]
+     pre_link_objects_self_contained: Option<CrtObjects>,
+     #[serde(rename = "post-link-objects-fallback")]
+diff --git a/compiler/rustc_target/src/spec/mod.rs b/compiler/rustc_target/src/spec/mod.rs
+index 033590e01a67..15a012639472 100644
+--- a/compiler/rustc_target/src/spec/mod.rs
++++ b/compiler/rustc_target/src/spec/mod.rs
+@@ -2439,6 +2439,7 @@ pub struct TargetOptions {
+     /// Objects to link before and after all other object code.
+     pub pre_link_objects: CrtObjects,
+     pub post_link_objects: CrtObjects,
++    pub external_lib_path: Option<StaticCow<str>>,
+     /// Same as `(pre|post)_link_objects`, but when self-contained linking mode is enabled.
+     pub pre_link_objects_self_contained: CrtObjects,
+     pub post_link_objects_self_contained: CrtObjects,
+@@ -2964,6 +2965,7 @@ fn default() -> TargetOptions {
+             relro_level: RelroLevel::None,
+             pre_link_objects: Default::default(),
+             post_link_objects: Default::default(),
++            external_lib_path: None,
+             pre_link_objects_self_contained: Default::default(),
+             post_link_objects_self_contained: Default::default(),
+             link_self_contained: LinkSelfContainedDefault::False,
 diff --git a/compiler/rustc_target/src/spec/targets/wasm32_wasip1.rs b/compiler/rustc_target/src/spec/targets/wasm32_wasip1.rs
-index 1cd30f21bec1..9a752d5712a6 100644
+index 26add451ed25..3eaf050e6823 100644
 --- a/compiler/rustc_target/src/spec/targets/wasm32_wasip1.rs
 +++ b/compiler/rustc_target/src/spec/targets/wasm32_wasip1.rs
-@@ -19,11 +19,12 @@ pub(crate) fn target() -> Target {
+@@ -21,11 +21,12 @@ pub(crate) fn target() -> Target {
      options.env = "p1".into();
      options.add_pre_link_args(LinkerFlavor::WasmLld(Cc::Yes), &["--target=wasm32-wasip1"]);
  
@@ -94,5 +108,5 @@ index 1cd30f21bec1..9a752d5712a6 100644
      // Right now this is a bit of a workaround but we're currently saying that
      // the target by default has a static crt which we're taking as a signal
 -- 
-2.47.1
+2.50.1
 

SOURCES/0001-Only-translate-profile-flags-for-Clang.patch

@@ -1,39 +0,0 @@
-From e4e678eb9cbd90acf2ba51e9ec0209b05c4403b5 Mon Sep 17 00:00:00 2001
-From: Josh Stone <cuviper@gmail.com>
-Date: Thu, 9 Jan 2025 16:47:10 -0800
-Subject: [PATCH] Only translate profile flags for Clang
-
----
- src/flags.rs | 16 +++++++++-------
- 1 file changed, 9 insertions(+), 7 deletions(-)
-
-diff --git a/src/flags.rs b/src/flags.rs
-index 81834cf625f7..1a53c1b2345c 100644
---- a/src/flags.rs
-+++ b/src/flags.rs
-@@ -201,13 +201,15 @@ impl<'this> RustcCodegenFlags<'this> {
-                 if self.no_vectorize_slp {
-                     push_if_supported("-fno-slp-vectorize".into());
-                 }
--                // https://clang.llvm.org/docs/ClangCommandLineReference.html#cmdoption-clang-fprofile-generate
--                if let Some(value) = self.profile_generate {
--                    push_if_supported(format!("-fprofile-generate={value}").into());
--                }
--                // https://clang.llvm.org/docs/ClangCommandLineReference.html#cmdoption-clang-fprofile-use
--                if let Some(value) = self.profile_use {
--                    push_if_supported(format!("-fprofile-use={value}").into());
-+                if let ToolFamily::Clang { .. } = family {
-+                    // https://clang.llvm.org/docs/ClangCommandLineReference.html#cmdoption-clang-fprofile-generate
-+                    if let Some(value) = self.profile_generate {
-+                        push_if_supported(format!("-fprofile-generate={value}").into());
-+                    }
-+                    // https://clang.llvm.org/docs/ClangCommandLineReference.html#cmdoption-clang-fprofile-use
-+                    if let Some(value) = self.profile_use {
-+                        push_if_supported(format!("-fprofile-use={value}").into());
-+                    }
-                 }
-                 // https://clang.llvm.org/docs/ClangCommandLineReference.html#cmdoption-clang-mguard
-                 if let Some(value) = self.control_flow_guard {
--- 
-2.47.1
-

SOURCES/rustc-1.84.0-disable-libssh2.patch

@@ -1,44 +0,0 @@
-diff -up rustc-beta-src/src/tools/cargo/Cargo.lock.orig rustc-beta-src/src/tools/cargo/Cargo.lock
---- rustc-beta-src/src/tools/cargo/Cargo.lock.orig	2024-12-12 14:07:10.755481543 -0800
-+++ rustc-beta-src/src/tools/cargo/Cargo.lock	2024-12-12 14:07:10.756481534 -0800
-@@ -2272,7 +2272,6 @@ checksum = "10472326a8a6477c3c20a64547b0
- dependencies = [
-  "cc",
-  "libc",
-- "libssh2-sys",
-  "libz-sys",
-  "openssl-sys",
-  "pkg-config",
-@@ -2313,20 +2312,6 @@ dependencies = [
-  "pkg-config",
-  "vcpkg",
- ]
--
--[[package]]
--name = "libssh2-sys"
--version = "0.3.0"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "2dc8a030b787e2119a731f1951d6a773e2280c660f8ec4b0f5e1505a386e71ee"
--dependencies = [
-- "cc",
-- "libc",
-- "libz-sys",
-- "openssl-sys",
-- "pkg-config",
-- "vcpkg",
--]
- 
- [[package]]
- name = "libz-sys"
-diff -up rustc-beta-src/src/tools/cargo/Cargo.toml.orig rustc-beta-src/src/tools/cargo/Cargo.toml
---- rustc-beta-src/src/tools/cargo/Cargo.toml.orig	2024-12-12 14:07:10.756481534 -0800
-+++ rustc-beta-src/src/tools/cargo/Cargo.toml	2024-12-12 14:07:56.866087428 -0800
-@@ -47,7 +47,7 @@ curl = "0.4.46"
- curl-sys = "0.4.73"
- filetime = "0.2.23"
- flate2 = { version = "1.0.30", default-features = false, features = ["zlib"] }
--git2 = "0.19.0"
-+git2 = { version = "0.19.0", default-features = false, features = ["https"] }
- git2-curl = "0.20.0"
- gix = { version = "0.67.0", default-features = false, features = ["blocking-http-transport-curl", "progress-tree", "parallel", "dirwalk"] }
- glob = "0.3.1"

SOURCES/rustc-1.84.0-unbundle-sqlite.patch

@@ -1,23 +0,0 @@
-diff -up rustc-beta-src/src/tools/cargo/Cargo.lock.orig rustc-beta-src/src/tools/cargo/Cargo.lock
---- rustc-beta-src/src/tools/cargo/Cargo.lock.orig	2024-12-07 06:47:38.000000000 -0800
-+++ rustc-beta-src/src/tools/cargo/Cargo.lock	2024-12-12 14:02:54.412672539 -0800
-@@ -2310,7 +2310,6 @@ version = "0.30.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "2e99fb7a497b1e3339bc746195567ed8d3e24945ecd636e3619d20b9de9e9149"
- dependencies = [
-- "cc",
-  "pkg-config",
-  "vcpkg",
- ]
-diff -up rustc-beta-src/src/tools/cargo/Cargo.toml.orig rustc-beta-src/src/tools/cargo/Cargo.toml
---- rustc-beta-src/src/tools/cargo/Cargo.toml.orig	2024-12-12 14:02:54.412672539 -0800
-+++ rustc-beta-src/src/tools/cargo/Cargo.toml	2024-12-12 14:03:25.665405417 -0800
-@@ -80,7 +80,7 @@ proptest = "1.5.0"
- pulldown-cmark = { version = "0.12.0", default-features = false, features = ["html"] }
- rand = "0.8.5"
- regex = "1.10.5"
--rusqlite = { version = "0.32.0", features = ["bundled"] }
-+rusqlite = { version = "0.32.0", features = [] }
- rustc-hash = "2.0.0"
- rustfix = { version = "0.9.0", path = "crates/rustfix" }
- same-file = "1.0.6"

changelog

@@ -0,0 +1,607 @@
+* Fri Apr 05 2024 Josh Stone <jistone@redhat.com> - 1.77.0-3
+- Ensure more consistency in PGO flags -- fixes Cargo tests
+
+* Thu Mar 21 2024 Davide Cavalca <dcavalca@fedoraproject.org> - 1.77.0-2
+- Add build target for aarch64-unknown-none-softfloat
+
+* Thu Mar 21 2024 Nikita Popov <npopov@redhat.com> - 1.77.0-1
+- Update to 1.77.0
+
+* Thu Feb 08 2024 Josh Stone <jistone@redhat.com> - 1.76.0-1
+- Update to 1.76.0.
+
+* Tue Jan 30 2024 Josh Stone <jistone@redhat.com> - 1.75.0-3
+- Consolidate 32-bit build compromises.
+- Update rust-toolset and add rust-srpm-macros for ELN.
+
+* Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.75.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sun Dec 31 2023 Josh Stone <jistone@redhat.com> - 1.75.0-1
+- Update to 1.75.0.
+
+* Thu Dec 07 2023 Josh Stone <jistone@redhat.com> - 1.74.1-1
+- Update to 1.74.1.
+
+* Thu Nov 16 2023 Josh Stone <jistone@redhat.com> - 1.74.0-1
+- Update to 1.74.0.
+
+* Thu Oct 26 2023 Josh Stone <jistone@redhat.com> - 1.73.0-2
+- Use thin-LTO and PGO for rustc itself.
+
+* Thu Oct 05 2023 Josh Stone <jistone@redhat.com> - 1.73.0-1
+- Update to 1.73.0.
+- Drop el7 conditionals from the spec.
+
+* Fri Sep 29 2023 Josh Stone <jistone@redhat.com> - 1.72.1-3
+- Fix the profiler runtime with compiler-rt-17
+- Switch to unbundled wasi-libc on Fedora
+- Use emmalloc instead of CC0 dlmalloc when bundling wasi-libc
+
+* Mon Sep 25 2023 Josh Stone <jistone@redhat.com> - 1.72.1-2
+- Fix LLVM dependency for ELN
+- Add build target for x86_64-unknown-none
+- Add build target for x86_64-unknown-uefi
+
+* Tue Sep 19 2023 Josh Stone <jistone@redhat.com> - 1.72.1-1
+- Update to 1.72.1.
+- Migrated to SPDX license
+
+* Thu Aug 24 2023 Josh Stone <jistone@redhat.com> - 1.72.0-1
+- Update to 1.72.0.
+
+* Mon Aug 07 2023 Josh Stone <jistone@redhat.com> - 1.71.1-1
+- Update to 1.71.1.
+- Security fix for CVE-2023-38497
+
+* Tue Jul 25 2023 Josh Stone <jistone@redhat.com> - 1.71.0-3
+- Relax the suspicious_double_ref_op lint
+- Enable the profiler runtime for native hosts
+
+* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.71.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Mon Jul 17 2023 Josh Stone <jistone@redhat.com> - 1.71.0-1
+- Update to 1.71.0.
+
+* Fri Jun 23 2023 Josh Stone <jistone@redhat.com> - 1.70.0-2
+- Override default target CPUs to match distro settings
+
+* Thu Jun 01 2023 Josh Stone <jistone@redhat.com> - 1.70.0-1
+- Update to 1.70.0.
+
+* Fri May 05 2023 Josh Stone <jistone@redhat.com> - 1.69.0-3
+- Fix debuginfo with LLVM 16
+
+* Mon May 01 2023 Josh Stone <jistone@redhat.com> - 1.69.0-2
+- Build with LLVM 15 on Fedora 38+
+
+* Thu Apr 20 2023 Josh Stone <jistone@redhat.com> - 1.69.0-1
+- Update to 1.69.0.
+- Obsolete rust-analysis.
+
+* Tue Mar 28 2023 Josh Stone <jistone@redhat.com> - 1.68.2-1
+- Update to 1.68.2.
+
+* Thu Mar 23 2023 Josh Stone <jistone@redhat.com> - 1.68.1-1
+- Update to 1.68.1.
+
+* Thu Mar 09 2023 Josh Stone <jistone@redhat.com> - 1.68.0-1
+- Update to 1.68.0.
+
+* Tue Mar 07 2023 David Michael <fedora.dm0@gmail.com> - 1.67.1-3
+- Add a virtual Provides to rust-std-static containing the target triple.
+
+* Mon Feb 20 2023 Orion Poplawski <orion@nwra.com> - 1.67.1-2
+- Ship rust-toolset for EPEL7
+
+* Thu Feb 09 2023 Josh Stone <jistone@redhat.com> - 1.67.1-1
+- Update to 1.67.1.
+
+* Fri Feb 03 2023 Josh Stone <jistone@redhat.com> - 1.67.0-3
+- Unbundle libgit2 on Fedora 38.
+
+* Fri Jan 27 2023 Adam Williamson <awilliam@redhat.com> - 1.67.0-2
+- Backport PR #107360 to fix build of mesa
+- Backport 675fa0b3 to fix bootstrapping failure
+
+* Thu Jan 26 2023 Josh Stone <jistone@redhat.com> - 1.67.0-1
+- Update to 1.67.0.
+
+* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.66.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Tue Jan 10 2023 Josh Stone <jistone@redhat.com> - 1.66.1-1
+- Update to 1.66.1.
+- Security fix for CVE-2022-46176
+
+* Thu Dec 15 2022 Josh Stone <jistone@redhat.com> - 1.66.0-1
+- Update to 1.66.0.
+
+* Thu Nov 03 2022 Josh Stone <jistone@redhat.com> - 1.65.0-1
+- Update to 1.65.0.
+- rust-analyzer now obsoletes rls.
+
+* Thu Sep 22 2022 Josh Stone <jistone@redhat.com> - 1.64.0-1
+- Update to 1.64.0.
+- Add rust-analyzer.
+
+* Thu Aug 11 2022 Josh Stone <jistone@redhat.com> - 1.63.0-1
+- Update to 1.63.0.
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.62.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Tue Jul 19 2022 Josh Stone <jistone@redhat.com> - 1.62.1-1
+- Update to 1.62.1.
+
+* Wed Jul 13 2022 Josh Stone <jistone@redhat.com> - 1.62.0-2
+- Prevent unsound coercions from functions with opaque return types.
+
+* Thu Jun 30 2022 Josh Stone <jistone@redhat.com> - 1.62.0-1
+- Update to 1.62.0.
+
+* Mon May 23 2022 Josh Stone <jistone@redhat.com> - 1.61.0-2
+- Add missing target_feature to the list of well known cfg names
+
+* Thu May 19 2022 Josh Stone <jistone@redhat.com> - 1.61.0-1
+- Update to 1.61.0.
+- Add rust-toolset for ELN.
+
+* Thu Apr 07 2022 Josh Stone <jistone@redhat.com> - 1.60.0-1
+- Update to 1.60.0.
+
+* Fri Mar 25 2022 Josh Stone <jistone@redhat.com> - 1.59.0-4
+- Fix the archive index for wasm32-wasi's libc.a
+
+* Fri Mar 04 2022 Stephen Gallagher <sgallagh@redhat.com> - 1.59.0-3
+- Rebuild against the bootstrapped build
+
+* Fri Mar 04 2022 Stephen Gallagher <sgallagh@redhat.com> - 1.59.0-2.1
+- Bootstrapping for Fedora ELN
+
+* Tue Mar 01 2022 Josh Stone <jistone@redhat.com> - 1.59.0-2
+- Fix s390x hangs, rhbz#2058803
+
+* Thu Feb 24 2022 Josh Stone <jistone@redhat.com> - 1.59.0-1
+- Update to 1.59.0.
+- Revert to libgit2 1.3.x
+
+* Sun Feb 20 2022 Igor Raits <igor.raits@gmail.com> - 1.58.1-2
+- Rebuild for libgit2 1.4.x
+
+* Thu Jan 20 2022 Josh Stone <jistone@redhat.com> - 1.58.1-1
+- Update to 1.58.1.
+
+* Thu Jan 13 2022 Josh Stone <jistone@redhat.com> - 1.58.0-1
+- Update to 1.58.0.
+
+* Wed Jan 05 2022 Josh Stone <jistone@redhat.com> - 1.57.0-2
+- Add rust-std-static-i686-pc-windows-gnu
+- Add rust-std-static-x86_64-pc-windows-gnu
+
+* Thu Dec 02 2021 Josh Stone <jistone@redhat.com> - 1.57.0-1
+- Update to 1.57.0, fixes rhbz#2028675.
+- Backport rust#91070, fixes rhbz#1990657
+- Add rust-std-static-wasm32-wasi
+
+* Sun Nov 28 2021 Igor Raits <ignatenkobrain@fedoraproject.org> - 1.56.1-3
+- De-bootstrap (libgit2)
+
+* Sun Nov 28 2021 Igor Raits <ignatenkobrain@fedoraproject.org> - 1.56.1-2
+- Rebuild for libgit2 1.3.x
+
+* Mon Nov 01 2021 Josh Stone <jistone@redhat.com> - 1.56.1-1
+- Update to 1.56.1.
+
+* Thu Oct 21 2021 Josh Stone <jistone@redhat.com> - 1.56.0-1
+- Update to 1.56.0.
+
+* Tue Sep 14 2021 Sahana Prasad <sahana@redhat.com> - 1.55.0-2
+- Rebuilt with OpenSSL 3.0.0
+
+* Thu Sep 09 2021 Josh Stone <jistone@redhat.com> - 1.55.0-1
+- Update to 1.55.0.
+- Use llvm-ranlib for wasm rlibs; Fixes rhbz#2002612
+
+* Tue Aug 24 2021 Josh Stone <jistone@redhat.com> - 1.54.0-2
+- Build with LLVM 12 on Fedora 35+
+
+* Thu Jul 29 2021 Josh Stone <jistone@redhat.com> - 1.54.0-1
+- Update to 1.54.0.
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.53.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Thu Jul 08 2021 Josh Stone <jistone@redhat.com> - 1.53.0-2
+- Exclude wasm on s390x for lack of lld
+
+* Thu Jun 17 2021 Josh Stone <jistone@redhat.com> - 1.53.0-1
+- Update to 1.53.0.
+
+* Wed Jun 02 2021 Josh Stone <jistone@redhat.com> - 1.52.1-2
+- Set rust.codegen-units-std=1 for all targets again.
+- Add rust-std-static-wasm32-unknown-unknown.
+- Rebuild f34 with LLVM 12.
+
+* Mon May 10 2021 Josh Stone <jistone@redhat.com> - 1.52.1-1
+- Update to 1.52.1.
+
+* Thu May 06 2021 Josh Stone <jistone@redhat.com> - 1.52.0-1
+- Update to 1.52.0.
+
+* Fri Apr 16 2021 Josh Stone <jistone@redhat.com> - 1.51.0-3
+- Security fixes for CVE-2020-36323, CVE-2021-31162
+
+* Wed Apr 14 2021 Josh Stone <jistone@redhat.com> - 1.51.0-2
+- Security fixes for CVE-2021-28876, CVE-2021-28878, CVE-2021-28879
+- Fix bootstrap for stage0 rust 1.51
+
+* Thu Mar 25 2021 Josh Stone <jistone@redhat.com> - 1.51.0-1
+- Update to 1.51.0.
+
+* Thu Feb 11 2021 Josh Stone <jistone@redhat.com> - 1.50.0-1
+- Update to 1.50.0.
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.49.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Tue Jan 05 2021 Josh Stone <jistone@redhat.com> - 1.49.0-1
+- Update to 1.49.0.
+
+* Tue Dec 29 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 1.48.0-3
+- De-bootstrap
+
+* Mon Dec 28 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 1.48.0-2
+- Rebuild for libgit2 1.1.x
+
+* Thu Nov 19 2020 Josh Stone <jistone@redhat.com> - 1.48.0-1
+- Update to 1.48.0.
+
+* Sat Oct 10 2020 Jeff Law <law@redhat.com> - 1.47.0-2
+- Re-enable LTO
+
+* Thu Oct 08 2020 Josh Stone <jistone@redhat.com> - 1.47.0-1
+- Update to 1.47.0.
+
+* Fri Aug 28 2020 Fabio Valentini <decathorpe@gmail.com> - 1.46.0-2
+- Fix LTO with doctests (backported cargo PR#8657).
+
+* Thu Aug 27 2020 Josh Stone <jistone@redhat.com> - 1.46.0-1
+- Update to 1.46.0.
+
+* Mon Aug 03 2020 Josh Stone <jistone@redhat.com> - 1.45.2-1
+- Update to 1.45.2.
+
+* Thu Jul 30 2020 Josh Stone <jistone@redhat.com> - 1.45.1-1
+- Update to 1.45.1.
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.45.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Thu Jul 16 2020 Josh Stone <jistone@redhat.com> - 1.45.0-1
+- Update to 1.45.0.
+
+* Wed Jul 01 2020 Jeff Law <law@redhat.com> - 1.44.1-2
+- Disable LTO
+
+* Thu Jun 18 2020 Josh Stone <jistone@redhat.com> - 1.44.1-1
+- Update to 1.44.1.
+
+* Thu Jun 04 2020 Josh Stone <jistone@redhat.com> - 1.44.0-1
+- Update to 1.44.0.
+
+* Thu May 07 2020 Josh Stone <jistone@redhat.com> - 1.43.1-1
+- Update to 1.43.1.
+
+* Thu Apr 23 2020 Josh Stone <jistone@redhat.com> - 1.43.0-1
+- Update to 1.43.0.
+
+* Thu Mar 12 2020 Josh Stone <jistone@redhat.com> - 1.42.0-1
+- Update to 1.42.0.
+
+* Thu Feb 27 2020 Josh Stone <jistone@redhat.com> - 1.41.1-1
+- Update to 1.41.1.
+
+* Thu Feb 20 2020 Josh Stone <jistone@redhat.com> - 1.41.0-2
+- Rebuild with llvm9.0
+
+* Thu Jan 30 2020 Josh Stone <jistone@redhat.com> - 1.41.0-1
+- Update to 1.41.0.
+
+* Thu Jan 16 2020 Josh Stone <jistone@redhat.com> - 1.40.0-3
+- Build compiletest with in-tree libtest
+
+* Tue Jan 07 2020 Josh Stone <jistone@redhat.com> - 1.40.0-2
+- Fix compiletest with newer (local-rebuild) libtest
+- Fix ARM EHABI unwinding
+
+* Thu Dec 19 2019 Josh Stone <jistone@redhat.com> - 1.40.0-1
+- Update to 1.40.0.
+
+* Tue Nov 12 2019 Josh Stone <jistone@redhat.com> - 1.39.0-2
+- Fix a couple build and test issues with rustdoc.
+
+* Thu Nov 07 2019 Josh Stone <jistone@redhat.com> - 1.39.0-1
+- Update to 1.39.0.
+
+* Fri Sep 27 2019 Josh Stone <jistone@redhat.com> - 1.38.0-2
+- Filter the libraries included in rust-std (rhbz1756487)
+
+* Thu Sep 26 2019 Josh Stone <jistone@redhat.com> - 1.38.0-1
+- Update to 1.38.0.
+
+* Thu Aug 15 2019 Josh Stone <jistone@redhat.com> - 1.37.0-1
+- Update to 1.37.0.
+
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.36.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Thu Jul 04 2019 Josh Stone <jistone@redhat.com> - 1.36.0-1
+- Update to 1.36.0.
+
+* Wed May 29 2019 Josh Stone <jistone@redhat.com> - 1.35.0-2
+- Fix compiletest for rebuild testing.
+
+* Thu May 23 2019 Josh Stone <jistone@redhat.com> - 1.35.0-1
+- Update to 1.35.0.
+
+* Tue May 14 2019 Josh Stone <jistone@redhat.com> - 1.34.2-1
+- Update to 1.34.2 -- fixes CVE-2019-12083.
+
+* Tue Apr 30 2019 Josh Stone <jistone@redhat.com> - 1.34.1-3
+- Set rust.codegen-units-std=1
+
+* Fri Apr 26 2019 Josh Stone <jistone@redhat.com> - 1.34.1-2
+- Remove the ThinLTO workaround.
+
+* Thu Apr 25 2019 Josh Stone <jistone@redhat.com> - 1.34.1-1
+- Update to 1.34.1.
+- Add a ThinLTO fix for rhbz1701339.
+
+* Thu Apr 11 2019 Josh Stone <jistone@redhat.com> - 1.34.0-1
+- Update to 1.34.0.
+
+* Fri Mar 01 2019 Josh Stone <jistone@redhat.com> - 1.33.0-2
+- Fix deprecations for self-rebuild
+
+* Thu Feb 28 2019 Josh Stone <jistone@redhat.com> - 1.33.0-1
+- Update to 1.33.0.
+
+* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.32.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Thu Jan 17 2019 Josh Stone <jistone@redhat.com> - 1.32.0-1
+- Update to 1.32.0.
+
+* Mon Jan 07 2019 Josh Stone <jistone@redhat.com> - 1.31.1-9
+- Update to 1.31.1 for RLS fixes.
+
+* Thu Dec 06 2018 Josh Stone <jistone@redhat.com> - 1.31.0-8
+- Update to 1.31.0 -- Rust 2018!
+- clippy/rls/rustfmt are no longer -preview
+
+* Thu Nov 08 2018 Josh Stone <jistone@redhat.com> - 1.30.1-7
+- Update to 1.30.1.
+
+* Thu Oct 25 2018 Josh Stone <jistone@redhat.com> - 1.30.0-6
+- Update to 1.30.0.
+
+* Mon Oct 22 2018 Josh Stone <jistone@redhat.com> - 1.29.2-5
+- Rebuild without bootstrap binaries.
+
+* Sat Oct 20 2018 Josh Stone <jistone@redhat.com> - 1.29.2-4
+- Re-bootstrap armv7hl due to rhbz#1639485
+
+* Fri Oct 12 2018 Josh Stone <jistone@redhat.com> - 1.29.2-3
+- Update to 1.29.2.
+
+* Tue Sep 25 2018 Josh Stone <jistone@redhat.com> - 1.29.1-2
+- Update to 1.29.1.
+- Security fix for str::repeat (pending CVE).
+
+* Thu Sep 13 2018 Josh Stone <jistone@redhat.com> - 1.29.0-1
+- Update to 1.29.0.
+- Add a clippy-preview subpackage
+
+* Mon Aug 13 2018 Josh Stone <jistone@redhat.com> - 1.28.0-3
+- Use llvm6.0 instead of llvm-7 for now
+
+* Tue Aug 07 2018 Josh Stone <jistone@redhat.com> - 1.28.0-2
+- Rebuild for LLVM ppc64/s390x fixes
+
+* Thu Aug 02 2018 Josh Stone <jistone@redhat.com> - 1.28.0-1
+- Update to 1.28.0.
+
+* Tue Jul 24 2018 Josh Stone <jistone@redhat.com> - 1.27.2-4
+- Update to 1.27.2.
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.27.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Tue Jul 10 2018 Josh Stone <jistone@redhat.com> - 1.27.1-2
+- Update to 1.27.1.
+- Security fix for CVE-2018-1000622
+
+* Thu Jun 21 2018 Josh Stone <jistone@redhat.com> - 1.27.0-1
+- Update to 1.27.0.
+
+* Tue Jun 05 2018 Josh Stone <jistone@redhat.com> - 1.26.2-4
+- Rebuild without bootstrap binaries.
+
+* Tue Jun 05 2018 Josh Stone <jistone@redhat.com> - 1.26.2-3
+- Update to 1.26.2.
+- Re-bootstrap to deal with LLVM symbol changes.
+
+* Tue May 29 2018 Josh Stone <jistone@redhat.com> - 1.26.1-2
+- Update to 1.26.1.
+
+* Thu May 10 2018 Josh Stone <jistone@redhat.com> - 1.26.0-1
+- Update to 1.26.0.
+
+* Mon Apr 16 2018 Dan Callaghan <dcallagh@redhat.com> - 1.25.0-3
+- Add cargo, rls, and analysis
+
+* Tue Apr 10 2018 Josh Stone <jistone@redhat.com> - 1.25.0-2
+- Filter codegen-backends from Provides too.
+
+* Thu Mar 29 2018 Josh Stone <jistone@redhat.com> - 1.25.0-1
+- Update to 1.25.0.
+
+* Thu Mar 01 2018 Josh Stone <jistone@redhat.com> - 1.24.1-1
+- Update to 1.24.1.
+
+* Wed Feb 21 2018 Josh Stone <jistone@redhat.com> - 1.24.0-3
+- Backport a rebuild fix for rust#48308.
+
+* Mon Feb 19 2018 Josh Stone <jistone@redhat.com> - 1.24.0-2
+- rhbz1546541: drop full-bootstrap; cmp libs before symlinking.
+- Backport pr46592 to fix local_rebuild bootstrapping.
+- Backport pr48362 to fix relative/absolute libdir.
+
+* Thu Feb 15 2018 Josh Stone <jistone@redhat.com> - 1.24.0-1
+- Update to 1.24.0.
+
+* Mon Feb 12 2018 Iryna Shcherbina <ishcherb@redhat.com> - 1.23.0-4
+- Update Python 2 dependency declarations to new packaging standards
+  (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
+
+* Tue Feb 06 2018 Josh Stone <jistone@redhat.com> - 1.23.0-3
+- Use full-bootstrap to work around a rebuild issue.
+- Patch binaryen for GCC 8
+
+* Thu Feb 01 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.23.0-2
+- Switch to %%ldconfig_scriptlets
+
+* Mon Jan 08 2018 Josh Stone <jistone@redhat.com> - 1.23.0-1
+- Update to 1.23.0.
+
+* Thu Nov 23 2017 Josh Stone <jistone@redhat.com> - 1.22.1-1
+- Update to 1.22.1.
+
+* Thu Oct 12 2017 Josh Stone <jistone@redhat.com> - 1.21.0-1
+- Update to 1.21.0.
+
+* Mon Sep 11 2017 Josh Stone <jistone@redhat.com> - 1.20.0-2
+- ABI fixes for ppc64 and s390x.
+
+* Thu Aug 31 2017 Josh Stone <jistone@redhat.com> - 1.20.0-1
+- Update to 1.20.0.
+- Add a rust-src subpackage.
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.19.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.19.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Mon Jul 24 2017 Josh Stone <jistone@redhat.com> - 1.19.0-2
+- Use find-debuginfo.sh --keep-section .rustc
+
+* Thu Jul 20 2017 Josh Stone <jistone@redhat.com> - 1.19.0-1
+- Update to 1.19.0.
+
+* Thu Jun 08 2017 Josh Stone <jistone@redhat.com> - 1.18.0-1
+- Update to 1.18.0.
+
+* Mon May 08 2017 Josh Stone <jistone@redhat.com> - 1.17.0-2
+- Move shared libraries back to libdir and symlink in rustlib
+
+* Thu Apr 27 2017 Josh Stone <jistone@redhat.com> - 1.17.0-1
+- Update to 1.17.0.
+
+* Mon Mar 20 2017 Josh Stone <jistone@redhat.com> - 1.16.0-3
+- Make rust-lldb arch-specific to deal with lldb deps
+
+* Fri Mar 17 2017 Josh Stone <jistone@redhat.com> - 1.16.0-2
+- Limit rust-lldb arches
+
+* Thu Mar 16 2017 Josh Stone <jistone@redhat.com> - 1.16.0-1
+- Update to 1.16.0.
+- Use rustbuild instead of the old makefiles.
+- Update bootstrapping to include rust-std and cargo.
+- Add a rust-lldb subpackage.
+
+* Thu Feb 09 2017 Josh Stone <jistone@redhat.com> - 1.15.1-1
+- Update to 1.15.1.
+- Require rust-rpm-macros for new crate packaging.
+- Keep shared libraries under rustlib/, only debug-stripped.
+- Merge and clean up conditionals for epel7.
+
+* Fri Dec 23 2016 Josh Stone <jistone@redhat.com> - 1.14.0-2
+- Rebuild without bootstrap binaries.
+
+* Thu Dec 22 2016 Josh Stone <jistone@redhat.com> - 1.14.0-1
+- Update to 1.14.0.
+- Rewrite bootstrap logic to target specific arches.
+- Bootstrap ppc64, ppc64le, s390x. (thanks to Sinny Kumari for testing!)
+
+* Thu Nov 10 2016 Josh Stone <jistone@redhat.com> - 1.13.0-1
+- Update to 1.13.0.
+- Use hardening flags for linking.
+- Split the standard library into its own package
+- Centralize rustlib/ under /usr/lib/ for multilib integration.
+
+* Thu Oct 20 2016 Josh Stone <jistone@redhat.com> - 1.12.1-1
+- Update to 1.12.1.
+
+* Fri Oct 14 2016 Josh Stone <jistone@redhat.com> - 1.12.0-7
+- Rebuild with LLVM 3.9.
+- Add ncurses-devel for llvm-config's -ltinfo.
+
+* Thu Oct 13 2016 Josh Stone <jistone@redhat.com> - 1.12.0-6
+- Rebuild with llvm-static, preparing for 3.9
+
+* Fri Oct 07 2016 Josh Stone <jistone@redhat.com> - 1.12.0-5
+- Rebuild with fixed eu-strip (rhbz1380961)
+
+* Fri Oct 07 2016 Josh Stone <jistone@redhat.com> - 1.12.0-4
+- Rebuild without bootstrap binaries.
+
+* Thu Oct 06 2016 Josh Stone <jistone@redhat.com> - 1.12.0-3
+- Bootstrap aarch64.
+- Use jemalloc's MALLOC_CONF to work around #36944.
+- Apply pr36933 to really disable armv7hl NEON.
+
+* Sat Oct 01 2016 Josh Stone <jistone@redhat.com> - 1.12.0-2
+- Protect .rustc from rpm stripping.
+
+* Fri Sep 30 2016 Josh Stone <jistone@redhat.com> - 1.12.0-1
+- Update to 1.12.0.
+- Always use --local-rust-root, even for bootstrap binaries.
+- Remove the rebuild conditional - the build system now figures it out.
+- Let minidebuginfo do its thing, since metadata is no longer a note.
+- Let rust build its own compiler-rt builtins again.
+
+* Sat Sep 03 2016 Josh Stone <jistone@redhat.com> - 1.11.0-3
+- Rebuild without bootstrap binaries.
+
+* Fri Sep 02 2016 Josh Stone <jistone@redhat.com> - 1.11.0-2
+- Bootstrap armv7hl, with backported no-neon patch.
+
+* Wed Aug 24 2016 Josh Stone <jistone@redhat.com> - 1.11.0-1
+- Update to 1.11.0.
+- Drop the backported patches.
+- Patch get-stage0.py to trust existing bootstrap binaries.
+- Use libclang_rt.builtins from compiler-rt, dodging llvm-static issues.
+- Use --local-rust-root to make sure the right bootstrap is used.
+
+* Sat Aug 13 2016 Josh Stone <jistone@redhat.com> 1.10.0-4
+- Rebuild without bootstrap binaries.
+
+* Fri Aug 12 2016 Josh Stone <jistone@redhat.com> - 1.10.0-3
+- Initial import into Fedora (#1356907), bootstrapped
+- Format license text as suggested in review.
+- Note how the tests already run in parallel.
+- Undefine _include_minidebuginfo, because it duplicates ".note.rustc".
+- Don't let checks fail the whole build.
+- Note that -doc can't be noarch, as rpmdiff doesn't allow variations.
+
+* Tue Jul 26 2016 Josh Stone <jistone@redhat.com> - 1.10.0-2
+- Update -doc directory ownership, and mark its licenses.
+- Package and declare licenses for libbacktrace and hoedown.
+- Set bootstrap_base as a global.
+- Explicitly require python2.
+
+* Thu Jul 14 2016 Josh Stone <jistone@fedoraproject.org> - 1.10.0-1
+- Initial package, bootstrapped

gating.yaml

@@ -0,0 +1,7 @@
+--- !Policy
+product_versions:
+  - rhel-10
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1-tmt-x86_64-aarch64.functional}
+  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1-tmt-s390x-ppc64le.functional}

macros.rust-srpm

@@ -0,0 +1,62 @@
+# rust_arches: list of architectures where building Rust is supported
+#
+# Since RPM itself now depends on Rust code (via its GPG backend, rpm-sequoia),
+# this list will probably always be a superset of all architectures that are
+# supported by Fedora, which is why it is no longer required to set
+# "ExclusiveArch: rust_arches" for Rust packages in Fedora.
+%rust_arches x86_64 %{ix86} armv7hl aarch64 ppc64 ppc64le riscv64 s390x
+
+# version_no_tilde: lua macro for reconstructing the original crate version
+#       from the RPM version (i.e. replace any "~" characters with "-")
+%version_no_tilde() %{lua:
+    local sep = rpm.expand('%1')
+    local ver = rpm.expand('%2')
+\
+    if sep == '%1' then
+        sep = '-'
+    end
+\
+    if ver == '%2' then
+        ver = rpm.expand('%version')
+    end
+    ver = ver:gsub('~', sep)
+\
+    print(ver)
+}
+
+# __crates_url: default API endpoint for downloading .crate files from crates.io
+%__crates_url https://crates.io/api/v1/crates/
+
+# crates_source: lua macro for constructing the Source URL for a crate
+%crates_source() %{lua:
+    local crate = rpm.expand('%1')
+    local version = rpm.expand('%2')
+    local url = rpm.expand('%__crates_url')
+\
+    -- first argument missing: fall back to %crate
+    if crate == '%1' then
+        crate = rpm.expand('%crate')
+    end
+    -- %crate macro not defined: fall back to %name
+    if crate == '%crate' then
+        crate = rpm.expand('%name')
+    end
+\
+    -- second argument missing: fall back to %crate_version
+    if version == '%2' then
+        version = rpm.expand('%crate_version')
+    end
+    -- %crate_version macro not defined: fall back to %version
+    if version == '%crate_version' then
+        version = rpm.expand('%version')
+    end
+    -- replace '~' with '-' for backwards compatibility
+    -- can be removed in the future
+    version = version:gsub('~', '-')
+\
+    print(url .. crate .. '/' .. version .. '/download#/' .. crate .. '-' .. version .. '.crate')
+}
+
+# __cargo_skip_build: unused macro, set to 0 for backwards compatibility
+%__cargo_skip_build 0
+

macros.rust-toolset

@@ -29,6 +29,12 @@
 # -Copt-level: set optimization level (default: highest optimization level)
 # -Cdebuginfo: set debuginfo verbosity (default: full debug information)
 # -Ccodegen-units: set number of parallel code generation units (default: 1)
+# -Cforce-frame-pointers: force inclusion of frame pointers (default: enabled
+#       on x86_64 and aarch64 on Fedora 37+)
+#
+# Additionally, some linker flags are set which correspond to the default
+# Fedora compiler flags for hardening and for embedding package versions into
+# compiled binaries.
 #
 # ref. https://doc.rust-lang.org/rustc/codegen-options/index.html
 %build_rustflags %{shrink:
@@ -36,6 +42,8 @@
   -Cdebuginfo=%rustflags_debuginfo
   -Ccodegen-units=%rustflags_codegen_units
   -Cstrip=none
+  %{expr:0%{?_include_frame_pointers} && ("%{_arch}" != "ppc64le" && "%{_arch}" != "s390x" && "%{_arch}" != "i386") ? "-Cforce-frame-pointers=yes" : ""}
+  %[0%{?_package_note_status} ? "-Clink-arg=%_package_note_flags" : ""]
 }
 
 # __cargo: cargo command with environment variables
@@ -118,32 +126,31 @@ EOF}\
     %{nil}                                                      \
 }
 
-# NB: cargo_build/test/install do not use the -n/-a/-f argument parsing like
+# cargo_build: builds the crate with cargo with the specified feature flags
-# Fedora's rust-packaging, because that change would break anyone that's
+%cargo_build(naf:)\
-# already passing arguments directly to cargo after the macro. Instead, one can
-# explicitly use --no-default-features, --all-features, or --features XYZ.
-
-# cargo_build: builds the crate with cargo
-%cargo_build\
 %{shrink:                                               \
     %{__cargo} build                                    \
     %{__cargo_common_opts}                              \
     --profile rpm                                       \
+    %{__cargo_parse_opts %{-n} %{-a} %{-f:-f%{-f*}}}    \
+    %*                                                  \
 }
 
-# cargo_test: runs the test suite with cargo
+# cargo_test: runs the test suite with cargo with the specified feature flags
 #
 # To pass command-line arguments to the cargo test runners directly (for
-# example, to skip certain tests during package builds), the
+# example, to skip certain tests during package builds), both the cargo_test
-# "cargo test" argument parsing need to be bypassed,
+# macro argument parsing and "cargo test" argument parsing need to be bypassed,
-# i.e. "%%cargo_test -- --skip foo" for skipping all tests with names that
+# i.e. "%%cargo_test -- -- --skip foo" for skipping all tests with names that
 # match "foo".
-%cargo_test\
+%cargo_test(naf:)\
 %{shrink:                                               \
     %{__cargo} test                                     \
     %{__cargo_common_opts}                              \
     --profile rpm                                       \
     --no-fail-fast                                      \
+    %{__cargo_parse_opts %{-n} %{-a} %{-f:-f%{-f*}}}    \
+    %*                                                  \
 }
 
 # cargo_install: install files into the buildroot
@@ -153,14 +160,19 @@ EOF}\
 # "$CARGO_HOME/.crates.toml" file, which is used to keep track of which version
 # of a specific binary has been installed, but which conflicts between builds
 # of different Rust applications and is not needed when building RPM packages.
-%cargo_install\
+%cargo_install(t:naf:)\
-%{shrink:                                                         \
+(\
-  %{__cargo} install                                              \
+set -euo pipefail                                                   \
-    %{__cargo_common_opts}                                        \
+  %{shrink:                                                         \
-    --profile rpm                                                 \
+    %{__cargo} install                                              \
-    --no-track                                                    \
+      %{__cargo_common_opts}                                        \
-    --path .                                                      \
+      --profile rpm                                                 \
-}
+      --no-track                                                    \
+      --path .                                                      \
+      %{__cargo_parse_opts %{-n} %{-a} %{-f:-f%{-f*}}}              \
+      %*                                                            \
+  }                                                                 \
+)
 
 # cargo_license: print license information for all crate dependencies
 #

plans/ci.fmf

@@ -0,0 +1,5 @@
+summary: CI Gating Plan
+discover:
+    how: fmf
+execute:
+    how: tmt

rpminspect.yaml

@@ -0,0 +1,29 @@
+---
+debuginfo:
+    ignore:
+        # i686 has limited debuginfo. From rust.spec
+        # full debuginfo is exhausting memory; just do libstd for now
+        # https://github.com/rust-lang/rust/issues/45854
+        - /usr/lib/debug/usr/bin/rustc-*.i386.debug
+
+unicode:
+    ignore:
+        # These files are known to contain forbidden unicode chars as
+        # they are tests for those.
+        - rustc-*-src/tests/ui/lint/issue-90614-accept-allow-text-direction-codepoint-in-comment-lint.rs
+        - rustc-*-src/tests/ui/parser/unicode-control-codepoints.rs
+        - rustc-*-src/compiler/rustc_lint/src/hidden_unicode_codepoints.rs
+        - rustc-*-src/compiler/rustc_lint_defs/src/builtin.rs
+        - rustc-*-src/vendor/idna/tests/IdnaTestV2.txt
+        - rustc-*-src/vendor/idna-*/tests/IdnaTestV2.txt
+        - rustc-*-src/vendor/mdbook*/tests/dummy_book/src/first/unicode.md
+        - rustc-*-src/vendor/mdbook*/tests/searchindex_fixture.json
+        - rustc-*-src/vendor/mdbook*/tests/testsuite/search/reasonable_search_index/expected_index.js
+        - rustc-*-src/vendor/mdbook*/tests/testsuite/search/reasonable_search_index/src/first/unicode.md
+        - rustc-*-src/vendor/wast-*/tests/parse-fail/confusing-string?.wat
+        - rustc-*-src/vendor/wast-*/tests/parse-fail/confusing-block-comment?.wat
+        - rustc-*-src/vendor/wast-*/tests/parse-fail/confusing-line-comment?.wat
+        - rustc-*-src/src/llvm-project/clang-tools-extra/docs/clang-tidy/checks/misc/misleading-bidirectional.rst
+        - rustc-*-src/src/gcc/gcc/testsuite/c-c++-common/*Wbidi*.c
+        - rustc-*-src/tests/ui/parser/macro/unicode-control-codepoints-macros.rs
+        - rustc-*-src/tests/ui/parser/macro/auxiliary/unicode-control.rs

rust.spec

@@ -1,22 +1,22 @@
 Name:           rust
-Version:        1.84.1
+Version:        1.90.0
-Release:        2%{?dist}
+Release:        %autorelease
 Summary:        The Rust Programming Language
-License:        (Apache-2.0 OR MIT) AND (Artistic-2.0 AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0 AND Unicode-DFS-2016)
+License:        (Apache-2.0 OR MIT) AND (Artistic-2.0 AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0 AND Unicode-3.0)
 # ^ written as: (rust itself) and (bundled libraries)
 URL:            https://www.rust-lang.org
 
 # Only x86_64, i686, and aarch64 are Tier 1 platforms at this time.
 # https://doc.rust-lang.org/nightly/rustc/platform-support.html
-%global rust_arches x86_64 i686 aarch64 ppc64le s390x
+%global rust_arches x86_64 i686 armv7hl aarch64 ppc64le s390x riscv64
 ExclusiveArch:  %{rust_arches}
 
-# To bootstrap from scratch, set the channel and date from src/stage0.json
+# To bootstrap from scratch, set the channel and date from src/stage0
-# e.g. 1.59.0 wants rustc: 1.58.0-2022-01-13
+# e.g. 1.89.0 wants rustc: 1.88.0-2025-06-26
 # or nightly wants some beta-YYYY-MM-DD
-%global bootstrap_version 1.83.0
+%global bootstrap_version 1.89.0
-%global bootstrap_channel 1.83.0
+%global bootstrap_channel 1.89.0
-%global bootstrap_date 2024-11-28
+%global bootstrap_date 2025-08-07
 
 # Only the specified arches will use bootstrap binaries.
 # NOTE: Those binaries used to be uploaded with every new release, but that was
@@ -28,7 +28,7 @@ ExclusiveArch:  %{rust_arches}
 # We need CRT files for *-wasi targets, at least as new as the commit in
 # src/ci/docker/host-x86_64/dist-various-2/build-wasi-toolchain.sh
 %global wasi_libc_url https://github.com/WebAssembly/wasi-libc
-%global wasi_libc_ref wasi-sdk-25
+%global wasi_libc_ref wasi-sdk-27
 %global wasi_libc_name wasi-libc-%{wasi_libc_ref}
 %global wasi_libc_source %{wasi_libc_url}/archive/%{wasi_libc_ref}/%{wasi_libc_name}.tar.gz
 %global wasi_libc_dir %{_builddir}/%{wasi_libc_name}
@@ -42,18 +42,19 @@ ExclusiveArch:  %{rust_arches}
 %bcond_with llvm_static
 
 # We can also choose to just use Rust's bundled LLVM, in case the system LLVM
-# is insufficient.  Rust currently requires LLVM 18.0+.
+# is insufficient. Rust currently requires LLVM 19.0+.
-%global min_llvm_version 18.0.0
+# See src/bootstrap/src/core/build_steps/llvm.rs, fn check_llvm_version
-%global bundled_llvm_version 19.1.5
+%global min_llvm_version 19.0.0
-#global llvm_compat_version 17
+%global bundled_llvm_version 20.1.8
+#global llvm_compat_version 19
 %global llvm llvm%{?llvm_compat_version}
 %bcond_with bundled_llvm
 
-# Requires stable libgit2 1.8, and not the next minor soname change.
+# Requires stable libgit2 1.9, and not the next minor soname change.
 # This needs to be consistent with the bindings in vendor/libgit2-sys.
-%global min_libgit2_version 1.8.1
+%global min_libgit2_version 1.9.0
-%global next_libgit2_version 1.9.0~
+%global next_libgit2_version 1.10.0~
-%global bundled_libgit2_version 1.8.1
+%global bundled_libgit2_version 1.9.1
 %if 0%{?fedora} >= 41
 %bcond_with bundled_libgit2
 %else
@@ -61,7 +62,7 @@ ExclusiveArch:  %{rust_arches}
 %endif
 
 # Try to use system oniguruma (only used at build time for rust-docs)
-# src/tools/rustbook -> ... -> onig_sys v69.8.1 needs at least 6.9.3
+# src/tools/rustbook -> ... -> onig_sys v69.9.1 needs at least 6.9.3
 %global min_oniguruma_version 6.9.3
 %if 0%{?rhel} && 0%{?rhel} < 9
 %bcond_without bundled_oniguruma
@@ -71,7 +72,7 @@ ExclusiveArch:  %{rust_arches}
 
 # Cargo uses UPSERTs with omitted conflict targets
 %global min_sqlite3_version 3.35
-%global bundled_sqlite3_version 3.46.0
+%global bundled_sqlite3_version 3.49.2
 %if 0%{?rhel} && 0%{?rhel} < 10
 %bcond_without bundled_sqlite3
 %else
@@ -112,7 +113,7 @@ ExclusiveArch:  %{rust_arches}
 # Detect non-stable channels from the version, like 1.74.0~beta.1
 %{lua: do
   local version = rpm.expand("%{version}")
-  local version_channel, subs = string.gsub(version, "^.*~(%w+).*$", "%1", 1)
+  local version_channel, subs = version:gsub("^.*~(%w+).*$", "%1", 1)
   rpm.define("channel " .. (subs ~= 0 and version_channel or "stable"))
   rpm.define("rustc_package rustc-" .. version_channel .. "-src")
 end}
@@ -137,20 +138,29 @@ Patch4:         0001-bootstrap-allow-disabling-target-self-contained.patch
 Patch5:         0002-set-an-external-library-path-for-wasm32-wasi.patch
 
 # We don't want to use the bundled library in libsqlite3-sys
-Patch6:         rustc-1.84.0-unbundle-sqlite.patch
+Patch6:         rustc-1.90.0-unbundle-sqlite.patch
 
-# https://github.com/rust-lang/cc-rs/issues/1354
+# stage0 tries to copy all of /usr/lib, sometimes unsuccessfully, see #143735
-Patch7:         0001-Only-translate-profile-flags-for-Clang.patch
+Patch7:         0001-only-copy-rustlib-into-stage0-sysroot.patch
+
+# Support optimized-compiler-builtins via linking against compiler-rt builtins.
+# https://github.com/rust-lang/rust/pull/143689
+Patch8:         0001-Allow-linking-a-prebuilt-optimized-compiler-rt-built.patch
+
+# Fix a compiler stack overflow on ppc64le with PGO
+# https://github.com/rust-lang/rust/pull/145410
+Patch9:        0001-rustc_expand-ensure-stack-in-InvocationCollector-vis.patch
 
 ### RHEL-specific patches below ###
 
 # Simple rpm macros for rust-toolset (as opposed to full rust-packaging)
 Source100:      macros.rust-toolset
-Source101:      cargo_vendor.attr
+Source101:      macros.rust-srpm
-Source102:      cargo_vendor.prov
+Source102:      cargo_vendor.attr
+Source103:      cargo_vendor.prov
 
 # Disable cargo->libgit2->libssh2 on RHEL, as it's not approved for FIPS (rhbz1732949)
-Patch100:       rustc-1.84.0-disable-libssh2.patch
+Patch100:       rustc-1.90.0-disable-libssh2.patch
 
 # Get the Rust triple for any architecture and ABI.
 %{lua: function rust_triple(arch, abi)
@@ -201,7 +211,7 @@ end}
 %endif
 %global all_targets %{?mingw_targets} %{?wasm_targets} %{?extra_targets}
 %define target_enabled() %{lua:
-  print(string.find(rpm.expand(" %{all_targets} "), rpm.expand(" %1 "), 1, true) or 0)
+  print(rpm.expand(" %{all_targets} "):find(rpm.expand(" %1 "), 1, true) or 0)
 }
 
 %if %defined bootstrap_arches
@@ -209,7 +219,7 @@ end}
 # Also define bootstrap_source just for the current target.
 %{lua: do
   local bootstrap_arches = {}
-  for arch in string.gmatch(rpm.expand("%{bootstrap_arches}"), "%S+") do
+  for arch in rpm.expand("%{bootstrap_arches}"):gmatch("%S+") do
     table.insert(bootstrap_arches, arch)
   end
   local base = rpm.expand("https://static.rust-lang.org/dist/%{bootstrap_date}")
@@ -241,10 +251,8 @@ BuildRequires:  (%{name} >= %{bootstrap_version} with %{name} <= %{version})
 %endif
 
 BuildRequires:  make
-BuildRequires:  gcc-toolset-14-annobin-plugin-gcc
+BuildRequires:  gcc
-BuildRequires:  gcc-toolset-14-binutils
+BuildRequires:  gcc-c++
-BuildRequires:  gcc-toolset-14-gcc
-BuildRequires:  gcc-toolset-14-gcc-c++
 BuildRequires:  ncurses-devel
 # explicit curl-devel to avoid httpd24-curl (rhbz1540167)
 BuildRequires:  curl-devel
@@ -284,6 +292,7 @@ Provides:       bundled(llvm) = %{bundled_llvm_version}
 BuildRequires:  cmake >= 3.5.1
 %if %defined llvm_compat_version
 %global llvm_root %{_libdir}/%{llvm}
+%global llvm_path %{llvm_root}/bin
 %else
 %global llvm_root %{_prefix}
 %endif
@@ -291,6 +300,7 @@ BuildRequires:  %{llvm}-devel >= %{min_llvm_version}
 %if %with llvm_static
 BuildRequires:  %{llvm}-static
 BuildRequires:  libffi-devel
+BuildRequires:  libxml2-devel
 %endif
 %endif
 
@@ -299,6 +309,10 @@ BuildRequires:  procps-ng
 
 # debuginfo-gdb tests need gdb
 BuildRequires:  gdb
+# Work around https://bugzilla.redhat.com/show_bug.cgi?id=2275274:
+# gdb currently prints a "Unable to load 'rpm' module. Please install the python3-rpm package."
+# message that breaks version detection.
+BuildRequires:  python3-rpm
 
 # For src/test/run-make/static-pie
 BuildRequires:  glibc-static
@@ -310,7 +324,7 @@ Provides:       rustc%{?_isa} = %{version}-%{release}
 # Always require our exact standard library
 Requires:       %{name}-std-static%{?_isa} = %{version}-%{release}
 
-# The C compiler is needed at runtime just for linking.  Someday rustc might
+# The C compiler is needed at runtime just for linking. Someday rustc might
 # invoke the linker directly, and then we'll only need binutils.
 # https://github.com/rust-lang/rust/issues/11937
 Requires:       /usr/bin/cc
@@ -337,12 +351,6 @@ Requires:       /usr/bin/cc
 %global __brp_strip_static_archive %{nil}
 %global __brp_strip_lto %{nil}
 
-%if %{without bundled_llvm}
-%if "%{llvm_root}" == "%{_prefix}" || 0%{?scl:1}
-%global llvm_has_filecheck 1
-%endif
-%endif
-
 # We're going to override --libdir when configuring to get rustlib into a
 # common path, but we'll fix the shared libraries during install.
 %global common_libdir %{_prefix}/lib
@@ -361,11 +369,11 @@ BuildRequires:  mingw64-winpthreads-static
 
 %if %defined wasm_targets
 %if %with bundled_wasi_libc
-BuildRequires:  clang
+BuildRequires:  clang%{?llvm_compat_version}
 %else
 BuildRequires:  wasi-libc-static
 %endif
-BuildRequires:  lld
+BuildRequires:  lld%{?llvm_compat_version}
 %endif
 
 # For profiler_builtins
@@ -375,6 +383,32 @@ BuildRequires:  compiler-rt%{?llvm_compat_version}
 # https://github.com/rust-lang/rust/pull/101841
 Obsoletes:      %{name}-analysis < 1.69.0~
 
+# Experimenting with a fine-grained version of %%cargo_vendor_manifest,
+# so we can have different bundled provides for each tool subpackage.
+%define cargo_tree_manifest(n:m:f:t:) (       \
+  %{!-n:%{error:must specify a tool name}}    \
+  set -euo pipefail                           \
+  mkdir -p build/manifests/%{-n*}             \
+  %{shrink:                                   \
+    env RUSTC_BOOTSTRAP=1                     \
+      RUSTC=%{local_rust_root}/bin/rustc      \
+      %{local_rust_root}/bin/cargo tree       \
+      --offline --edges normal,build          \
+      --prefix none --format "{p}"            \
+      %{-m:--manifest-path %{-m*}/Cargo.toml} \
+      %{-f:--features %{-f*}}                 \
+      %{-t:--target %{-t*}}                   \
+      %*                                      \
+    | sed '/([*/]/d; s/ (proc-macro)$//'      \
+    | sort -u                                 \
+    >build/manifests/%{-n*}/cargo-vendor.txt  \
+  }                                           \
+)
+%ifnarch %{bootstrap_arches}
+%{?fedora:BuildRequires: cargo-rpm-macros}
+%{?rhel:BuildRequires: rust-toolset}
+%endif
+
 %description
 Rust is a systems programming language that runs blazingly fast, prevents
 segfaults, and guarantees thread safety.
@@ -483,6 +517,8 @@ Summary:        GDB pretty printers for Rust
 BuildArch:      noarch
 Requires:       gdb
 Requires:       %{name}-debugger-common = %{version}-%{release}
+# rust-gdb uses rustc to find the sysroot
+Requires:       %{name} = %{version}-%{release}
 
 %description gdb
 This package includes the rust-gdb script, which allows easier debugging of Rust
@@ -493,8 +529,10 @@ programs.
 Summary:        LLDB pretty printers for Rust
 BuildArch:      noarch
 Requires:       lldb
-Requires:       python3.12-lldb
+Requires:       python3-lldb
 Requires:       %{name}-debugger-common = %{version}-%{release}
+# rust-lldb uses rustc to find the sysroot
+Requires:       %{name} = %{version}-%{release}
 
 %description lldb
 This package includes the rust-lldb script, which allows easier debugging of Rust
@@ -529,10 +567,11 @@ Provides:       bundled(sqlite) = %{bundled_sqlite3_version}
 %endif
 # For tests:
 BuildRequires:  git-core
-# Cargo is not much use without Rust
+# Cargo is not much use without Rust, and it's worth keeping the versions
-Requires:       %{name}
+# in sync since some feature development depends on them together.
+Requires:       %{name} = %{version}-%{release}
 
-# "cargo vendor" is a builtin command starting with 1.37.  The Obsoletes and
+# "cargo vendor" is a builtin command starting with 1.37. The Obsoletes and
 # Provides are mostly relevant to RHEL, but harmless to have on Fedora/etc. too
 Obsoletes:      cargo-vendor <= 0.1.23
 Provides:       cargo-vendor = %{version}-%{release}
@@ -598,17 +637,31 @@ BuildArch:      noarch
 Recommends:     %{name}-std-static = %{version}-%{release}
 
 %description src
-This package includes source files for the Rust standard library.  It may be
+This package includes source files for the Rust standard library. It may be
 useful as a reference for code completion tools in various editors.
 
 
 %if 0%{?rhel}
 
+%package toolset-srpm-macros
+Summary:        RPM macros for building Rust source packages
+BuildArch:      noarch
+
+# This used to be from its own source package, versioned like rust2rpm.
+Obsoletes:      rust-srpm-macros < 18~
+Provides:       rust-srpm-macros = 25.2
+
+%description toolset-srpm-macros
+RPM macros for building source packages for Rust projects.
+
+
 %package toolset
 Summary:        Rust Toolset
 BuildArch:      noarch
 Requires:       rust = %{version}-%{release}
 Requires:       cargo = %{version}-%{release}
+Requires:       rust-toolset-srpm-macros = %{version}-%{release}
+Conflicts:      cargo-rpm-macros
 
 %description toolset
 This is the metapackage for Rust Toolset, bringing in the Rust compiler,
@@ -648,7 +701,9 @@ rm -rf %{wasi_libc_dir}/dlmalloc/
 %if %without bundled_sqlite3
 %patch -P6 -p1
 %endif
-%patch -P7 -p1 -d vendor/cc-1.2.5
+%patch -P7 -p1
+%patch -P8 -p1
+%patch -P9 -p1
 
 %if %with disabled_libssh2
 %patch -P100 -p1
@@ -668,7 +723,7 @@ mkdir -p src/llvm-project/libunwind/
 # Remove submodules we don't need.
 rm -rf src/gcc
 rm -rf src/tools/enzyme
-rm -rf src/tools/rustc-perf
+rm -rf src/tools/rustc-perf/collector/*-benchmarks/
 
 # Remove other unused vendored libraries. This leaves the directory in place,
 # because some build scripts watch them, e.g. "cargo:rerun-if-changed=curl".
@@ -705,12 +760,12 @@ sed -i.lzma -e '/LZMA_API_STATIC/d' src/bootstrap/src/core/build_steps/tool.rs
 %if %{without bundled_llvm} && %{with llvm_static}
 # Static linking to distro LLVM needs to add -lffi
 # https://github.com/rust-lang/rust/issues/34486
-sed -i.ffi -e '$a #[link(name = "ffi")] extern {}' \
+sed -i.ffi -e '$a #[link(name = "ffi")] extern "C" {}' \
   compiler/rustc_llvm/src/lib.rs
 %endif
 
 # The configure macro will modify some autoconf-related files, which upsets
-# cargo when it tries to verify checksums in those files.  If we just truncate
+# cargo when it tries to verify checksums in those files. If we just truncate
 # that file list, cargo won't have anything to complain about.
 find vendor -name .cargo-checksum.json \
   -exec sed -i.uncheck -e 's/"files":{[^}]*}/"files":{ }/' '{}' '+'
@@ -746,15 +801,16 @@ end}
   %{!?with_bundled_oniguruma:RUSTONIG_SYSTEM_LIBONIG=1}
   %{!?with_bundled_sqlite3:LIBSQLITE3_SYS_USE_PKG_CONFIG=1}
   %{!?with_disabled_libssh2:LIBSSH2_SYS_USE_PKG_CONFIG=1}
+  %{?llvm_path:PATH="%{llvm_path}:$PATH"}
 }
-%global export_rust_env export %{rust_env} ; source /opt/rh/gcc-toolset-14/enable
+%global export_rust_env export %{rust_env}
 
 %build
 %{export_rust_env}
 
 # Some builders have relatively little memory for their CPU count.
 # At least 4GB per CPU is a good rule of thumb for building rustc.
-%if ! %defined constrain_build
+%if %undefined constrain_build
 %define constrain_build(m:) %{lua:
   for l in io.lines('/proc/meminfo') do
     if l:sub(1, 9) == "MemTotal:" then
@@ -801,15 +857,20 @@ end}
 %endif
 %endif
 
-# Find the compiler-rt library for the Rust profiler_builtins crate.
+# Find the compiler-rt library for the Rust profiler_builtins and optimized-builtins crates.
-%if %defined llvm_compat_version
+%define clang_lib %{expand:%%clang%{?llvm_compat_version}_resource_dir}/lib
-# clang_resource_dir is not defined for compat builds.
+%define profiler %{clang_lib}/%{_arch}-redhat-linux-gnu/libclang_rt.profile.a
-%define profiler /usr/lib/clang/%{llvm_compat_version}/lib/%{_arch}-redhat-linux-gnu/libclang_rt.profile.a
-%else
-%define profiler %{clang_resource_dir}/lib/%{_arch}-redhat-linux-gnu/libclang_rt.profile.a
-%endif
 test -r "%{profiler}"
 
+# llvm < 21 does not provide a builtins library for s390x.
+%if "%{_arch}" != "s390x" || 0%{?clang_major_version} >= 21
+%define optimized_builtins %{clang_lib}/%{_arch}-redhat-linux-gnu/libclang_rt.builtins.a
+test -r "%{optimized_builtins}"
+%else
+%define optimized_builtins false
+%endif
+
+
 %configure --disable-option-checking \
   --docdir=%{_pkgdocdir} \
   --libdir=%{common_libdir} \
@@ -820,13 +881,13 @@ test -r "%{profiler}"
   --set target.%{rust_triple}.ar=%{__ar} \
   --set target.%{rust_triple}.ranlib=%{__ranlib} \
   --set target.%{rust_triple}.profiler="%{profiler}" \
+  --set target.%{rust_triple}.optimized-compiler-builtins="%{optimized_builtins}" \
   %{?mingw_target_config} \
   %{?wasm_target_config} \
   --python=%{__python3} \
   --local-rust-root=%{local_rust_root} \
   --set build.rustfmt=/bin/true \
   %{!?with_bundled_llvm: --llvm-root=%{llvm_root} \
-    %{!?llvm_has_filecheck: --disable-codegen-tests} \
     %{!?with_llvm_static: --enable-llvm-link-shared } } \
   --disable-llvm-static-stdcpp \
   --disable-llvm-bitcode-linker \
@@ -841,8 +902,9 @@ test -r "%{profiler}"
   --set build.test-stage=2 \
   --set build.optimized-compiler-builtins=false \
   --set rust.llvm-tools=false \
+  --set rust.verify-llvm-ir=true \
   --enable-extended \
-  --tools=cargo,clippy,rls,rust-analyzer,rustfmt,src \
+  --tools=cargo,clippy,rust-analyzer,rustfmt,src \
   --enable-vendor \
   --enable-verbose-tests \
   --release-channel=%{channel} \
@@ -850,17 +912,24 @@ test -r "%{profiler}"
 
 %global __x %{__python3} ./x.py
 
-%if %with rustc_pgo
+# pgo on ppc64le is enabled in fedora, but it had exposed bugs in
+# llvm codgen on ppc64le which have since been fixed. It should be
+# turned on in 1.91 if no new issues are found.
+%if %{with rustc_pgo} && !( "%{_target_cpu}" == "ppc64le" )
 # Build the compiler with profile instrumentation
 %define profraw $PWD/build/profiles
 %define profdata $PWD/build/rustc.profdata
 mkdir -p "%{profraw}"
 %{__x} build sysroot --rust-profile-generate="%{profraw}"
 # Build cargo as a workload to generate compiler profiles
+# We normally use `x.py`, but in this case we invoke the stage 2 compiler and libs
+# directly to ensure we use the instrumented compiler.
 env LLVM_PROFILE_FILE="%{profraw}/default_%%m_%%p.profraw" \
-  %{__x} --keep-stage=0 --keep-stage=1 build cargo
+  LD_LIBRARY_PATH=$PWD/build/host/stage2/lib \
+  RUSTC=$PWD/build/host/stage2/bin/rustc \
+  cargo build --manifest-path=src/tools/cargo/Cargo.toml
 # Finalize the profile data and clean up the raw files
-%{llvm_root}/bin/llvm-profdata merge -o "%{profdata}" "%{profraw}"
+llvm-profdata merge -o "%{profdata}" "%{profraw}"
 rm -r "%{profraw}" build/%{rust_triple}/stage2*/
 # Redefine the macro to use that profile data from now on
 %global __x %{__x} --rust-profile-use="%{profdata}"
@@ -877,6 +946,21 @@ for triple in %{?all_targets} ; do
   %{__x} build --target=$triple std
 done
 
+# Collect cargo-vendor.txt for each tool and std
+%{cargo_tree_manifest -n rustc -- -p rustc-main -p rustdoc}
+%{cargo_tree_manifest -n cargo -m src/tools/cargo}
+%{cargo_tree_manifest -n clippy -m src/tools/clippy}
+%{cargo_tree_manifest -n rust-analyzer -m src/tools/rust-analyzer}
+%{cargo_tree_manifest -n rustfmt -m src/tools/rustfmt}
+
+%{cargo_tree_manifest -n std -m library -f backtrace}
+for triple in %{?all_targets} ; do
+  case $triple in
+    *-none*) %{cargo_tree_manifest -n std-$triple -m library/alloc -t $triple} ;;
+    *) %{cargo_tree_manifest -n std-$triple -m library -f backtrace -t $triple} ;;
+  esac
+done
+
 %install
 %if 0%{?rhel} && 0%{?rhel} <= 9
 %{?set_build_flags}
@@ -889,9 +973,6 @@ for triple in %{?all_targets} ; do
   DESTDIR=%{buildroot} %{__x} install --target=$triple std
 done
 
-# The rls stub doesn't have an install target, but we can just copy it.
-%{__install} -t %{buildroot}%{_bindir} build/%{rust_triple}/stage2-tools-bin/rls
-
 # These are transient files used by x.py dist and install
 rm -rf ./build/dist/ ./build/tmp/
 
@@ -953,8 +1034,9 @@ rm -f %{buildroot}%{rustlibdir}/%{rust_triple}/bin/rust-ll*
 %if 0%{?rhel}
 # This allows users to build packages using Rust Toolset.
 %{__install} -D -m 644 %{S:100} %{buildroot}%{rpmmacrodir}/macros.rust-toolset
-%{__install} -D -m 644 %{S:101} %{buildroot}%{_fileattrsdir}/cargo_vendor.attr
+%{__install} -D -m 644 %{S:101} %{buildroot}%{rpmmacrodir}/macros.rust-srpm
-%{__install} -D -m 755 %{S:102} %{buildroot}%{_rpmconfigdir}/cargo_vendor.prov
+%{__install} -D -m 644 %{S:102} %{buildroot}%{_fileattrsdir}/cargo_vendor.attr
+%{__install} -D -m 755 %{S:103} %{buildroot}%{_rpmconfigdir}/cargo_vendor.prov
 %endif
 
 
@@ -992,22 +1074,21 @@ rm -rf "$TMP_HELLO"
 # - Crashes are excluded because they are less reliable, especially stuff like
 #   SIGSEGV across different arches -- UB can do all kinds of weird things.
 #   They're only meant to notice "accidental" fixes anyway, not *should* crash.
-timeout -v 90m %{__x} test --no-fail-fast --skip={src/bootstrap,tests/crashes} || :
+%{__x} test --no-fail-fast --skip={src/bootstrap,tests/crashes} || :
 rm -rf "./build/%{rust_triple}/test/"
 
 %ifarch aarch64
 # https://github.com/rust-lang/rust/issues/123733
 %define cargo_test_skip --test-args "--skip panic_abort_doc_tests"
 %endif
-timeout -v 30m %{__x} test --no-fail-fast cargo %{?cargo_test_skip} || :
+%{__x} test --no-fail-fast cargo %{?cargo_test_skip} || :
 rm -rf "./build/%{rust_triple}/stage2-tools/%{rust_triple}/cit/"
 
-timeout -v 30m %{__x} test --no-fail-fast clippy || :
+%{__x} test --no-fail-fast clippy || :
 
-timeout -v 30m %{__x} test --no-fail-fast rust-analyzer || :
+%{__x} test --no-fail-fast rust-analyzer || :
-
-timeout -v 30m %{__x} test --no-fail-fast rustfmt || :
 
+%{__x} test --no-fail-fast rustfmt || :
 
 %ldconfig_scriptlets
 
@@ -1021,6 +1102,9 @@ timeout -v 30m %{__x} test --no-fail-fast rustfmt || :
 %{_libexecdir}/rust-analyzer-proc-macro-srv
 %{_mandir}/man1/rustc.1*
 %{_mandir}/man1/rustdoc.1*
+%license build/manifests/rustc/cargo-vendor.txt
+%license %{_pkgdocdir}/COPYRIGHT.html
+%license %{_pkgdocdir}/licenses/
 
 
 %files std-static
@@ -1029,13 +1113,16 @@ timeout -v 30m %{__x} test --no-fail-fast rustfmt || :
 %dir %{rustlibdir}/%{rust_triple}/lib
 %{rustlibdir}/%{rust_triple}/lib/*.rlib
 %{rustlibdir}/%{rust_triple}/lib/*.so
+%license build/manifests/std/cargo-vendor.txt
+%license %{_pkgdocdir}/COPYRIGHT-library.html
 
 %global target_files()      \
 %files std-static-%1        \
 %dir %{rustlibdir}          \
 %dir %{rustlibdir}/%1       \
 %dir %{rustlibdir}/%1/lib   \
-%{rustlibdir}/%1/lib/*.rlib
+%{rustlibdir}/%1/lib/*.rlib \
+%license build/manifests/std-%1/cargo-vendor.txt
 
 %if %target_enabled i686-pc-windows-gnu
 %target_files i686-pc-windows-gnu
@@ -1117,6 +1204,7 @@ timeout -v 30m %{__x} test --no-fail-fast rustfmt || :
 %{_datadir}/zsh/site-functions/_cargo
 %dir %{_datadir}/cargo
 %dir %{_datadir}/cargo/registry
+%license build/manifests/cargo/cargo-vendor.txt
 
 
 %files -n rustfmt
@@ -1124,13 +1212,14 @@ timeout -v 30m %{__x} test --no-fail-fast rustfmt || :
 %{_bindir}/cargo-fmt
 %doc src/tools/rustfmt/{README,CHANGELOG,Configurations}.md
 %license src/tools/rustfmt/LICENSE-{APACHE,MIT}
+%license build/manifests/rustfmt/cargo-vendor.txt
 
 
 %files analyzer
-%{_bindir}/rls
 %{_bindir}/rust-analyzer
 %doc src/tools/rust-analyzer/README.md
 %license src/tools/rust-analyzer/LICENSE-{APACHE,MIT}
+%license build/manifests/rust-analyzer/cargo-vendor.txt
 
 
 %files -n clippy
@@ -1138,6 +1227,7 @@ timeout -v 30m %{__x} test --no-fail-fast rustfmt || :
 %{_bindir}/clippy-driver
 %doc src/tools/clippy/{README.md,CHANGELOG.md}
 %license src/tools/clippy/LICENSE-{APACHE,MIT}
+%license build/manifests/clippy/cargo-vendor.txt
 
 
 %files src
@@ -1146,6 +1236,9 @@ timeout -v 30m %{__x} test --no-fail-fast rustfmt || :
 
 
 %if 0%{?rhel}
+%files toolset-srpm-macros
+%{rpmmacrodir}/macros.rust-srpm
+
 %files toolset
 %{rpmmacrodir}/macros.rust-toolset
 %{_fileattrsdir}/cargo_vendor.attr
@@ -1154,312 +1247,4 @@ timeout -v 30m %{__x} test --no-fail-fast rustfmt || :
 
 
 %changelog
-* Mon Apr 28 2025 Josh Stone <jistone@redhat.com> - 1.84.1-2
+%autochangelog
-- Use python3.12 prefix for lldb Requires
-
-* Tue Feb 04 2025 Josh Stone <jistone@redhat.com> - 1.84.1-1
-- Update to 1.84.1
-
-* Wed Jan 15 2025 Josh Stone <jistone@redhat.com> - 1.84.0-1
-- Update to 1.84.0
-
-* Thu Dec 05 2024 Josh Stone <jistone@redhat.com> - 1.83.0-1
-- Update to 1.83.0
-- Remove the subshell in the cargo_install macro
-
-* Tue Nov 05 2024 Josh Stone <jistone@redhat.com> - 1.82.0-1
-- Update to 1.82.0
-
-* Fri Oct 25 2024 Josh Stone <jistone@redhat.com> - 1.81.0-1
-- Update to 1.81.0
-
-* Tue Oct 22 2024 Josh Stone <jistone@redhat.com> - 1.80.1-1
-- Update to 1.80.1
-
-* Tue Aug 13 2024 Josh Stone <jistone@redhat.com> - 1.79.0-2
-- Disable jump threading of float equality
-
-* Fri Jun 21 2024 Josh Stone <jistone@redhat.com> - 1.79.0-1
-- Update to 1.79.0
-
-* Fri Jun 21 2024 Josh Stone <jistone@redhat.com> - 1.78.0-1
-- Update to 1.78.0
-- Make std-static-wasm* noarch again
-
-* Thu May 09 2024 Josh Stone <jistone@redhat.com> - 1.77.2-1
-- Update to 1.77.2.
-
-* Wed Apr 17 2024 Josh Stone <jistone@redhat.com> - 1.76.0-1
-- Update to 1.76.0.
-- Sync rust-toolset macros to rust-packaging v25.2
-
-* Fri Jan 05 2024 Josh Stone <jistone@redhat.com> - 1.75.0-1
-- Update to 1.75.0.
-
-* Wed Jan 03 2024 Josh Stone <jistone@redhat.com> - 1.74.1-1
-- Update to 1.74.1.
-
-* Tue Oct 17 2023 Josh Stone <jistone@redhat.com> - 1.73.0-1
-- Update to 1.73.0.
-- Use emmalloc instead of CC0 dlmalloc when bundling wasi-libc
-
-* Thu Oct 12 2023 Josh Stone <jistone@redhat.com> - 1.72.1-1
-- Update to 1.72.1.
-- Migrated to SPDX license
-
-* Tue Aug 08 2023 Josh Stone <jistone@redhat.com> - 1.71.1-1
-- Update to 1.71.1.
-- Security fix for CVE-2023-38497
-
-* Wed Jul 26 2023 Josh Stone <jistone@redhat.com> - 1.71.0-2
-- Relax the suspicious_double_ref_op lint (rhbz2225471)
-- Enable the profiler runtime for native hosts (rhbz2213875)
-
-* Thu Jul 20 2023 Josh Stone <jistone@redhat.com> - 1.71.0-1
-- Update to 1.71.0.
-
-* Tue Jul 18 2023 Josh Stone <jistone@redhat.com> - 1.70.0-1
-- Update to 1.70.0.
-
-* Fri May 26 2023 Josh Stone <jistone@redhat.com> - 1.69.0-1
-- Update to 1.69.0.
-- Obsolete rust-analysis.
-
-* Fri May 19 2023 Josh Stone <jistone@redhat.com> - 1.68.2-1
-- Update to 1.68.2.
-
-* Thu May 18 2023 Josh Stone <jistone@redhat.com> - 1.67.1-1
-- Update to 1.67.1.
-
-* Wed Jan 11 2023 Josh Stone <jistone@redhat.com> - 1.66.1-1
-- Update to 1.66.1.
-
-* Fri Jan 06 2023 Josh Stone <jistone@redhat.com> - 1.65.0-1
-- Update to 1.65.0.
-- rust-analyzer now obsoletes rls.
-
-* Thu Sep 22 2022 Josh Stone <jistone@redhat.com> - 1.64.0-1
-- Update to 1.64.0.
-- Add rust-analyzer.
-
-* Wed Sep 07 2022 Josh Stone <jistone@redhat.com> - 1.63.0-1
-- Update to 1.63.0.
-
-* Tue Jul 19 2022 Josh Stone <jistone@redhat.com> - 1.62.1-1
-- Update to 1.62.1.
-
-* Wed Jul 13 2022 Josh Stone <jistone@redhat.com> - 1.62.0-2
-- Prevent unsound coercions from functions with opaque return types.
-
-* Thu Jun 30 2022 Josh Stone <jistone@redhat.com> - 1.62.0-1
-- Update to 1.62.0.
-
-* Fri Jun 03 2022 Josh Stone <jistone@redhat.com> - 1.61.0-1
-- Update to 1.61.0.
-- Add rust-toolset as a subpackage.
-
-* Wed Apr 20 2022 Josh Stone <jistone@redhat.com> - 1.60.0-1
-- Update to 1.60.0.
-
-* Tue Apr 19 2022 Josh Stone <jistone@redhat.com> - 1.59.0-1
-- Update to 1.59.0.
-
-* Thu Jan 20 2022 Josh Stone <jistone@redhat.com> - 1.58.1-1
-- Update to 1.58.1.
-
-* Thu Jan 13 2022 Josh Stone <jistone@redhat.com> - 1.58.0-1
-- Update to 1.58.0.
-
-* Wed Dec 15 2021 Josh Stone <jistone@redhat.com> - 1.57.0-1
-- Update to 1.57.0.
-
-* Thu Dec 02 2021 Josh Stone <jistone@redhat.com> - 1.56.1-2
-- Add rust-std-static-wasm32-wasi
-  Resolves: rhbz#1980080
-
-* Tue Nov 02 2021 Josh Stone <jistone@redhat.com> - 1.56.0-1
-- Update to 1.56.1.
-
-* Fri Oct 29 2021 Josh Stone <jistone@redhat.com> - 1.55.0-1
-- Update to 1.55.0.
-- Backport support for LLVM 13.
-
-* Tue Aug 17 2021 Josh Stone <jistone@redhat.com> - 1.54.0-2
-- Make std-static-wasm* arch-specific to avoid s390x.
-
-* Thu Jul 29 2021 Josh Stone <jistone@redhat.com> - 1.54.0-1
-- Update to 1.54.0.
-
-* Tue Jul 20 2021 Josh Stone <jistone@redhat.com> - 1.53.0-2
-- Use llvm-ranlib to fix wasm archives.
-
-* Mon Jun 21 2021 Josh Stone <jistone@redhat.com> - 1.53.0-1
-- Update to 1.53.0.
-
-* Tue Jun 15 2021 Josh Stone <jistone@redhat.com> - 1.52.1-2
-- Set rust.codegen-units-std=1 for all targets again.
-- Add rust-std-static-wasm32-unknown-unknown.
-
-* Tue May 25 2021 Josh Stone <jistone@redhat.com> - 1.52.1-1
-- Update to 1.52.1. Includes security fixes for CVE-2020-36323,
-  CVE-2021-28876, CVE-2021-28878, CVE-2021-28879, and CVE-2021-31162.
-
-* Mon May 24 2021 Josh Stone <jistone@redhat.com> - 1.51.0-1
-- Update to 1.51.0. Update to 1.51.0. Includes security fixes for
-  CVE-2021-28875 and CVE-2021-28877.
-
-* Mon May 24 2021 Josh Stone <jistone@redhat.com> - 1.50.0-1
-- Update to 1.50.0.
-
-* Wed Jan 13 2021 Josh Stone <jistone@redhat.com> - 1.49.0-1
-- Update to 1.49.0.
-
-* Tue Jan 12 2021 Josh Stone <jistone@redhat.com> - 1.48.0-1
-- Update to 1.48.0.
-
-* Thu Oct 22 2020 Josh Stone <jistone@redhat.com> - 1.47.0-1
-- Update to 1.47.0.
-
-* Wed Oct 14 2020 Josh Stone <jistone@redhat.com> - 1.46.0-1
-- Update to 1.46.0.
-
-* Tue Aug 04 2020 Josh Stone <jistone@redhat.com> - 1.45.2-1
-- Update to 1.45.2.
-
-* Thu Jul 16 2020 Josh Stone <jistone@redhat.com> - 1.45.0-1
-- Update to 1.45.0.
-
-* Tue Jul 14 2020 Josh Stone <jistone@redhat.com> - 1.44.1-1
-- Update to 1.44.1.
-
-* Thu May 07 2020 Josh Stone <jistone@redhat.com> - 1.43.1-1
-- Update to 1.43.1.
-
-* Thu Apr 23 2020 Josh Stone <jistone@redhat.com> - 1.43.0-1
-- Update to 1.43.0.
-
-* Thu Mar 12 2020 Josh Stone <jistone@redhat.com> - 1.42.0-1
-- Update to 1.42.0.
-
-* Thu Feb 27 2020 Josh Stone <jistone@redhat.com> - 1.41.1-1
-- Update to 1.41.1.
-
-* Thu Jan 30 2020 Josh Stone <jistone@redhat.com> - 1.41.0-1
-- Update to 1.41.0.
-
-* Thu Jan 16 2020 Josh Stone <jistone@redhat.com> - 1.40.0-1
-- Update to 1.40.0.
-- Fix compiletest with newer (local-rebuild) libtest
-- Build compiletest with in-tree libtest
-- Fix ARM EHABI unwinding
-
-* Tue Nov 12 2019 Josh Stone <jistone@redhat.com> - 1.39.0-2
-- Fix a couple build and test issues with rustdoc.
-
-* Thu Nov 07 2019 Josh Stone <jistone@redhat.com> - 1.39.0-1
-- Update to 1.39.0.
-
-* Thu Sep 26 2019 Josh Stone <jistone@redhat.com> - 1.38.0-1
-- Update to 1.38.0.
-
-* Thu Aug 15 2019 Josh Stone <jistone@redhat.com> - 1.37.0-1
-- Update to 1.37.0.
-- Disable libssh2 (git+ssh support).
-
-* Thu Jul 04 2019 Josh Stone <jistone@redhat.com> - 1.36.0-1
-- Update to 1.36.0.
-
-* Wed May 29 2019 Josh Stone <jistone@redhat.com> - 1.35.0-2
-- Fix compiletest for rebuild testing.
-
-* Thu May 23 2019 Josh Stone <jistone@redhat.com> - 1.35.0-1
-- Update to 1.35.0.
-
-* Tue May 14 2019 Josh Stone <jistone@redhat.com> - 1.34.2-1
-- Update to 1.34.2 -- fixes CVE-2019-12083.
-
-* Thu May 09 2019 Josh Stone <jistone@redhat.com> - 1.34.1-1
-- Update to 1.34.1.
-
-* Thu Apr 11 2019 Josh Stone <jistone@redhat.com> - 1.34.0-1
-- Update to 1.34.0.
-
-* Wed Apr 10 2019 Josh Stone <jistone@redhat.com> - 1.33.0-1
-- Update to 1.33.0.
-
-* Tue Apr 09 2019 Josh Stone <jistone@redhat.com> - 1.32.0-1
-- Update to 1.32.0.
-
-* Fri Dec 14 2018 Josh Stone <jistone@redhat.com> - 1.31.0-5
-- Restore rust-lldb.
-
-* Thu Dec 13 2018 Josh Stone <jistone@redhat.com> - 1.31.0-4
-- Backport fixes for rls.
-
-* Thu Dec 13 2018 Josh Stone <jistone@redhat.com> - 1.31.0-3
-- Update to 1.31.0 -- Rust 2018!
-- clippy/rls/rustfmt are no longer -preview
-
-* Wed Dec 12 2018 Josh Stone <jistone@redhat.com> - 1.30.1-2
-- Update to 1.30.1.
-
-* Tue Nov 06 2018 Josh Stone <jistone@redhat.com> - 1.29.2-1
-- Update to 1.29.2.
-
-* Thu Nov 01 2018 Josh Stone <jistone@redhat.com> - 1.28.0-1
-- Update to 1.28.0.
-
-* Thu Nov 01 2018 Josh Stone <jistone@redhat.com> - 1.27.2-1
-- Update to 1.27.2.
-
-* Wed Oct 10 2018 Josh Stone <jistone@redhat.com> - 1.26.2-12
-- Fix "fp" target feature for AArch64 (#1632880)
-
-* Mon Oct 08 2018 Josh Stone <jistone@redhat.com> - 1.26.2-11
-- Security fix for str::repeat (pending CVE).
-
-* Fri Oct 05 2018 Josh Stone <jistone@redhat.com> - 1.26.2-10
-- Rebuild without bootstrap binaries.
-
-* Thu Oct 04 2018 Josh Stone <jistone@redhat.com> - 1.26.2-9
-- Bootstrap without SCL packaging. (rhbz1635067)
-
-* Tue Aug 28 2018 Tom Stellard <tstellar@redhat.com> - 1.26.2-8
-- Use python3 prefix for lldb Requires
-
-* Mon Aug 13 2018 Josh Stone <jistone@redhat.com> - 1.26.2-7
-- Build with platform-python
-
-* Tue Aug 07 2018 Josh Stone <jistone@redhat.com> - 1.26.2-6
-- Exclude rust-src from auto-requires
-
-* Thu Aug 02 2018 Josh Stone <jistone@redhat.com> - 1.26.2-5
-- Rebuild without bootstrap binaries.
-
-* Tue Jul 31 2018 Josh Stone <jistone@redhat.com> - 1.26.2-4
-- Bootstrap as a module.
-
-* Mon Jun 04 2018 Josh Stone <jistone@redhat.com> - 1.26.2-3
-- Update to 1.26.2.
-
-* Wed May 30 2018 Josh Stone <jistone@redhat.com> - 1.26.1-2
-- Update to 1.26.1.
-
-* Fri May 18 2018 Josh Stone <jistone@redhat.com> - 1.26.0-1
-- Update to 1.26.0.
-
-* Tue Apr 10 2018 Josh Stone <jistone@redhat.com> - 1.25.0-2
-- Filter codegen-backends from Provides too.
-
-* Tue Apr 03 2018 Josh Stone <jistone@redhat.com> - 1.25.0-1
-- Update to 1.25.0.
-- Add rustfmt-preview as a subpackage.
-
-* Thu Feb 22 2018 Josh Stone <jistone@redhat.com> - 1.24.0-1
-- Update to 1.24.0.
-
-* Tue Jan 16 2018 Josh Stone <jistone@redhat.com> - 1.23.0-2
-- Rebuild without bootstrap binaries.
-
-* Mon Jan 15 2018 Josh Stone <jistone@redhat.com> - 1.23.0-1
-- Bootstrap 1.23 on el8.

rustc-1.90.0-disable-libssh2.patch

@@ -0,0 +1,44 @@
+diff -up rustc-beta-src/src/tools/cargo/Cargo.lock.orig rustc-beta-src/src/tools/cargo/Cargo.lock
+--- rustc-beta-src/src/tools/cargo/Cargo.lock.orig	2025-08-16 15:47:14.000000000 -0700
++++ rustc-beta-src/src/tools/cargo/Cargo.lock	2025-08-18 17:31:39.554771554 -0700
+@@ -2800,7 +2800,6 @@ checksum = "1c42fe03df2bd3c53a3a9c7317ad
+ dependencies = [
+  "cc",
+  "libc",
+- "libssh2-sys",
+  "libz-sys",
+  "openssl-sys",
+  "pkg-config",
+@@ -2847,20 +2846,6 @@ dependencies = [
+  "pkg-config",
+  "vcpkg",
+ ]
+-
+-[[package]]
+-name = "libssh2-sys"
+-version = "0.3.1"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "220e4f05ad4a218192533b300327f5150e809b54c4ec83b5a1d91833601811b9"
+-dependencies = [
+- "cc",
+- "libc",
+- "libz-sys",
+- "openssl-sys",
+- "pkg-config",
+- "vcpkg",
+-]
+ 
+ [[package]]
+ name = "libz-rs-sys"
+diff -up rustc-beta-src/src/tools/cargo/Cargo.toml.orig rustc-beta-src/src/tools/cargo/Cargo.toml
+--- rustc-beta-src/src/tools/cargo/Cargo.toml.orig	2025-08-16 15:47:14.000000000 -0700
++++ rustc-beta-src/src/tools/cargo/Cargo.toml	2025-08-18 17:33:02.401743230 -0700
+@@ -46,7 +46,7 @@ curl = "0.4.48"
+ curl-sys = "0.4.82"
+ filetime = "0.2.25"
+ flate2 = { version = "1.1.2", default-features = false, features = ["zlib-rs"] }
+-git2 = "0.20.2"
++git2 = { version = "0.20.2", default-features = false, features = ["https"] }
+ git2-curl = "0.21.0"
+ # When updating this, also see if `gix-transport` further down needs updating or some auth-related tests will fail.
+ gix = { version = "0.73.0", default-features = false, features = ["progress-tree", "parallel", "dirwalk", "status"] }

rustc-1.90.0-unbundle-sqlite.patch

@@ -0,0 +1,23 @@
+diff -up rustc-beta-src/src/tools/cargo/Cargo.lock.orig rustc-beta-src/src/tools/cargo/Cargo.lock
+--- rustc-beta-src/src/tools/cargo/Cargo.lock.orig	2025-08-16 15:47:14.000000000 -0700
++++ rustc-beta-src/src/tools/cargo/Cargo.lock	2025-08-18 17:17:50.150641231 -0700
+@@ -2843,7 +2843,6 @@ version = "0.34.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "91632f3b4fb6bd1d72aa3d78f41ffecfcf2b1a6648d8c241dbe7dbfaf4875e15"
+ dependencies = [
+- "cc",
+  "pkg-config",
+  "vcpkg",
+ ]
+diff -up rustc-beta-src/src/tools/cargo/Cargo.toml.orig rustc-beta-src/src/tools/cargo/Cargo.toml
+--- rustc-beta-src/src/tools/cargo/Cargo.toml.orig	2025-08-16 15:47:14.000000000 -0700
++++ rustc-beta-src/src/tools/cargo/Cargo.toml	2025-08-18 17:17:46.729082558 -0700
+@@ -81,7 +81,7 @@ proptest = "1.7.0"
+ pulldown-cmark = { version = "0.13.0", default-features = false, features = ["html"] }
+ rand = "0.9.1"
+ regex = "1.11.1"
+-rusqlite = { version = "0.36.0", features = ["bundled"] }
++rusqlite = { version = "0.36.0", features = [] }
+ rustc-hash = "2.1.1"
+ rustc-stable-hash = "0.1.2"
+ rustfix = { version = "0.9.2", path = "crates/rustfix" }

sources

@@ -0,0 +1,2 @@
+SHA512 (wasi-libc-wasi-sdk-27.tar.gz) = dfc2c36fabf32f465fc833ed0b10efffc9a35c68162ecc3e8d656d1d684d170b734d55e790614d12d925d17f49d60f0d2d01c46cecac941cf62d68eda84df13e
+SHA512 (rustc-1.90.0-src.tar.xz) = fb0798b4c7450754db2fcbb641202909d209c6db2d9181d7df7282217b8320dc52f5e9853de9d7bdb79177f1f920389450cab07674dea5fb5501eaab5816662a

tests/Sanity/basic-smoke/Makefile

@@ -0,0 +1,63 @@
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Makefile of /tools/rust/Sanity/basic-smoke
+#   Description: basic-smoke
+#   Author: Martin Cermak <mcermak@redhat.com>
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Copyright (c) 2017 Red Hat, Inc.
+#
+#   This program is free software: you can redistribute it and/or
+#   modify it under the terms of the GNU General Public License as
+#   published by the Free Software Foundation, either version 2 of
+#   the License, or (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be
+#   useful, but WITHOUT ANY WARRANTY; without even the implied
+#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+#   PURPOSE.  See the GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program. If not, see http://www.gnu.org/licenses/.
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+export TEST=/tools/rust/Sanity/basic-smoke
+export TESTVERSION=1.0
+
+BUILT_FILES=
+
+FILES=$(METADATA) runtest.sh Makefile PURPOSE
+
+.PHONY: all install download clean
+
+run: $(FILES) build
+	./runtest.sh
+
+build: $(BUILT_FILES)
+	test -x runtest.sh || chmod a+x runtest.sh
+
+clean:
+	rm -f *~ $(BUILT_FILES)
+
+
+include /usr/share/rhts/lib/rhts-make.include
+
+$(METADATA): Makefile
+	@echo "Owner:           Martin Cermak <mcermak@redhat.com>" > $(METADATA)
+	@echo "Name:            $(TEST)" >> $(METADATA)
+	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
+	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
+	@echo "Description:     basic-smoke" >> $(METADATA)
+	@echo "Type:            Sanity" >> $(METADATA)
+	@echo "TestTime:        10m" >> $(METADATA)
+	@echo "RunFor:          rust" >> $(METADATA)
+	@echo "Requires:        rust" >> $(METADATA)
+	@echo "Priority:        Normal" >> $(METADATA)
+	@echo "License:         GPLv2+" >> $(METADATA)
+	@echo "Confidential:    no" >> $(METADATA)
+	@echo "Destructive:     no" >> $(METADATA)
+	@echo "Releases:        -RHEL4 -RHELClient5 -RHELServer5" >> $(METADATA)
+
+	rhts-lint $(METADATA)

tests/Sanity/basic-smoke/PURPOSE

@@ -0,0 +1,3 @@
+PURPOSE of /tools/rust/Sanity/basic-smoke
+Description: basic-smoke
+Author: Martin Cermak <mcermak@redhat.com>

tests/Sanity/basic-smoke/main.fmf

@@ -0,0 +1,13 @@
+summary: basic-smoke
+description: ''
+contact:
+  - Jesus Checa Hidalgo <jcheca@redhat.com>
+component:
+  - rust
+test: ./runtest.sh
+framework: beakerlib
+recommend:
+  - rust
+duration: 10m
+extra-summary: /tools/rust/Sanity/basic-smoke
+extra-task: /tools/rust/Sanity/basic-smoke

tests/Sanity/basic-smoke/runtest.sh

@@ -0,0 +1,55 @@
+#!/bin/bash
+# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   runtest.sh of /tools/rust/Sanity/basic-smoke
+#   Description: basic-smoke
+#   Author: Martin Cermak <mcermak@redhat.com>
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Copyright (c) 2017 Red Hat, Inc.
+#
+#   This program is free software: you can redistribute it and/or
+#   modify it under the terms of the GNU General Public License as
+#   published by the Free Software Foundation, either version 2 of
+#   the License, or (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be
+#   useful, but WITHOUT ANY WARRANTY; without even the implied
+#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+#   PURPOSE.  See the GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program. If not, see http://www.gnu.org/licenses/.
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+# Include Beaker environment
+. /usr/share/beakerlib/beakerlib.sh || exit 1
+
+PACKAGE="$(rpm -qf $(which rustc))"
+
+rlJournalStart
+    rlPhaseStartSetup
+        rlAssertRpm $PACKAGE
+        rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
+        rlRun "pushd $TmpDir"
+    rlPhaseEnd
+
+    rlPhaseStartTest
+        HELLO_SRC=$( mktemp )
+        HELLO_BIN=$( mktemp )
+        echo 'fn main() { println!("hello"); }' > $HELLO_SRC
+        rlRun "which rustc"
+        rlRun "rustc -V"
+        rlRun "rustc -o $HELLO_BIN $HELLO_SRC"
+        rlRun "$HELLO_BIN"
+    rlPhaseEnd
+
+    rlPhaseStartCleanup
+        rlRun "popd"
+        rlRun "rm -r $TmpDir" 0 "Removing tmp directory"
+    rlPhaseEnd
+rlJournalPrintText
+rlJournalEnd

tests/Sanity/build-stratisd/Makefile

@@ -0,0 +1,63 @@
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Makefile of /tools/rust/Sanity/build-stratisd
+#   Description: rpmbuild stratisd
+#   Author: Edjunior Machado <emachado@redhat.com>
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Copyright (c) 2018 Red Hat, Inc.
+#
+#   This program is free software: you can redistribute it and/or
+#   modify it under the terms of the GNU General Public License as
+#   published by the Free Software Foundation, either version 2 of
+#   the License, or (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be
+#   useful, but WITHOUT ANY WARRANTY; without even the implied
+#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+#   PURPOSE.  See the GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program. If not, see http://www.gnu.org/licenses/.
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+export TEST=/tools/rust/Sanity/build-stratisd
+export TESTVERSION=1.0
+
+BUILT_FILES=
+
+FILES=$(METADATA) runtest.sh Makefile PURPOSE
+
+.PHONY: all install download clean
+
+run: $(FILES) build
+	./runtest.sh
+
+build: $(BUILT_FILES)
+	test -x runtest.sh || chmod a+x runtest.sh
+
+clean:
+	rm -f *~ $(BUILT_FILES)
+
+
+include /usr/share/rhts/lib/rhts-make.include
+
+$(METADATA): Makefile
+	@echo "Owner:           Edjunior Machado <emachado@redhat.com>" > $(METADATA)
+	@echo "Name:            $(TEST)" >> $(METADATA)
+	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
+	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
+	@echo "Description:     rpmbuild stratisd" >> $(METADATA)
+	@echo "Type:            Sanity" >> $(METADATA)
+	@echo "TestTime:        1h" >> $(METADATA)
+	@echo "RunFor:          rust" >> $(METADATA)
+	@echo "Requires:        rust rpm-build yum-utils stratisd" >> $(METADATA)
+	@echo "Priority:        Normal" >> $(METADATA)
+	@echo "License:         GPLv2+" >> $(METADATA)
+	@echo "Confidential:    no" >> $(METADATA)
+	@echo "Destructive:     no" >> $(METADATA)
+	@echo "Releases:        RHEL8 RHEL9" >> $(METADATA)
+
+	rhts-lint $(METADATA)

tests/Sanity/build-stratisd/PURPOSE

@@ -0,0 +1,3 @@
+PURPOSE of /tools/rust/Sanity/build-stratisd
+Description: rpmbuild stratisd
+Author: Edjunior Machado <emachado@redhat.com>

tests/Sanity/build-stratisd/main.fmf

@@ -0,0 +1,17 @@
+summary: rpmbuild stratisd
+description:
+  - 'Ensure that rust does not break stratisd rpmbuild'
+contact:
+  - Jesus Checa Hidalgo <jcheca@redhat.com>
+component:
+  - rust
+test: ./runtest.sh
+framework: beakerlib
+recommend:
+  - rust
+  - rpm-build
+  - yum-utils
+  - stratisd
+duration: 1h
+extra-summary: /tools/rust/Sanity/build-stratisd
+extra-task: /tools/rust/Sanity/build-stratisd

tests/Sanity/build-stratisd/runtest.sh

@@ -0,0 +1,65 @@
+#!/bin/bash
+# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   runtest.sh of /tools/rust/Sanity/build-stratisd
+#   Description: rpmbuild stratisd
+#   Author: Edjunior Machado <emachado@redhat.com>
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Copyright (c) 2018 Red Hat, Inc.
+#
+#   This program is free software: you can redistribute it and/or
+#   modify it under the terms of the GNU General Public License as
+#   published by the Free Software Foundation, either version 2 of
+#   the License, or (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be
+#   useful, but WITHOUT ANY WARRANTY; without even the implied
+#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+#   PURPOSE.  See the GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program. If not, see http://www.gnu.org/licenses/.
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+# Include Beaker environment
+. /usr/share/beakerlib/beakerlib.sh || exit 1
+
+PACKAGE="$(rpm -qf $(which rustc))"
+
+rlJournalStart
+    rlPhaseStartSetup
+        rlAssertRpm $PACKAGE || rlDie "rustc not found. Aborting testcase..."
+        rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
+        rlRun "pushd $TmpDir"
+    rlPhaseEnd
+
+    PKG_TO_BUILD=stratisd
+    rlPhaseStart FAIL ${PKG_TO_BUILD}FetchSrcAndInstallBuildDeps
+        if ! rlCheckRpm $PKG_TO_BUILD; then
+            rlRun "yum install -y $PKG_TO_BUILD"
+            rlAssertRpm $PKG_TO_BUILD
+        fi
+        rlFetchSrcForInstalled $PKG_TO_BUILD
+        rlRun SRPM=$(ls -1 ${PKG_TO_BUILD}*src.rpm)
+        rlRun "rpm -ivh $SRPM"
+        rlRun SPECDIR="$(rpm -E '%{_specdir}')"
+
+        rlRun "yum-builddep -y ${SRPM}"
+    rlPhaseEnd
+
+    rlPhaseStartTest
+        set -o pipefail
+        rlRun "rpmbuild -bb ${SPECDIR}/${PKG_TO_BUILD}.spec |& tee ${SRPM}_rpmbuild.log"
+        rlFileSubmit "${SRPM}_rpmbuild.log"
+    rlPhaseEnd
+
+    rlPhaseStartCleanup
+        rlRun "popd"
+        rlRun "rm -r $TmpDir" 0 "Removing tmp directory"
+    rlPhaseEnd
+rlJournalPrintText
+rlJournalEnd

tests/Sanity/rpmbuild-librsvg2/Makefile

@@ -0,0 +1,65 @@
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Makefile of /tools/rust/Sanity/rpmbuild-librsvg2
+#   Description: rpmbuild librsvg2
+#   Author: Edjunior Machado <emachado@redhat.com>
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Copyright (c) 2018 Red Hat, Inc.
+#
+#   This program is free software: you can redistribute it and/or
+#   modify it under the terms of the GNU General Public License as
+#   published by the Free Software Foundation, either version 2 of
+#   the License, or (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be
+#   useful, but WITHOUT ANY WARRANTY; without even the implied
+#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+#   PURPOSE.  See the GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program. If not, see http://www.gnu.org/licenses/.
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+export TEST=/tools/rust/Sanity/rpmbuild-librsvg2
+export TESTVERSION=1.0
+
+BUILT_FILES=
+
+FILES=$(METADATA) runtest.sh Makefile PURPOSE
+
+.PHONY: all install download clean
+
+run: $(FILES) build
+	./runtest.sh
+
+build: $(BUILT_FILES)
+	test -x runtest.sh || chmod a+x runtest.sh
+
+clean:
+	rm -f *~ $(BUILT_FILES)
+
+
+include /usr/share/rhts/lib/rhts-make.include
+
+$(METADATA): Makefile
+	@echo "Owner:           Edjunior Machado <emachado@redhat.com>" > $(METADATA)
+	@echo "Name:            $(TEST)" >> $(METADATA)
+	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
+	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
+	@echo "Description:     rpmbuild librsvg2" >> $(METADATA)
+	@echo "Type:            Sanity" >> $(METADATA)
+	@echo "TestTime:        1h" >> $(METADATA)
+	@echo "RunFor:          rust" >> $(METADATA)
+	# Due to bz1980717 librsvg2 requires git to build the srpm, but it's missing
+	# from the BuildRequires
+	@echo "Requires:        rust rpm-build yum-utils librsvg2 git" >> $(METADATA)
+	@echo "Priority:        Normal" >> $(METADATA)
+	@echo "License:         GPLv2+" >> $(METADATA)
+	@echo "Confidential:    no" >> $(METADATA)
+	@echo "Destructive:     no" >> $(METADATA)
+	@echo "Releases:        RHEL8 RHEL9" >> $(METADATA)
+
+	rhts-lint $(METADATA)

tests/Sanity/rpmbuild-librsvg2/PURPOSE

@@ -0,0 +1,3 @@
+PURPOSE of /tools/rust/Sanity/rpmbuild-librsvg2
+Description: rpmbuild librsvg2
+Author: Edjunior Machado <emachado@redhat.com>

tests/Sanity/rpmbuild-librsvg2/main.fmf

@@ -0,0 +1,18 @@
+summary: rpmbuild librsvg2
+description:
+  - 'Ensure that rust does not break librsvg2 rpmbuild'
+contact:
+  - Jesus Checa Hidalgo <jcheca@redhat.com>
+component:
+  - rust
+test: ./runtest.sh
+framework: beakerlib
+recommend:
+  - rust
+  - rpm-build
+  - yum-utils
+  - librsvg2
+  - git
+duration: 1h
+extra-summary: /tools/rust/Sanity/rpmbuild-librsvg2
+extra-task: /tools/rust/Sanity/rpmbuild-librsvg2

tests/Sanity/rpmbuild-librsvg2/runtest.sh

@@ -0,0 +1,68 @@
+#!/bin/bash
+# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   runtest.sh of /tools/rust/Sanity/rpmbuild-librsvg2
+#   Description: rpmbuild librsvg2
+#   Author: Edjunior Machado <emachado@redhat.com>
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Copyright (c) 2018 Red Hat, Inc.
+#
+#   This program is free software: you can redistribute it and/or
+#   modify it under the terms of the GNU General Public License as
+#   published by the Free Software Foundation, either version 2 of
+#   the License, or (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be
+#   useful, but WITHOUT ANY WARRANTY; without even the implied
+#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+#   PURPOSE.  See the GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program. If not, see http://www.gnu.org/licenses/.
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+# Include Beaker environment
+. /usr/share/beakerlib/beakerlib.sh || exit 1
+
+PACKAGE="$(rpm -qf $(which rustc))"
+
+rlJournalStart
+    rlPhaseStartSetup
+        rlAssertRpm $PACKAGE || rlDie "rustc not found. Aborting testcase..."
+        rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
+        rlRun "pushd $TmpDir"
+    rlPhaseEnd
+
+    PKG_TO_BUILD=librsvg2
+    rlPhaseStart FAIL ${PKG_TO_BUILD}FetchSrcAndInstallBuildDeps
+        if ! rlCheckRpm $PKG_TO_BUILD; then
+            rlRun "yum install -y $PKG_TO_BUILD ${YUM_SWITCHES}"
+            rlAssertRpm $PKG_TO_BUILD
+        fi
+        rlFetchSrcForInstalled $PKG_TO_BUILD
+        rlRun SRPM=$(ls -1 ${PKG_TO_BUILD}*src.rpm)
+        rlRun "rpm -ivh $SRPM"
+        rlRun SPECDIR="$(rpm -E '%{_specdir}')"
+
+        # librsvg2 contains dynamic dependencies. builddep needs to be run
+        # from the srpm (not the spec file) to be able to generate them:
+        # https://fedoraproject.org/wiki/Changes/DynamicBuildRequires#rpmbuild
+        rlRun "yum-builddep -y ${SRPM} ${YUM_SWITCHES}"
+    rlPhaseEnd
+
+    rlPhaseStartTest
+        set -o pipefail
+        rlRun "rpmbuild -bb ${SPECDIR}/${PKG_TO_BUILD}.spec |& tee ${SRPM}_rpmbuild.log"
+        rlFileSubmit "${SRPM}_rpmbuild.log"
+    rlPhaseEnd
+
+    rlPhaseStartCleanup
+        rlRun "popd"
+        rlRun "rm -r $TmpDir" 0 "Removing tmp directory"
+    rlPhaseEnd
+rlJournalPrintText
+rlJournalEnd

tests/Sanity/rust-wasm-smoke-test/Makefile

@@ -0,0 +1,64 @@
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Makefile of /tools/rust/Sanity/rust-wasm-smoke-test
+#   Description: Test that the rust wasm target is enabled and can compile correctly
+#   Author: Jesus Checa <jcheca@redhat.com>
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Copyright (c) 2021 Red Hat, Inc.
+#
+#   This program is free software: you can redistribute it and/or
+#   modify it under the terms of the GNU General Public License as
+#   published by the Free Software Foundation, either version 2 of
+#   the License, or (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be
+#   useful, but WITHOUT ANY WARRANTY; without even the implied
+#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+#   PURPOSE.  See the GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program. If not, see http://www.gnu.org/licenses/.
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+export TEST=/tools/rust/Sanity/rust-wasm-smoke-test
+export TESTVERSION=1.0
+
+BUILT_FILES=
+
+FILES=$(METADATA) runtest.sh Makefile PURPOSE lib.rs test.js
+
+.PHONY: all install download clean
+
+run: $(FILES) build
+	./runtest.sh
+
+build: $(BUILT_FILES)
+	test -x runtest.sh || chmod a+x runtest.sh
+
+clean:
+	rm -f *~ $(BUILT_FILES)
+
+
+include /usr/share/rhts/lib/rhts-make.include
+
+$(METADATA): Makefile
+	@echo "Owner:           Jesus Checa <jcheca@redhat.com>" > $(METADATA)
+	@echo "Name:            $(TEST)" >> $(METADATA)
+	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
+	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
+	@echo "Description:     Test that the rust wasm target is enabled and can compile correctly" >> $(METADATA)
+	@echo "Type:            Sanity" >> $(METADATA)
+	@echo "TestTime:        5m" >> $(METADATA)
+	@echo "RunFor:          rust" >> $(METADATA)
+	@echo "Requires:        rust rust-std-static-wasm32-unknown-unknown nodejs" >> $(METADATA)
+	@echo "Priority:        Normal" >> $(METADATA)
+	@echo "License:         GPLv2+" >> $(METADATA)
+	@echo "Confidential:    no" >> $(METADATA)
+	@echo "Destructive:     no" >> $(METADATA)
+	@echo "Releases:        -RHEL4 -RHELClient5 -RHELServer5 -RHEL7" >> $(METADATA)
+	@echo "Architectures:   aarch64 ppc64le x86_64" >> $(METADATA)
+
+	rhts-lint $(METADATA)

tests/Sanity/rust-wasm-smoke-test/PURPOSE

@@ -0,0 +1,3 @@
+PURPOSE of /tools/rust/Sanity/rust-wasm-smoke-test
+Description: Test that the rust wasm target is enabled and can compile correctly
+Author: Jesus Checa <jcheca@redhat.com>

tests/Sanity/rust-wasm-smoke-test/lib.rs

@@ -0,0 +1,12 @@
+#[no_mangle]
+pub fn fib(index: u32) -> u32 {
+    let mut nminus2;
+    let mut nminus1 = 1;
+    let mut n = 0;
+    for _ in 0..index {
+        nminus2 = nminus1;
+        nminus1 = n;
+        n = nminus2 + nminus1;
+    }
+    n
+}

tests/Sanity/rust-wasm-smoke-test/main.fmf

@@ -0,0 +1,15 @@
+summary: Test that the rust wasm target is enabled and can compile correctly
+description: ''
+contact:
+  - Jesus Checa <jcheca@redhat.com>
+component:
+  - rust
+test: ./runtest.sh
+framework: beakerlib
+recommend:
+  - rust
+  - rust-std-static-wasm32-unknown-unknown
+  - nodejs
+duration: 5m
+extra-summary: /tools/rust/Sanity/rust-wasm-smoke-test
+extra-task: /tools/rust/Sanity/rust-wasm-smoke-test

tests/Sanity/rust-wasm-smoke-test/runtest.sh

@@ -0,0 +1,53 @@
+#!/bin/bash
+# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   runtest.sh of /tools/rust/Sanity/rust-wasm-smoke-test
+#   Description: Test that the rust wasm target is enabled and can compile correctly
+#   Author: Jesus Checa <jcheca@redhat.com>
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Copyright (c) 2021 Red Hat, Inc.
+#
+#   This program is free software: you can redistribute it and/or
+#   modify it under the terms of the GNU General Public License as
+#   published by the Free Software Foundation, either version 2 of
+#   the License, or (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be
+#   useful, but WITHOUT ANY WARRANTY; without even the implied
+#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+#   PURPOSE.  See the GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program. If not, see http://www.gnu.org/licenses/.
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+# Include Beaker environment
+. /usr/share/beakerlib/beakerlib.sh || exit 1
+
+PACKAGES="$(rpm -qf $(which rustc)) rust-std-static-wasm32-unknown-unknown"
+
+rlJournalStart
+    rlPhaseStartSetup
+        rlAssertRpm --all
+        rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
+        rlRun "cp lib.rs $TmpDir"
+        rlRun "cp test.js $TmpDir"
+        rlRun "pushd $TmpDir"
+    rlPhaseEnd
+
+    rlPhaseStartTest
+        rlRun "rustc --target wasm32-unknown-unknown --crate-type=cdylib lib.rs -o fib.wasm" 0 "Building WASM binary"
+        rlRun "node test.js" 0 "Testing WASM binary"
+    rlPhaseEnd
+
+    rlPhaseStartCleanup
+        rlRun "popd"
+        rlRun "rm -r $TmpDir" 0 "Removing tmp directory"
+    rlPhaseEnd
+rlJournalPrintText
+rlJournalEnd
+

tests/Sanity/rust-wasm-smoke-test/test.js

@@ -0,0 +1,28 @@
+function js_fibonacci(index) {
+    let nminus2 = 0;
+    let nminus1 = 1;
+    let n = 0;
+    for(let i = 0; i < index; ++i) {
+        nminus2 = nminus1;
+        nminus1 = n;
+        n = nminus1 + nminus2;
+    }
+    return n;
+}
+
+const fs = require('fs');
+const buf = fs.readFileSync('./fib.wasm');
+const lib = WebAssembly.instantiate(new Uint8Array(buf)).
+    then(res => {
+        var fib = res.instance.exports.fib;
+        for (var i=1; i<=10; i++) {
+            if(fib(i) != js_fibonacci(i)){
+                console.log("Mismatch between wasm and JS functions");
+                process.exit(1);
+            }
+        }
+    }).catch(e => {
+        console.log(e);
+        process.exit(1);
+    }
+);