forked from gentoo/gentoo
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
This required a refactor of the gentoo-musl-target-specs.patch, to adopt the new format of the target() method. Closes: https://bugs.gentoo.org/768351 Closes: gentoo#19060 Signed-off-by: Margarita Manterola <[email protected]> Signed-off-by: Georgy Yakovlev <[email protected]>
- Loading branch information
Showing
3 changed files
with
794 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
164 changes: 164 additions & 0 deletions
164
dev-lang/rust/files/1.49.0-gentoo-musl-target-specs.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,164 @@ | ||
| From 671ef2d1c228aed031b4232b8bea96f17b825263 Mon Sep 17 00:00:00 2001 | ||
| From: Georgy Yakovlev <[email protected]> | ||
| Date: Mon, 23 Nov 2020 14:52:04 -0800 | ||
| Subject: [PATCH] add gentoo musl target specs | ||
|
|
||
| --- | ||
| .../src/spec/aarch64_gentoo_linux_musl.rs | 11 +++++++++++ | ||
| .../src/spec/armv7_gentoo_linux_musleabihf.rs | 11 +++++++++++ | ||
| .../rustc_target/src/spec/i686_gentoo_linux_musl.rs | 11 +++++++++++ | ||
| compiler/rustc_target/src/spec/mod.rs | 8 ++++++++ | ||
| .../src/spec/powerpc64_gentoo_linux_musl.rs | 11 +++++++++++ | ||
| .../src/spec/powerpc64le_gentoo_linux_musl.rs | 11 +++++++++++ | ||
| .../src/spec/powerpc_gentoo_linux_musl.rs | 11 +++++++++++ | ||
| .../rustc_target/src/spec/x86_64_gentoo_linux_musl.rs | 11 +++++++++++ | ||
| 8 files changed, 85 insertions(+) | ||
| create mode 100644 compiler/rustc_target/src/spec/aarch64_gentoo_linux_musl.rs | ||
| create mode 100644 compiler/rustc_target/src/spec/armv7_gentoo_linux_musleabihf.rs | ||
| create mode 100644 compiler/rustc_target/src/spec/i686_gentoo_linux_musl.rs | ||
| create mode 100644 compiler/rustc_target/src/spec/powerpc64_gentoo_linux_musl.rs | ||
| create mode 100644 compiler/rustc_target/src/spec/powerpc64le_gentoo_linux_musl.rs | ||
| create mode 100644 compiler/rustc_target/src/spec/powerpc_gentoo_linux_musl.rs | ||
| create mode 100644 compiler/rustc_target/src/spec/x86_64_gentoo_linux_musl.rs | ||
|
|
||
| diff --git a/compiler/rustc_target/src/spec/aarch64_gentoo_linux_musl.rs b/compiler/rustc_target/src/spec/aarch64_gentoo_linux_musl.rs | ||
| new file mode 100644 | ||
| index 0000000..420fe7c | ||
| --- /dev/null | ||
| +++ b/compiler/rustc_target/src/spec/aarch64_gentoo_linux_musl.rs | ||
| @@ -0,0 +1,11 @@ | ||
| +use crate::spec::Target; | ||
| + | ||
| +pub fn target() -> Target { | ||
| + let mut base = super::aarch64_unknown_linux_musl::target(); | ||
| + | ||
| + base.llvm_target = "aarch64-gentoo-linux-musl".to_string(); | ||
| + base.options.vendor = "gentoo".to_string(); | ||
| + base.options.crt_static_default = false; | ||
| + | ||
| + base | ||
| +} | ||
| diff --git a/compiler/rustc_target/src/spec/armv7_gentoo_linux_musleabihf.rs b/compiler/rustc_target/src/spec/armv7_gentoo_linux_musleabihf.rs | ||
| new file mode 100644 | ||
| index 0000000..067e2d6 | ||
| --- /dev/null | ||
| +++ b/compiler/rustc_target/src/spec/armv7_gentoo_linux_musleabihf.rs | ||
| @@ -0,0 +1,11 @@ | ||
| +use crate::spec::Target; | ||
| + | ||
| +pub fn target() -> Target { | ||
| + let mut base = super::armv7_unknown_linux_musleabihf::target(); | ||
| + | ||
| + base.llvm_target = "armv7-gentoo-linux-musleabihf".to_string(); | ||
| + base.options.vendor = "gentoo".to_string(); | ||
| + base.options.crt_static_default = false; | ||
| + | ||
| + base | ||
| +} | ||
| diff --git a/compiler/rustc_target/src/spec/i686_gentoo_linux_musl.rs b/compiler/rustc_target/src/spec/i686_gentoo_linux_musl.rs | ||
| new file mode 100644 | ||
| index 0000000..1cd39cd | ||
| --- /dev/null | ||
| +++ b/compiler/rustc_target/src/spec/i686_gentoo_linux_musl.rs | ||
| @@ -0,0 +1,11 @@ | ||
| +use crate::spec::Target; | ||
| + | ||
| +pub fn target() -> Target { | ||
| + let mut base = super::i686_unknown_linux_musl::target(); | ||
| + | ||
| + base.llvm_target = "i686-gentoo-linux-musl".to_string(); | ||
| + base.options.vendor = "gentoo".to_string(); | ||
| + base.options.crt_static_default = false; | ||
| + | ||
| + base | ||
| +} | ||
| diff --git a/compiler/rustc_target/src/spec/mod.rs b/compiler/rustc_target/src/spec/mod.rs | ||
| index f1e8330..d8c0ba0 100644 | ||
| --- a/compiler/rustc_target/src/spec/mod.rs | ||
| +++ b/compiler/rustc_target/src/spec/mod.rs | ||
| @@ -490,6 +490,14 @@ macro_rules! supported_targets { | ||
| } | ||
|
|
||
| supported_targets! { | ||
| + ("aarch64-gentoo-linux-musl", aarch64_gentoo_linux_musl), | ||
| + ("armv7-gentoo-linux-musleabihf", armv7_gentoo_linux_musleabihf), | ||
| + ("i686-gentoo-linux-musl", i686_gentoo_linux_musl), | ||
| + ("powerpc-gentoo-linux-musl", powerpc_gentoo_linux_musl), | ||
| + ("powerpc64-gentoo-linux-musl", powerpc64_gentoo_linux_musl), | ||
| + ("powerpc64le-gentoo-linux-musl", powerpc64le_gentoo_linux_musl), | ||
| + ("x86_64-gentoo-linux-musl", x86_64_gentoo_linux_musl), | ||
| + | ||
| ("x86_64-unknown-linux-gnu", x86_64_unknown_linux_gnu), | ||
| ("x86_64-unknown-linux-gnux32", x86_64_unknown_linux_gnux32), | ||
| ("i686-unknown-linux-gnu", i686_unknown_linux_gnu), | ||
| diff --git a/compiler/rustc_target/src/spec/powerpc64_gentoo_linux_musl.rs b/compiler/rustc_target/src/spec/powerpc64_gentoo_linux_musl.rs | ||
| new file mode 100644 | ||
| index 0000000..e840bb2 | ||
| --- /dev/null | ||
| +++ b/compiler/rustc_target/src/spec/powerpc64_gentoo_linux_musl.rs | ||
| @@ -0,0 +1,11 @@ | ||
| +use crate::spec::Target; | ||
| + | ||
| +pub fn target() -> Target { | ||
| + let mut base = super::powerpc64_unknown_linux_musl::target(); | ||
| + | ||
| + base.llvm_target = "powerpc64-gentoo-linux-musl".to_string(); | ||
| + base.options.vendor = "gentoo".to_string(); | ||
| + base.options.crt_static_default = false; | ||
| + | ||
| + base | ||
| +} | ||
| diff --git a/compiler/rustc_target/src/spec/powerpc64le_gentoo_linux_musl.rs b/compiler/rustc_target/src/spec/powerpc64le_gentoo_linux_musl.rs | ||
| new file mode 100644 | ||
| index 0000000..1037d82 | ||
| --- /dev/null | ||
| +++ b/compiler/rustc_target/src/spec/powerpc64le_gentoo_linux_musl.rs | ||
| @@ -0,0 +1,11 @@ | ||
| +use crate::spec::Target; | ||
| + | ||
| +pub fn target() -> Target { | ||
| + let mut base = super::powerpc64le_unknown_linux_musl::target(); | ||
| + | ||
| + base.llvm_target = "powerpc64le-gentoo-linux-musl".to_string(); | ||
| + base.options.vendor = "gentoo".to_string(); | ||
| + base.options.crt_static_default = false; | ||
| + | ||
| + base | ||
| +} | ||
| diff --git a/compiler/rustc_target/src/spec/powerpc_gentoo_linux_musl.rs b/compiler/rustc_target/src/spec/powerpc_gentoo_linux_musl.rs | ||
| new file mode 100644 | ||
| index 0000000..a623ffe | ||
| --- /dev/null | ||
| +++ b/compiler/rustc_target/src/spec/powerpc_gentoo_linux_musl.rs | ||
| @@ -0,0 +1,11 @@ | ||
| +use crate::spec::Target; | ||
| + | ||
| +pub fn target() -> Target { | ||
| + let mut base = super::powerpc_unknown_linux_musl::target(); | ||
| + | ||
| + base.llvm_target = "powerpc-gentoo-linux-musl".to_string(); | ||
| + base.options.vendor = "gentoo".to_string(); | ||
| + base.options.crt_static_default = false; | ||
| + | ||
| + base | ||
| +} | ||
| diff --git a/compiler/rustc_target/src/spec/x86_64_gentoo_linux_musl.rs b/compiler/rustc_target/src/spec/x86_64_gentoo_linux_musl.rs | ||
| new file mode 100644 | ||
| index 0000000..f330473 | ||
| --- /dev/null | ||
| +++ b/compiler/rustc_target/src/spec/x86_64_gentoo_linux_musl.rs | ||
| @@ -0,0 +1,11 @@ | ||
| +use crate::spec::Target; | ||
| + | ||
| +pub fn target() -> Target { | ||
| + let mut base = super::x86_64_unknown_linux_musl::target(); | ||
| + | ||
| + base.llvm_target = "x86_64-gentoo-linux-musl".to_string(); | ||
| + base.options.vendor = "gentoo".to_string(); | ||
| + base.options.crt_static_default = false; | ||
| + | ||
| + base | ||
| +} | ||
| -- | ||
| 2.29.2 | ||
|
|
Oops, something went wrong.