diff options
Diffstat (limited to 'user/rust/0028-Add-foxkit-target-specs.patch')
| -rw-r--r-- | user/rust/0028-Add-foxkit-target-specs.patch | 36 |
1 files changed, 20 insertions, 16 deletions
diff --git a/user/rust/0028-Add-foxkit-target-specs.patch b/user/rust/0028-Add-foxkit-target-specs.patch index 46a255a3c..5f13c2e3b 100644 --- a/user/rust/0028-Add-foxkit-target-specs.patch +++ b/user/rust/0028-Add-foxkit-target-specs.patch @@ -1,18 +1,18 @@ -From a6da366371be1d8a1c55de52d9a53f93b9951cd0 Mon Sep 17 00:00:00 2001 +From 2a651859050ef1826fd1dd15e2bb272a67c03438 Mon Sep 17 00:00:00 2001 From: Samuel Holland <samuel@sholland.org> Date: Mon, 17 Sep 2018 02:29:06 +0000 Subject: [PATCH 28/29] Add foxkit target specs --- - src/bootstrap/native.rs | 10 +++++++-- - .../spec/aarch64_foxkit_linux_musl.rs | 21 +++++++++++++++++++ - .../spec/armv7_foxkit_linux_musleabihf.rs | 21 +++++++++++++++++++ - .../spec/i586_foxkit_linux_musl.rs | 21 +++++++++++++++++++ - src/librustc_target/spec/mod.rs | 7 +++++++ - .../spec/powerpc64_foxkit_linux_musl.rs | 21 +++++++++++++++++++ - .../spec/powerpc_foxkit_linux_musl.rs | 21 +++++++++++++++++++ - .../spec/x86_64_foxkit_linux_musl.rs | 21 +++++++++++++++++++ - 8 files changed, 141 insertions(+), 2 deletions(-) + src/bootstrap/native.rs | 10 ++++++-- + .../spec/aarch64_foxkit_linux_musl.rs | 21 +++++++++++++++++ + .../spec/armv7_foxkit_linux_musleabihf.rs | 21 +++++++++++++++++ + .../spec/i586_foxkit_linux_musl.rs | 23 +++++++++++++++++++ + src/librustc_target/spec/mod.rs | 7 ++++++ + .../spec/powerpc64_foxkit_linux_musl.rs | 21 +++++++++++++++++ + .../spec/powerpc_foxkit_linux_musl.rs | 23 +++++++++++++++++++ + .../spec/x86_64_foxkit_linux_musl.rs | 21 +++++++++++++++++ + 8 files changed, 145 insertions(+), 2 deletions(-) create mode 100644 src/librustc_target/spec/aarch64_foxkit_linux_musl.rs create mode 100644 src/librustc_target/spec/armv7_foxkit_linux_musleabihf.rs create mode 100644 src/librustc_target/spec/i586_foxkit_linux_musl.rs @@ -111,10 +111,10 @@ index 0000000000..facfd5d363 +} diff --git a/src/librustc_target/spec/i586_foxkit_linux_musl.rs b/src/librustc_target/spec/i586_foxkit_linux_musl.rs new file mode 100644 -index 0000000000..cd6280e586 +index 0000000000..e0284d96e6 --- /dev/null +++ b/src/librustc_target/spec/i586_foxkit_linux_musl.rs -@@ -0,0 +1,21 @@ +@@ -0,0 +1,23 @@ +// Copyright 2018 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. @@ -125,7 +125,7 @@ index 0000000000..cd6280e586 +// option. This file may not be copied, modified, or distributed +// except according to those terms. + -+use spec::TargetResult; ++use spec::{LinkerFlavor, TargetResult}; + +pub fn target() -> TargetResult { + let mut base = super::i586_unknown_linux_musl::target()?; @@ -133,6 +133,8 @@ index 0000000000..cd6280e586 + base.llvm_target = "i586-foxkit-linux-musl".to_string(); + base.target_vendor = "foxkit".to_string(); + base.options.crt_static_default = false; ++ base.options.post_link_args.insert(LinkerFlavor::Gcc, ++ vec!["-Wl,--as-needed".to_string(), "-lssp_nonshared".to_string()]); + + Ok(base) +} @@ -183,10 +185,10 @@ index 0000000000..b7202ee0fc +} diff --git a/src/librustc_target/spec/powerpc_foxkit_linux_musl.rs b/src/librustc_target/spec/powerpc_foxkit_linux_musl.rs new file mode 100644 -index 0000000000..4daa96d3ce +index 0000000000..34246a7e28 --- /dev/null +++ b/src/librustc_target/spec/powerpc_foxkit_linux_musl.rs -@@ -0,0 +1,21 @@ +@@ -0,0 +1,23 @@ +// Copyright 2018 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. @@ -197,7 +199,7 @@ index 0000000000..4daa96d3ce +// option. This file may not be copied, modified, or distributed +// except according to those terms. + -+use spec::TargetResult; ++use spec::{LinkerFlavor, TargetResult}; + +pub fn target() -> TargetResult { + let mut base = super::powerpc_unknown_linux_musl::target()?; @@ -205,6 +207,8 @@ index 0000000000..4daa96d3ce + base.llvm_target = "powerpc-foxkit-linux-musl".to_string(); + base.target_vendor = "foxkit".to_string(); + base.options.crt_static_default = false; ++ base.options.post_link_args.insert(LinkerFlavor::Gcc, ++ vec!["-Wl,--as-needed".to_string(), "-lssp_nonshared".to_string()]); + + Ok(base) +} |