From 57d38d081effe6eea14b39524c774bcb7e5cb7f3 Mon Sep 17 00:00:00 2001 From: semarie Date: Fri, 28 Oct 2022 09:27:44 +0000 Subject: [PATCH] lang/rust: drop -znotext on i386 it isn't need anymore as __rust_probestack is hidden --- lang/rust/Makefile | 2 +- ...compiler_rustc_target_src_spec_i686_unknown_openbsd_rs | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/lang/rust/Makefile b/lang/rust/Makefile index b4af9d36359..4ababa7f5bb 100644 --- a/lang/rust/Makefile +++ b/lang/rust/Makefile @@ -12,7 +12,7 @@ COMMENT-clippy = Rust linter COMMENT-rustfmt = Rust code formatter V = 1.64.0 -REVISION = 0 +REVISION = 1 DISTNAME = rustc-${V}-src # rustc bootstrap version diff --git a/lang/rust/patches/patch-compiler_rustc_target_src_spec_i686_unknown_openbsd_rs b/lang/rust/patches/patch-compiler_rustc_target_src_spec_i686_unknown_openbsd_rs index cc564fa79bb..17ec8650c58 100644 --- a/lang/rust/patches/patch-compiler_rustc_target_src_spec_i686_unknown_openbsd_rs +++ b/lang/rust/patches/patch-compiler_rustc_target_src_spec_i686_unknown_openbsd_rs @@ -1,18 +1,14 @@ i386 should be pentiumpro (no SSE2, no ...) -pass -znotext to avoid relocation problem with __rust_probestack symbol Index: compiler/rustc_target/src/spec/i686_unknown_openbsd.rs --- compiler/rustc_target/src/spec/i686_unknown_openbsd.rs.orig +++ compiler/rustc_target/src/spec/i686_unknown_openbsd.rs -@@ -2,9 +2,9 @@ use crate::spec::{LinkerFlavor, StackProbeType, Target +@@ -2,7 +2,7 @@ use crate::spec::{LinkerFlavor, StackProbeType, Target pub fn target() -> Target { let mut base = super::openbsd_base::opts(); - base.cpu = "pentium4".into(); + base.cpu = "pentiumpro".into(); base.max_atomic_width = Some(64); -- base.add_pre_link_args(LinkerFlavor::Gcc, &["-m32", "-fuse-ld=lld"]); -+ base.add_pre_link_args(LinkerFlavor::Gcc, &["-m32", "-fuse-ld=lld", "-Wl,-znotext"]); + base.add_pre_link_args(LinkerFlavor::Gcc, &["-m32", "-fuse-ld=lld"]); // don't use probe-stack=inline-asm until rust#83139 and rust#84667 are resolved - base.stack_probes = StackProbeType::Call; -