diff -Nru rustc-1.85.0+dfsg2/debian/changelog rustc-1.85.0+dfsg2/debian/changelog --- rustc-1.85.0+dfsg2/debian/changelog 2025-04-04 18:24:50.000000000 +0200 +++ rustc-1.85.0+dfsg2/debian/changelog 2025-04-11 13:40:09.000000000 +0200 @@ -1,3 +1,9 @@ +rustc (1.85.0+dfsg2-3) unstable; urgency=medium + + * baseline: enable SSE2 for i386 build (Closes: #1095862) + + -- Fabian Grünbichler Fri, 11 Apr 2025 13:40:09 +0200 + rustc (1.85.0+dfsg2-2) unstable; urgency=medium * Upload to unstable diff -Nru rustc-1.85.0+dfsg2/debian/patches/behaviour/d-rustc-i686-baseline.patch rustc-1.85.0+dfsg2/debian/patches/behaviour/d-rustc-i686-baseline.patch --- rustc-1.85.0+dfsg2/debian/patches/behaviour/d-rustc-i686-baseline.patch 2025-02-20 19:11:46.000000000 +0100 +++ rustc-1.85.0+dfsg2/debian/patches/behaviour/d-rustc-i686-baseline.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,56 +0,0 @@ -From: Debian Rust Maintainers -Date: Thu, 14 Jul 2022 13:17:39 +0200 -Subject: Change i686 to match Debian i386 baseline - -see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=973414 , might need to be -adapted to reduce the baseline again - -Forwarded: not-needed - -=================================================================== ---- - compiler/rustc_target/src/spec/targets/i686_unknown_linux_gnu.rs | 2 +- - tests/ui/abi/homogenous-floats-target-feature-mixup.rs | 3 ++- - tests/ui/sse2.rs | 2 +- - 3 files changed, 4 insertions(+), 3 deletions(-) - -diff --git a/compiler/rustc_target/src/spec/targets/i686_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/targets/i686_unknown_linux_gnu.rs -index c95cb30..0e7339d 100644 ---- a/compiler/rustc_target/src/spec/targets/i686_unknown_linux_gnu.rs -+++ b/compiler/rustc_target/src/spec/targets/i686_unknown_linux_gnu.rs -@@ -2,7 +2,7 @@ use crate::spec::{Cc, LinkerFlavor, Lld, SanitizerSet, StackProbeType, Target, b - - pub(crate) fn target() -> Target { - let mut base = base::linux_gnu::opts(); -- base.cpu = "pentium4".into(); -+ base.cpu = "pentiumpro".into(); - base.max_atomic_width = Some(64); - base.supported_sanitizers = SanitizerSet::ADDRESS; - base.add_pre_link_args(LinkerFlavor::Gnu(Cc::Yes, Lld::No), &["-m32"]); -diff --git a/tests/ui/abi/homogenous-floats-target-feature-mixup.rs b/tests/ui/abi/homogenous-floats-target-feature-mixup.rs -index 4afb710..1aa4bd2 100644 ---- a/tests/ui/abi/homogenous-floats-target-feature-mixup.rs -+++ b/tests/ui/abi/homogenous-floats-target-feature-mixup.rs -@@ -24,7 +24,8 @@ fn main() { - match std::env::var("TARGET") { - Ok(s) => { - // Skip this tests on i586-unknown-linux-gnu where sse2 is disabled -- if s.contains("i586") { -+ // Debian: our i686 doesn't have SSE 2.. -+ if s.contains("i586") || s.contains("i686") { - return - } - } -diff --git a/tests/ui/sse2.rs b/tests/ui/sse2.rs -index a1894cc..92cdca6 100644 ---- a/tests/ui/sse2.rs -+++ b/tests/ui/sse2.rs -@@ -15,7 +15,7 @@ fn main() { - } - Err(_) => return, - } -- if cfg!(any(target_arch = "x86", target_arch = "x86_64")) { -+ if cfg!(any(target_arch = "x86_64")) { - assert!(cfg!(target_feature = "sse2"), - "SSE2 was not detected as available on an x86 platform"); - } diff -Nru rustc-1.85.0+dfsg2/debian/patches/build/disable-broken-i386-tests.patch rustc-1.85.0+dfsg2/debian/patches/build/disable-broken-i386-tests.patch --- rustc-1.85.0+dfsg2/debian/patches/build/disable-broken-i386-tests.patch 2025-02-20 19:11:46.000000000 +0100 +++ rustc-1.85.0+dfsg2/debian/patches/build/disable-broken-i386-tests.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,24 +0,0 @@ -From: =?utf-8?q?Fabian_Gr=C3=BCnbichler?= -Date: Wed, 23 Oct 2024 22:29:50 +0200 -Subject: disable broken i386 tests -MIME-Version: 1.0 -Content-Type: text/plain; charset="utf-8" -Content-Transfer-Encoding: 8bit - -Signed-off-by: Fabian Grünbichler ---- - tests/ui/traits/object/print_vtable_sizes.rs | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/tests/ui/traits/object/print_vtable_sizes.rs b/tests/ui/traits/object/print_vtable_sizes.rs -index 2b1745d..fd94386 100644 ---- a/tests/ui/traits/object/print_vtable_sizes.rs -+++ b/tests/ui/traits/object/print_vtable_sizes.rs -@@ -1,5 +1,7 @@ - //@ check-pass - //@ compile-flags: -Z print-vtable-sizes -+//Debian: broken floats break the expected output on i386 -+//@ ignore-i686-unknown-linux-gnu - #![crate_type = "lib"] - - trait A: AsRef<[T::V]> + AsMut<[T::V]> {} diff -Nru rustc-1.85.0+dfsg2/debian/patches/series rustc-1.85.0+dfsg2/debian/patches/series --- rustc-1.85.0+dfsg2/debian/patches/series 2025-04-04 18:23:56.000000000 +0200 +++ rustc-1.85.0+dfsg2/debian/patches/series 2025-04-11 13:39:56.000000000 +0200 @@ -33,14 +33,12 @@ behaviour/d-rust-lldb-paths.patch behaviour/d-rustc-add-soname.patch behaviour/d-rustc-windows-ssp.patch -behaviour/d-rustc-i686-baseline.patch behaviour/d-rustdoc-disable-embedded-fonts.patch ubuntu/ubuntu-disable-ppc64el-asm-tests.patch ubuntu/ubuntu-ignore-arm-doctest.patch vendor/onig_sys-use-system-lib.patch vendor/libz-sys-allow-cross-building.patch build/bootstrap-tests-disable-compiler-rt-optimizing.patch -build/disable-broken-i386-tests.patch build/ignore-broken-debuginfo-tests.patch vendor/blake3-skip-embedded-C-code-use-pure-implementation.patch build/ci_rustc-disable-test-that-requires-upstream-git-repo.patch