summaryrefslogtreecommitdiff
path: root/user/rust/0007-Link-libssp_nonshared.a-on-all-musl-targets.patch
diff options
context:
space:
mode:
authorSamuel Holland <samuel@sholland.org>2022-04-30 04:27:44 +0000
committerZach van Rijn <me@zv.io>2022-10-21 18:34:01 -0500
commit36ba9dd47f31bfbe4811b03df9a2871c43857219 (patch)
tree2637bf028a2ab8f6e4598f11b1afb84824fdcb64 /user/rust/0007-Link-libssp_nonshared.a-on-all-musl-targets.patch
parent04e62b2391dc7f829349c87e1cc71597731e3c88 (diff)
downloadpackages-36ba9dd47f31bfbe4811b03df9a2871c43857219.tar.gz
packages-36ba9dd47f31bfbe4811b03df9a2871c43857219.tar.bz2
packages-36ba9dd47f31bfbe4811b03df9a2871c43857219.tar.xz
packages-36ba9dd47f31bfbe4811b03df9a2871c43857219.zip
user/rust: Bump to 1.60.0
Signed-off-by: Samuel Holland <samuel@sholland.org>
Diffstat (limited to 'user/rust/0007-Link-libssp_nonshared.a-on-all-musl-targets.patch')
-rw-r--r--user/rust/0007-Link-libssp_nonshared.a-on-all-musl-targets.patch31
1 files changed, 31 insertions, 0 deletions
diff --git a/user/rust/0007-Link-libssp_nonshared.a-on-all-musl-targets.patch b/user/rust/0007-Link-libssp_nonshared.a-on-all-musl-targets.patch
new file mode 100644
index 000000000..7838e5a05
--- /dev/null
+++ b/user/rust/0007-Link-libssp_nonshared.a-on-all-musl-targets.patch
@@ -0,0 +1,31 @@
+From 976ff1e1bbdbb9c0c0a32a6a27238b51e6467f8f Mon Sep 17 00:00:00 2001
+From: Samuel Holland <samuel@sholland.org>
+Date: Sun, 3 Nov 2019 17:01:32 -0600
+Subject: [PATCH 07/14] Link libssp_nonshared.a on all musl targets
+
+---
+ compiler/rustc_target/src/spec/linux_musl_base.rs | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/compiler/rustc_target/src/spec/linux_musl_base.rs b/compiler/rustc_target/src/spec/linux_musl_base.rs
+index 9931578ba86..a1cece5733c 100644
+--- a/compiler/rustc_target/src/spec/linux_musl_base.rs
++++ b/compiler/rustc_target/src/spec/linux_musl_base.rs
+@@ -1,10 +1,13 @@
+-use crate::spec::TargetOptions;
++use crate::spec::{LinkerFlavor, TargetOptions};
+
+ pub fn opts() -> TargetOptions {
+ let mut base = super::linux_base::opts();
+
+ base.env = "musl".to_string();
+
++ // libssp_nonshared.a is needed for __stack_chk_fail_local when using libc.so
++ base.post_link_args.insert(LinkerFlavor::Gcc, vec!["-lssp_nonshared".to_string()]);
++
+ // These targets statically link libc by default
+ base.crt_static_default = true;
+
+--
+2.35.1
+