summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dev-lang/rust/files/1.82.0-i586-baseline.patch44
-rw-r--r--dev-lang/rust/rust-1.82.0-r103.ebuild (renamed from dev-lang/rust/rust-1.82.0-r102.ebuild)7
-rw-r--r--dev-lang/rust/rust-1.83.0-r3.ebuild (renamed from dev-lang/rust/rust-1.83.0-r2.ebuild)7
-rw-r--r--dev-lang/rust/rust-1.84.0-r2.ebuild (renamed from dev-lang/rust/rust-1.84.0-r1.ebuild)8
-rw-r--r--dev-lang/rust/rust-1.84.1-r2.ebuild (renamed from dev-lang/rust/rust-1.84.1-r1.ebuild)8
-rw-r--r--dev-lang/rust/rust-1.85.0-r2.ebuild (renamed from dev-lang/rust/rust-1.85.0-r1.ebuild)8
-rw-r--r--dev-lang/rust/rust-1.85.1-r1.ebuild (renamed from dev-lang/rust/rust-1.85.1.ebuild)8
-rw-r--r--dev-lang/rust/rust-1.86.0-r2.ebuild (renamed from dev-lang/rust/rust-1.86.0-r1.ebuild)8
-rw-r--r--dev-lang/rust/rust-1.87.0-r1.ebuild (renamed from dev-lang/rust/rust-1.87.0.ebuild)8
-rw-r--r--dev-lang/rust/rust-9999.ebuild8
10 files changed, 0 insertions, 114 deletions
diff --git a/dev-lang/rust/files/1.82.0-i586-baseline.patch b/dev-lang/rust/files/1.82.0-i586-baseline.patch
deleted file mode 100644
index 25c4a1a1dd56..000000000000
--- a/dev-lang/rust/files/1.82.0-i586-baseline.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Bug: https://bugs.gentoo.org/741708
-From: Ian Jordan <immoloism@gmail.com>
-Date: Thu, 01 Nov 204 15:28:39 +0100
-Subject: Change Pentium4 baseline to i586
-
-Based on the Debian patch at https://sources.debian.org/patches/rustc/1.80.1%2Bdfsg1-1/behaviour/d-rustc-i686-baseline.patch/
-This lowers baseline from Pentium4 to i586.
-
-Thanks-to: Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
-
---- 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::{base, Cc, LinkerFlavor, Lld, SanitizerSet, StackProbeType, Tar
-
- pub 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"]);
---- 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
- }
- }
---- a/tests/ui/sse2.rs
-+++ b/tests/ui/sse2.rs
-@@ -16,7 +16,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 --git a/dev-lang/rust/rust-1.82.0-r102.ebuild b/dev-lang/rust/rust-1.82.0-r103.ebuild
index 54c4d8e73222..ce51437d7531 100644
--- a/dev-lang/rust/rust-1.82.0-r102.ebuild
+++ b/dev-lang/rust/rust-1.82.0-r103.ebuild
@@ -226,13 +226,6 @@ pkg_setup() {
}
src_prepare() {
- # Rust baselines to Pentium4 on x86, this patch lowers the baseline to i586 when sse2 is not set.
- if use x86; then
- if ! use cpu_flags_x86_sse2; then
- eapply "${FILESDIR}/1.82.0-i586-baseline.patch"
- #grep -rl cmd.args.push\(\"-march=i686\" . | xargs sed -i 's/march=i686/-march=i586/g' || die
- fi
- fi
default
}
diff --git a/dev-lang/rust/rust-1.83.0-r2.ebuild b/dev-lang/rust/rust-1.83.0-r3.ebuild
index 1b33587df5ef..6b9a50d31c79 100644
--- a/dev-lang/rust/rust-1.83.0-r2.ebuild
+++ b/dev-lang/rust/rust-1.83.0-r3.ebuild
@@ -226,13 +226,6 @@ pkg_setup() {
}
src_prepare() {
- # Rust baselines to Pentium4 on x86, this patch lowers the baseline to i586 when sse2 is not set.
- if use x86; then
- if ! use cpu_flags_x86_sse2; then
- eapply "${FILESDIR}/1.82.0-i586-baseline.patch"
- #grep -rl cmd.args.push\(\"-march=i686\" . | xargs sed -i 's/march=i686/-march=i586/g' || die
- fi
- fi
default
}
diff --git a/dev-lang/rust/rust-1.84.0-r1.ebuild b/dev-lang/rust/rust-1.84.0-r2.ebuild
index 275f1e17a8a9..9b974070b81f 100644
--- a/dev-lang/rust/rust-1.84.0-r1.ebuild
+++ b/dev-lang/rust/rust-1.84.0-r2.ebuild
@@ -231,14 +231,6 @@ pkg_setup() {
}
src_prepare() {
- # Rust baselines to Pentium4 on x86, this patch lowers the baseline to i586 when sse2 is not set.
- if use x86; then
- if ! use cpu_flags_x86_sse2; then
- eapply "${FILESDIR}/1.82.0-i586-baseline.patch"
- #grep -rl cmd.args.push\(\"-march=i686\" . | xargs sed -i 's/march=i686/-march=i586/g' || die
- fi
- fi
-
if use lto && tc-is-clang && ! tc-ld-is-lld && ! tc-ld-is-mold; then
export RUSTFLAGS+=" -C link-arg=-fuse-ld=lld"
fi
diff --git a/dev-lang/rust/rust-1.84.1-r1.ebuild b/dev-lang/rust/rust-1.84.1-r2.ebuild
index 42a9b6dd7222..a79e51dfd654 100644
--- a/dev-lang/rust/rust-1.84.1-r1.ebuild
+++ b/dev-lang/rust/rust-1.84.1-r2.ebuild
@@ -232,14 +232,6 @@ pkg_setup() {
}
src_prepare() {
- # Rust baselines to Pentium4 on x86, this patch lowers the baseline to i586 when sse2 is not set.
- if use x86; then
- if ! use cpu_flags_x86_sse2; then
- eapply "${FILESDIR}/1.82.0-i586-baseline.patch"
- #grep -rl cmd.args.push\(\"-march=i686\" . | xargs sed -i 's/march=i686/-march=i586/g' || die
- fi
- fi
-
if use lto && tc-is-clang && ! tc-ld-is-lld && ! tc-ld-is-mold; then
export RUSTFLAGS+=" -C link-arg=-fuse-ld=lld"
fi
diff --git a/dev-lang/rust/rust-1.85.0-r1.ebuild b/dev-lang/rust/rust-1.85.0-r2.ebuild
index 5106720d515c..0ae50344ef14 100644
--- a/dev-lang/rust/rust-1.85.0-r1.ebuild
+++ b/dev-lang/rust/rust-1.85.0-r2.ebuild
@@ -302,14 +302,6 @@ src_prepare() {
if [[ ${PV} = *9999* ]]; then
# We need to update / generate lockfiles for the workspace
${CARGO} generate-lockfile --offline
-
- fi
- # Rust baselines to Pentium4 on x86, this patch lowers the baseline to i586 when sse2 is not set.
- if use x86; then
- if ! use cpu_flags_x86_sse2; then
- eapply "${FILESDIR}/1.82.0-i586-baseline.patch"
- #grep -rl cmd.args.push\(\"-march=i686\" . | xargs sed -i 's/march=i686/-march=i586/g' || die
- fi
fi
if use lto && tc-is-clang && ! tc-ld-is-lld && ! tc-ld-is-mold; then
diff --git a/dev-lang/rust/rust-1.85.1.ebuild b/dev-lang/rust/rust-1.85.1-r1.ebuild
index d5d5757c4311..e2221c52726d 100644
--- a/dev-lang/rust/rust-1.85.1.ebuild
+++ b/dev-lang/rust/rust-1.85.1-r1.ebuild
@@ -302,14 +302,6 @@ src_prepare() {
if [[ ${PV} = *9999* ]]; then
# We need to update / generate lockfiles for the workspace
${CARGO} generate-lockfile --offline
-
- fi
- # Rust baselines to Pentium4 on x86, this patch lowers the baseline to i586 when sse2 is not set.
- if use x86; then
- if ! use cpu_flags_x86_sse2; then
- eapply "${FILESDIR}/1.82.0-i586-baseline.patch"
- #grep -rl cmd.args.push\(\"-march=i686\" . | xargs sed -i 's/march=i686/-march=i586/g' || die
- fi
fi
if use lto && tc-is-clang && ! tc-ld-is-lld && ! tc-ld-is-mold; then
diff --git a/dev-lang/rust/rust-1.86.0-r1.ebuild b/dev-lang/rust/rust-1.86.0-r2.ebuild
index af36dd5ddd79..8edc7bf68253 100644
--- a/dev-lang/rust/rust-1.86.0-r1.ebuild
+++ b/dev-lang/rust/rust-1.86.0-r2.ebuild
@@ -304,14 +304,6 @@ src_prepare() {
if [[ ${PV} = *9999* ]]; then
# We need to update / generate lockfiles for the workspace
${CARGO} generate-lockfile --offline
-
- fi
- # Rust baselines to Pentium4 on x86, this patch lowers the baseline to i586 when sse2 is not set.
- if use x86; then
- if ! use cpu_flags_x86_sse2; then
- eapply "${FILESDIR}/1.82.0-i586-baseline.patch"
- #grep -rl cmd.args.push\(\"-march=i686\" . | xargs sed -i 's/march=i686/-march=i586/g' || die
- fi
fi
if use lto && tc-is-clang && ! tc-ld-is-lld && ! tc-ld-is-mold; then
diff --git a/dev-lang/rust/rust-1.87.0.ebuild b/dev-lang/rust/rust-1.87.0-r1.ebuild
index 516441d2b6df..4fac672978bc 100644
--- a/dev-lang/rust/rust-1.87.0.ebuild
+++ b/dev-lang/rust/rust-1.87.0-r1.ebuild
@@ -305,14 +305,6 @@ src_prepare() {
if [[ ${PV} = *9999* ]]; then
# We need to update / generate lockfiles for the workspace
${CARGO} generate-lockfile --offline
-
- fi
- # Rust baselines to Pentium4 on x86, this patch lowers the baseline to i586 when sse2 is not set.
- if use x86; then
- if ! use cpu_flags_x86_sse2; then
- eapply "${FILESDIR}/1.82.0-i586-baseline.patch"
- #grep -rl cmd.args.push\(\"-march=i686\" . | xargs sed -i 's/march=i686/-march=i586/g' || die
- fi
fi
if use lto && tc-is-clang && ! tc-ld-is-lld && ! tc-ld-is-mold; then
diff --git a/dev-lang/rust/rust-9999.ebuild b/dev-lang/rust/rust-9999.ebuild
index d9eff0ee970e..4b395498dc1b 100644
--- a/dev-lang/rust/rust-9999.ebuild
+++ b/dev-lang/rust/rust-9999.ebuild
@@ -304,14 +304,6 @@ src_prepare() {
if [[ ${PV} = *9999* ]]; then
# We need to update / generate lockfiles for the workspace
${CARGO} generate-lockfile --offline
-
- fi
- # Rust baselines to Pentium4 on x86, this patch lowers the baseline to i586 when sse2 is not set.
- if use x86; then
- if ! use cpu_flags_x86_sse2; then
- eapply "${FILESDIR}/1.82.0-i586-baseline.patch"
- #grep -rl cmd.args.push\(\"-march=i686\" . | xargs sed -i 's/march=i686/-march=i586/g' || die
- fi
fi
if use lto && tc-is-clang && ! tc-ld-is-lld && ! tc-ld-is-mold; then