diff options
author | Samuel Holland <samuel@sholland.org> | 2018-10-24 00:59:08 +0000 |
---|---|---|
committer | Samuel Holland <samuel@sholland.org> | 2018-10-24 03:04:57 +0000 |
commit | e2549aaf12f9cb7afefde79f5f85729f3a2a53f6 (patch) | |
tree | eab0407437d6b49300310f64de4969c847b5e906 /user/rust/0029-Work-around-libbacktrace-built-with-fstack-protector.patch | |
parent | 0a519718cb122d9a7ab4182499ec7fb8578cac38 (diff) | |
download | packages-e2549aaf12f9cb7afefde79f5f85729f3a2a53f6.tar.gz packages-e2549aaf12f9cb7afefde79f5f85729f3a2a53f6.tar.bz2 packages-e2549aaf12f9cb7afefde79f5f85729f3a2a53f6.tar.xz packages-e2549aaf12f9cb7afefde79f5f85729f3a2a53f6.zip |
user/rust: Bump to 1.29.2, better fixes for i586, ppc32
Diffstat (limited to 'user/rust/0029-Work-around-libbacktrace-built-with-fstack-protector.patch')
-rw-r--r-- | user/rust/0029-Work-around-libbacktrace-built-with-fstack-protector.patch | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/user/rust/0029-Work-around-libbacktrace-built-with-fstack-protector.patch b/user/rust/0029-Work-around-libbacktrace-built-with-fstack-protector.patch deleted file mode 100644 index 29a31508d..000000000 --- a/user/rust/0029-Work-around-libbacktrace-built-with-fstack-protector.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 22bb29c2b807180ed0522d9c930e14c327582571 Mon Sep 17 00:00:00 2001 -From: Samuel Holland <samuel@sholland.org> -Date: Sat, 6 Oct 2018 04:17:14 +0000 -Subject: [PATCH 29/29] Work around libbacktrace built with -fstack-protector - -On 32-bit x86 and ppc, gcc generates calls to __stack_chk_fail_local, -which must be a hidden function in every DSO. gcc provides the -implementation in libssp_nonshared. libbacktrace is built in hosted -mode, where Adelie's compiler enables -fstack-protector by default. -However, rustc passes -nodefaultlibs, inhibiting gcc from linking -libssp_nonshared. ---- - src/libpanic_unwind/Cargo.toml | 1 + - src/libpanic_unwind/build.rs | 10 ++++++++++ - 2 files changed, 11 insertions(+) - create mode 100644 src/libpanic_unwind/build.rs - -diff --git a/src/libpanic_unwind/Cargo.toml b/src/libpanic_unwind/Cargo.toml -index 74aaa4d5ae..c1b66aeefe 100644 ---- a/src/libpanic_unwind/Cargo.toml -+++ b/src/libpanic_unwind/Cargo.toml -@@ -1,5 +1,6 @@ - [package] - authors = ["The Rust Project Developers"] -+build = "build.rs" - name = "panic_unwind" - version = "0.0.0" - -diff --git a/src/libpanic_unwind/build.rs b/src/libpanic_unwind/build.rs -new file mode 100644 -index 0000000000..0d9a14b64c ---- /dev/null -+++ b/src/libpanic_unwind/build.rs -@@ -0,0 +1,10 @@ -+use std::env; -+ -+fn main() { -+ let target = env::var("TARGET").unwrap(); -+ match target.as_ref() { -+ "i586-foxkit-linux-musl" => println!("cargo:rustc-link-lib=ssp_nonshared"), -+ "powerpc-foxkit-linux-musl" => println!("cargo:rustc-link-lib=ssp_nonshared"), -+ _ => {}, -+ }; -+} --- -2.18.0 - |