On 14/07/2022 11:02, Emilio Pozuelo Monfort wrote:
Package: release.debian.org
Severity: normal
Tags: buster
User: release.debian....@packages.debian.org
Usertags: pu
X-Debbugs-Cc: pkg-rust-maintain...@alioth-lists.debian.net
Hi,
This updates rustc-mozilla in buster, in preparation for Firefox 102.
I'm attaching the debdiff from the bullseye update. The windows target
is disabled because it was already disabled in buster, and is something
we don't really care about for our purpose.
I've uploaded the package already to oldstable-new.
I've added a couple of changes to fix the FTBFS on i386 and arm64. debdiff
attached and package uploaded.
Thanks,
Emilio
diff -ruNp debian/changelog rustc-mozilla-1.59.0+dfsg1/debian/changelog
--- debian/changelog 2022-07-12 00:18:55.000000000 +0200
+++ rustc-mozilla-1.59.0+dfsg1/debian/changelog 2022-07-28 18:17:01.281355462
+0200
@@ -1,3 +1,10 @@
+rustc-mozilla (1.59.0+dfsg1-1~deb10u2) buster; urgency=medium
+
+ * Inline atomics on arm64.
+ * Increase allowed test failures on i386.
+
+ -- Emilio Pozuelo Monfort <po...@debian.org> Thu, 28 Jul 2022 18:16:59 +0200
+
rustc-mozilla (1.59.0+dfsg1-1~deb10u1) buster; urgency=medium
* Backport to buster.
diff -ruNp debian/patches/d-aarch64-inline-atomics.patch
rustc-mozilla-1.59.0+dfsg1/debian/patches/d-aarch64-inline-atomics.patch
--- debian/patches/d-aarch64-inline-atomics.patch 1970-01-01
01:00:00.000000000 +0100
+++ rustc-mozilla-1.59.0+dfsg1/debian/patches/d-aarch64-inline-atomics.patch
2022-07-28 13:39:58.740551614 +0200
@@ -0,0 +1,40 @@
+--- a/compiler/rustc_target/src/spec/aarch64_be_unknown_linux_gnu.rs
++++ b/compiler/rustc_target/src/spec/aarch64_be_unknown_linux_gnu.rs
+@@ -8,7 +8,6 @@ pub fn target() -> Target {
+ data_layout:
"E-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128".to_string(),
+ arch: "aarch64".to_string(),
+ options: TargetOptions {
+- features: "+outline-atomics".to_string(),
+ max_atomic_width: Some(128),
+ mcount: "\u{1}_mcount".to_string(),
+ endian: Endian::Big,
+--- a/compiler/rustc_target/src/spec/aarch64_be_unknown_linux_gnu_ilp32.rs
++++ b/compiler/rustc_target/src/spec/aarch64_be_unknown_linux_gnu_ilp32.rs
+@@ -12,7 +12,6 @@ pub fn target() -> Target {
+ arch: "aarch64".to_string(),
+ options: TargetOptions {
+ abi: "ilp32".to_string(),
+- features: "+outline-atomics".to_string(),
+ mcount: "\u{1}_mcount".to_string(),
+ endian: Endian::Big,
+ ..base
+--- a/compiler/rustc_target/src/spec/aarch64_unknown_linux_gnu.rs
++++ b/compiler/rustc_target/src/spec/aarch64_unknown_linux_gnu.rs
+@@ -7,7 +7,6 @@ pub fn target() -> Target {
+ data_layout:
"e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128".to_string(),
+ arch: "aarch64".to_string(),
+ options: TargetOptions {
+- features: "+outline-atomics".to_string(),
+ mcount: "\u{1}_mcount".to_string(),
+ max_atomic_width: Some(128),
+ supported_sanitizers: SanitizerSet::ADDRESS
+--- a/compiler/rustc_target/src/spec/aarch64_unknown_linux_gnu_ilp32.rs
++++ b/compiler/rustc_target/src/spec/aarch64_unknown_linux_gnu_ilp32.rs
+@@ -8,7 +8,6 @@ pub fn target() -> Target {
+ arch: "aarch64".to_string(),
+ options: TargetOptions {
+ abi: "ilp32".to_string(),
+- features: "+outline-atomics".to_string(),
+ max_atomic_width: Some(128),
+ mcount: "\u{1}_mcount".to_string(),
+ ..super::linux_gnu_base::opts()
diff -ruNp debian/patches/series
rustc-mozilla-1.59.0+dfsg1/debian/patches/series
--- debian/patches/series 2022-03-29 15:18:33.000000000 +0200
+++ rustc-mozilla-1.59.0+dfsg1/debian/patches/series 2022-07-28
13:38:45.892372838 +0200
@@ -52,3 +52,4 @@ d-rustc-i686-baseline.patch
# Experimental patch not yet working
#d-rustc-prefer-dynamic.patch
d-rustdoc-disable-embedded-fonts.patch
+d-aarch64-inline-atomics.patch
diff -ruNp debian/rules rustc-mozilla-1.59.0+dfsg1/debian/rules
--- debian/rules 2022-07-12 00:18:55.000000000 +0200
+++ rustc-mozilla-1.59.0+dfsg1/debian/rules 2022-07-28 18:16:54.829342634
+0200
@@ -51,6 +51,14 @@ RUSTBUILD_TEST = $(RUSTBUILD) test --no-
# See src/bootstrap/README.md for more options.
RUSTBUILD_TEST_FLAGS =
+ifneq (,$(filter buster%, $(DEB_DISTRIBUTION)))
+ifeq ($(DEB_HOST_ARCH), arm64)
+# https://github.com/rust-lang/rust/issues/93166
+RUSTFLAGS = -Ctarget-feature=-outline-atomics
+export RUSTFLAGS
+endif
+endif
+
# https://github.com/rust-lang/rust/issues/89744
# TODO: remove when we update cargo to 1.55 / 0.56
# upstream bug still exists and is under investigation, but is hidden by newer
cargo
@@ -285,7 +293,7 @@ TEST_LOG = debian/rustc-tests.log
# This is advertised as "5 tests failed" in README.Debian because our counting
# method is imprecise and in practise we count some failures twice.
FAILURES_ALLOWED = 8
-ifneq (,$(filter $(DEB_BUILD_ARCH), armhf mips64el))
+ifneq (,$(filter $(DEB_BUILD_ARCH), armhf i386 mips64el))
FAILURES_ALLOWED = 12
endif
ifneq (,$(filter $(DEB_BUILD_ARCH), mips mipsel ppc64))
