aboutsummaryrefslogtreecommitdiff
path: root/lang/rust/patches
diff options
context:
space:
mode:
Diffstat (limited to 'lang/rust/patches')
-rw-r--r--lang/rust/patches/03-add_mips.patch30
-rw-r--r--lang/rust/patches/04-add_mipsel.patch29
-rw-r--r--lang/rust/patches/05-add_aarch64.patch27
-rw-r--r--lang/rust/patches/06-add_armv7.patch38
-rw-r--r--lang/rust/patches/07-add_armv7hf.patch37
-rw-r--r--lang/rust/patches/08-add_powerpc64.patch30
-rw-r--r--lang/rust/patches/09-add_x86_64.patch38
-rw-r--r--lang/rust/patches/10-add_arm.patch34
-rw-r--r--lang/rust/patches/11-add_armhf.patch34
-rw-r--r--lang/rust/patches/12-add_armv5tej.patch36
-rw-r--r--lang/rust/patches/13-add_armv6k.patch36
-rw-r--r--lang/rust/patches/14-add_powerpc.patch29
12 files changed, 398 insertions, 0 deletions
diff --git a/lang/rust/patches/03-add_mips.patch b/lang/rust/patches/03-add_mips.patch
new file mode 100644
index 0000000..db48710
--- /dev/null
+++ b/lang/rust/patches/03-add_mips.patch
@@ -0,0 +1,30 @@
+--- a/compiler/rustc_target/src/spec/mod.rs
++++ b/compiler/rustc_target/src/spec/mod.rs
+@@ -1016,6 +1016,7 @@
+ ("x86_64-unknown-none", x86_64_unknown_none),
+
+ ("mips64-openwrt-linux-musl", mips64_openwrt_linux_musl),
++ ("mips-openwrt-linux-musl", mips_openwrt_linux_musl),
+ }
+
+ /// Warnings encountered when parsing the target `json`.
+--- /dev/null
++++ b/compiler/rustc_target/src/spec/mips_openwrt_linux_musl.rs
+@@ -0,0 +1,17 @@
++use crate::abi::Endian;
++use crate::spec::{Target, TargetOptions};
++
++pub fn target() -> Target {
++ let mut base = super::linux_musl_base::opts();
++ base.cpu = "mips32r2".into();
++ base.features = "+mips32r2,+soft-float".into();
++ base.max_atomic_width = Some(32);
++ base.crt_static_default = false;
++ Target {
++ llvm_target: "mips-unknown-linux-musl".into(),
++ pointer_width: 32,
++ data_layout: "E-m:m-p:32:32-i8:8:32-i16:16:32-i64:64-n32-S64".into(),
++ arch: "mips".into(),
++ options: TargetOptions { endian: Endian::Big, mcount: "_mcount".into(), ..base },
++ }
++}
diff --git a/lang/rust/patches/04-add_mipsel.patch b/lang/rust/patches/04-add_mipsel.patch
new file mode 100644
index 0000000..b64f1ea
--- /dev/null
+++ b/lang/rust/patches/04-add_mipsel.patch
@@ -0,0 +1,29 @@
+--- /dev/null
++++ b/compiler/rustc_target/src/spec/mipsel_openwrt_linux_musl.rs
+@@ -0,0 +1,16 @@
++use crate::spec::{Target, TargetOptions};
++
++pub fn target() -> Target {
++ let mut base = super::linux_musl_base::opts();
++ base.cpu = "mips32r2".into();
++ base.features = "+mips32r2,+soft-float".into();
++ base.max_atomic_width = Some(32);
++ base.crt_static_default = false;
++ Target {
++ llvm_target: "mipsel-unknown-linux-musl".into(),
++ pointer_width: 32,
++ data_layout: "e-m:m-p:32:32-i8:8:32-i16:16:32-i64:64-n32-S64".into(),
++ arch: "mips".into(),
++ options: TargetOptions { mcount: "_mcount".into(), ..base },
++ }
++}
+--- a/compiler/rustc_target/src/spec/mod.rs
++++ b/compiler/rustc_target/src/spec/mod.rs
+@@ -1015,6 +1015,7 @@
+
+ ("mips64-openwrt-linux-musl", mips64_openwrt_linux_musl),
+ ("mips-openwrt-linux-musl", mips_openwrt_linux_musl),
++ ("mipsel-openwrt-linux-musl", mipsel_openwrt_linux_musl),
+ }
+
+ /// Warnings encountered when parsing the target `json`.
diff --git a/lang/rust/patches/05-add_aarch64.patch b/lang/rust/patches/05-add_aarch64.patch
new file mode 100644
index 0000000..0d21d6f
--- /dev/null
+++ b/lang/rust/patches/05-add_aarch64.patch
@@ -0,0 +1,27 @@
+--- /dev/null
++++ b/compiler/rustc_target/src/spec/aarch64_openwrt_linux_musl.rs
+@@ -0,0 +1,14 @@
++use crate::spec::{Target, TargetOptions};
++
++pub fn target() -> Target {
++ let mut base = super::linux_musl_base::opts();
++ base.max_atomic_width = Some(128);
++
++ Target {
++ llvm_target: "aarch64-unknown-linux-musl".into(),
++ pointer_width: 64,
++ data_layout: "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128".into(),
++ arch: "aarch64".into(),
++ options: TargetOptions { mcount: "\u{1}_mcount".into(), ..base },
++ }
++}
+--- a/compiler/rustc_target/src/spec/mod.rs
++++ b/compiler/rustc_target/src/spec/mod.rs
+@@ -1016,6 +1016,7 @@
+ ("mips64-openwrt-linux-musl", mips64_openwrt_linux_musl),
+ ("mips-openwrt-linux-musl", mips_openwrt_linux_musl),
+ ("mipsel-openwrt-linux-musl", mipsel_openwrt_linux_musl),
++ ("aarch64-openwrt-linux-musl", aarch64_openwrt_linux_musl),
+ }
+
+ /// Warnings encountered when parsing the target `json`.
diff --git a/lang/rust/patches/06-add_armv7.patch b/lang/rust/patches/06-add_armv7.patch
new file mode 100644
index 0000000..e00aa61
--- /dev/null
+++ b/lang/rust/patches/06-add_armv7.patch
@@ -0,0 +1,38 @@
+--- /dev/null
++++ b/compiler/rustc_target/src/spec/armv7_openwrt_linux_muslgnueabi.rs
+@@ -0,0 +1,25 @@
++use crate::spec::{Target, TargetOptions};
++
++// This target is for musl Linux on ARMv7 without thumb-mode, NEON or
++// hardfloat.
++
++pub fn target() -> Target {
++ // Most of these settings are copied from the armv7_unknown_linux_gnueabi
++ // target.
++ Target {
++ // It's important we use "gnueabi" and not "musleabi" here. LLVM uses it
++ // to determine the calling convention and float ABI, and it doesn't
++ // support the "musleabi" value.
++ llvm_target: "armv7-unknown-linux-gnueabi".into(),
++ pointer_width: 32,
++ data_layout: "e-m:e-p:32:32-Fi8-i64:64-v128:64:128-a:0:32-n32-S64".into(),
++ arch: "arm".into(),
++
++ options: TargetOptions {
++ abi: "eabi".into(),
++ max_atomic_width: Some(64),
++ mcount: "\u{1}mcount".into(),
++ ..super::linux_musl_base::opts()
++ },
++ }
++}
+--- a/compiler/rustc_target/src/spec/mod.rs
++++ b/compiler/rustc_target/src/spec/mod.rs
+@@ -1017,6 +1017,7 @@
+ ("mips-openwrt-linux-musl", mips_openwrt_linux_musl),
+ ("mipsel-openwrt-linux-musl", mipsel_openwrt_linux_musl),
+ ("aarch64-openwrt-linux-musl", aarch64_openwrt_linux_musl),
++ ("armv7-openwrt-linux-muslgnueabi", armv7_openwrt_linux_muslgnueabi),
+ }
+
+ /// Warnings encountered when parsing the target `json`.
diff --git a/lang/rust/patches/07-add_armv7hf.patch b/lang/rust/patches/07-add_armv7hf.patch
new file mode 100644
index 0000000..f06f799
--- /dev/null
+++ b/lang/rust/patches/07-add_armv7hf.patch
@@ -0,0 +1,37 @@
+--- /dev/null
++++ b/compiler/rustc_target/src/spec/armv7_openwrt_linux_muslgnueabihf.rs
+@@ -0,0 +1,24 @@
++use crate::spec::{Target, TargetOptions};
++
++// This target is for musl Linux on ARMv7 without thumb-mode or NEON.
++
++pub fn target() -> Target {
++ Target {
++ // It's important we use "gnueabihf" and not "musleabihf" here. LLVM
++ // uses it to determine the calling convention and float ABI, and LLVM
++ // doesn't support the "musleabihf" value.
++ llvm_target: "armv7-unknown-linux-gnueabihf".into(),
++ pointer_width: 32,
++ data_layout: "e-m:e-p:32:32-Fi8-i64:64-v128:64:128-a:0:32-n32-S64".into(),
++ arch: "arm".into(),
++
++ // Most of these settings are copied from the armv7_unknown_linux_gnueabihf
++ // target.
++ options: TargetOptions {
++ abi: "eabihf".into(),
++ max_atomic_width: Some(64),
++ mcount: "\u{1}mcount".into(),
++ ..super::linux_musl_base::opts()
++ },
++ }
++}
+--- a/compiler/rustc_target/src/spec/mod.rs
++++ b/compiler/rustc_target/src/spec/mod.rs
+@@ -1018,6 +1018,7 @@
+ ("mipsel-openwrt-linux-musl", mipsel_openwrt_linux_musl),
+ ("aarch64-openwrt-linux-musl", aarch64_openwrt_linux_musl),
+ ("armv7-openwrt-linux-muslgnueabi", armv7_openwrt_linux_muslgnueabi),
++ ("armv7-openwrt-linux-muslgnueabihf", armv7_openwrt_linux_muslgnueabihf),
+ }
+
+ /// Warnings encountered when parsing the target `json`.
diff --git a/lang/rust/patches/08-add_powerpc64.patch b/lang/rust/patches/08-add_powerpc64.patch
new file mode 100644
index 0000000..1d73df4
--- /dev/null
+++ b/lang/rust/patches/08-add_powerpc64.patch
@@ -0,0 +1,30 @@
+--- /dev/null
++++ b/compiler/rustc_target/src/spec/powerpc64_openwrt_linux_musl.rs
+@@ -0,0 +1,17 @@
++use crate::abi::Endian;
++use crate::spec::{LinkerFlavor, Target, TargetOptions};
++
++pub fn target() -> Target {
++ let mut base = super::linux_musl_base::opts();
++ base.cpu = "ppc64".into();
++ base.pre_link_args.entry(LinkerFlavor::Gcc).or_default().push("-m64".into());
++ base.max_atomic_width = Some(64);
++
++ Target {
++ llvm_target: "powerpc64-unknown-linux-musl".into(),
++ pointer_width: 64,
++ data_layout: "E-m:e-i64:64-n32:64-S128-v256:256:256-v512:512:512".into(),
++ arch: "powerpc64".into(),
++ options: TargetOptions { endian: Endian::Big, mcount: "_mcount".into(), ..base },
++ }
++}
+--- a/compiler/rustc_target/src/spec/mod.rs
++++ b/compiler/rustc_target/src/spec/mod.rs
+@@ -1019,6 +1019,7 @@
+ ("aarch64-openwrt-linux-musl", aarch64_openwrt_linux_musl),
+ ("armv7-openwrt-linux-muslgnueabi", armv7_openwrt_linux_muslgnueabi),
+ ("armv7-openwrt-linux-muslgnueabihf", armv7_openwrt_linux_muslgnueabihf),
++ ("powerpc64-openwrt-linux-musl", powerpc64_openwrt_linux_musl),
+ }
+
+ /// Warnings encountered when parsing the target `json`.
diff --git a/lang/rust/patches/09-add_x86_64.patch b/lang/rust/patches/09-add_x86_64.patch
new file mode 100644
index 0000000..b1e2b4b
--- /dev/null
+++ b/lang/rust/patches/09-add_x86_64.patch
@@ -0,0 +1,38 @@
+--- /dev/null
++++ b/compiler/rustc_target/src/spec/x86_64_openwrt_linux_musl.rs
+@@ -0,0 +1,25 @@
++use crate::spec::{LinkerFlavor, SanitizerSet, StackProbeType, Target};
++
++pub fn target() -> Target {
++ let mut base = super::linux_musl_base::opts();
++ base.cpu = "x86-64".into();
++ base.max_atomic_width = Some(64);
++ base.pre_link_args.entry(LinkerFlavor::Gcc).or_default().push("-m64".into());
++ // don't use probe-stack=inline-asm until rust#83139 and rust#84667 are resolved
++ base.stack_probes = StackProbeType::Call;
++ base.static_position_independent_executables = true;
++ base.supported_sanitizers = SanitizerSet::ADDRESS
++ | SanitizerSet::CFI
++ | SanitizerSet::LEAK
++ | SanitizerSet::MEMORY
++ | SanitizerSet::THREAD;
++
++ Target {
++ llvm_target: "x86_64-unknown-linux-musl".into(),
++ pointer_width: 64,
++ data_layout: "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
++ .into(),
++ arch: "x86_64".into(),
++ options: base,
++ }
++}
+--- a/compiler/rustc_target/src/spec/mod.rs
++++ b/compiler/rustc_target/src/spec/mod.rs
+@@ -1020,6 +1020,7 @@
+ ("armv7-openwrt-linux-muslgnueabi", armv7_openwrt_linux_muslgnueabi),
+ ("armv7-openwrt-linux-muslgnueabihf", armv7_openwrt_linux_muslgnueabihf),
+ ("powerpc64-openwrt-linux-musl", powerpc64_openwrt_linux_musl),
++ ("x86_64-openwrt-linux-musl", x86_64_openwrt_linux_musl),
+ }
+
+ /// Warnings encountered when parsing the target `json`.
diff --git a/lang/rust/patches/10-add_arm.patch b/lang/rust/patches/10-add_arm.patch
new file mode 100644
index 0000000..e5580ce
--- /dev/null
+++ b/lang/rust/patches/10-add_arm.patch
@@ -0,0 +1,34 @@
+--- /dev/null 2022-04-12 18:46:38.250000000 -0400
++++ b/compiler/rustc_target/src/spec/arm_openwrt_linux_muslgnueabi.rs
+@@ -0,0 +1,21 @@
++use crate::spec::{Target, TargetOptions};
++
++pub fn target() -> Target {
++ Target {
++ // It's important we use "gnueabi" and not "musleabi" here. LLVM uses it
++ // to determine the calling convention and float ABI, and it doesn't
++ // support the "musleabi" value.
++ llvm_target: "arm-unknown-linux-gnueabi".into(),
++ pointer_width: 32,
++ data_layout: "e-m:e-p:32:32-Fi8-i64:64-v128:64:128-a:0:32-n32-S64".into(),
++ arch: "arm".into(),
++ options: TargetOptions {
++ abi: "eabi".into(),
++ // Most of these settings are copied from the arm_unknown_linux_gnueabi
++ // target.
++ max_atomic_width: Some(64),
++ mcount: "\u{1}mcount".into(),
++ ..super::linux_musl_base::opts()
++ },
++ }
++}
+--- a/compiler/rustc_target/src/spec/mod.rs
++++ b/compiler/rustc_target/src/spec/mod.rs
+@@ -1030,6 +1030,7 @@ supported_targets! {
+ ("armv7-openwrt-linux-muslgnueabihf", armv7_openwrt_linux_muslgnueabihf),
+ ("powerpc64-openwrt-linux-musl", powerpc64_openwrt_linux_musl),
+ ("x86_64-openwrt-linux-musl", x86_64_openwrt_linux_musl),
++ ("arm-openwrt-linux-muslgnueabi", arm_openwrt_linux_muslgnueabi),
+ }
+
+ /// Warnings encountered when parsing the target `json`.
diff --git a/lang/rust/patches/11-add_armhf.patch b/lang/rust/patches/11-add_armhf.patch
new file mode 100644
index 0000000..9ccddbd
--- /dev/null
+++ b/lang/rust/patches/11-add_armhf.patch
@@ -0,0 +1,34 @@
+--- /dev/null
++++ b/compiler/rustc_target/src/spec/arm_openwrt_linux_muslgnueabihf.rs
+@@ -0,0 +1,21 @@
++use crate::spec::{Target, TargetOptions};
++
++pub fn target() -> Target {
++ Target {
++ // It's important we use "gnueabihf" and not "musleabihf" here. LLVM
++ // uses it to determine the calling convention and float ABI, and it
++ // doesn't support the "musleabihf" value.
++ llvm_target: "arm-unknown-linux-gnueabihf".into(),
++ pointer_width: 32,
++ data_layout: "e-m:e-p:32:32-Fi8-i64:64-v128:64:128-a:0:32-n32-S64".into(),
++ arch: "arm".into(),
++ options: TargetOptions {
++ abi: "eabihf".into(),
++ // Most of these settings are copied from the arm_unknown_linux_gnueabihf
++ // target.
++ max_atomic_width: Some(64),
++ mcount: "\u{1}mcount".into(),
++ ..super::linux_musl_base::opts()
++ },
++ }
++}
+--- a/compiler/rustc_target/src/spec/mod.rs
++++ b/compiler/rustc_target/src/spec/mod.rs
+@@ -1031,6 +1031,7 @@ supported_targets! {
+ ("powerpc64-openwrt-linux-musl", powerpc64_openwrt_linux_musl),
+ ("x86_64-openwrt-linux-musl", x86_64_openwrt_linux_musl),
+ ("arm-openwrt-linux-muslgnueabi", arm_openwrt_linux_muslgnueabi),
++ ("arm-openwrt-linux-muslgnueabihf", arm_openwrt_linux_muslgnueabihf),
+ }
+
+ /// Warnings encountered when parsing the target `json`.
diff --git a/lang/rust/patches/12-add_armv5tej.patch b/lang/rust/patches/12-add_armv5tej.patch
new file mode 100644
index 0000000..750d432
--- /dev/null
+++ b/lang/rust/patches/12-add_armv5tej.patch
@@ -0,0 +1,36 @@
+--- /dev/null
++++ b/compiler/rustc_target/src/spec/armv5tej_openwrt_linux_muslgnueabi.rs
+@@ -0,0 +1,23 @@
++use crate::spec::{Target, TargetOptions};
++
++pub fn target() -> Target {
++ Target {
++ // FIXME: this comment below does not seem applicable?
++ // It's important we use "gnueabihf" and not "musleabihf" here. LLVM
++ // uses it to determine the calling convention and float ABI, and LLVM
++ // doesn't support the "musleabihf" value.
++ llvm_target: "armv5tej-unknown-linux-gnueabi".into(),
++ pointer_width: 32,
++ data_layout: "e-m:e-p:32:32-Fi8-i64:64-v128:64:128-a:0:32-n32-S64".into(),
++ arch: "arm".into(),
++ options: TargetOptions {
++ abi: "eabi".into(),
++ // Atomic operations provided by compiler-builtins
++ max_atomic_width: None,
++ atomic_cas: false,
++ mcount: "\u{1}mcount".into(),
++ has_thumb_interworking: true,
++ ..super::linux_musl_base::opts()
++ },
++ }
++}
+--- a/compiler/rustc_target/src/spec/mod.rs
++++ b/compiler/rustc_target/src/spec/mod.rs
+@@ -1032,6 +1032,7 @@ supported_targets! {
+ ("x86_64-openwrt-linux-musl", x86_64_openwrt_linux_musl),
+ ("arm-openwrt-linux-muslgnueabi", arm_openwrt_linux_muslgnueabi),
+ ("arm-openwrt-linux-muslgnueabihf", arm_openwrt_linux_muslgnueabihf),
++ ("armv5tej-openwrt-linux-muslgnueabi", armv5tej_openwrt_linux_muslgnueabi),
+ }
+
+ /// Warnings encountered when parsing the target `json`.
diff --git a/lang/rust/patches/13-add_armv6k.patch b/lang/rust/patches/13-add_armv6k.patch
new file mode 100644
index 0000000..79b82c8
--- /dev/null
+++ b/lang/rust/patches/13-add_armv6k.patch
@@ -0,0 +1,36 @@
+--- /dev/null
++++ rust-1.60.0/compiler/rustc_target/src/spec/armv6k_openwrt_linux_muslgnueabi.rs
+@@ -0,0 +1,21 @@
++use crate::spec::{Target, TargetOptions};
++
++pub fn target() -> Target {
++ Target {
++ // It's important we use "gnueabi" and not "musleabi" here. LLVM uses it
++ // to determine the calling convention and float ABI, and it doesn't
++ // support the "musleabi" value.
++ llvm_target: "armv6k-unknown-linux-gnueabi".into(),
++ pointer_width: 32,
++ data_layout: "e-m:e-p:32:32-Fi8-i64:64-v128:64:128-a:0:32-n32-S64".into(),
++ arch: "arm".into(),
++ options: TargetOptions {
++ abi: "eabi".into(),
++ // Most of these settings are copied from the arm_unknown_linux_gnueabi
++ // target.
++ max_atomic_width: Some(64),
++ mcount: "\u{1}mcount".into(),
++ ..super::linux_musl_base::opts()
++ },
++ }
++}
+Index: rust-1.60.0/compiler/rustc_target/src/spec/mod.rs
+===================================================================
+--- rust-1.60.0.orig/compiler/rustc_target/src/spec/mod.rs
++++ rust-1.60.0/compiler/rustc_target/src/spec/mod.rs
+@@ -1033,6 +1033,7 @@ supported_targets! {
+ ("arm-openwrt-linux-muslgnueabi", arm_openwrt_linux_muslgnueabi),
+ ("arm-openwrt-linux-muslgnueabihf", arm_openwrt_linux_muslgnueabihf),
+ ("armv5tej-openwrt-linux-muslgnueabi", armv5tej_openwrt_linux_muslgnueabi),
++ ("armv6k-openwrt-linux-muslgnueabi", armv6k_openwrt_linux_muslgnueabi),
+ }
+
+ /// Warnings encountered when parsing the target `json`.
diff --git a/lang/rust/patches/14-add_powerpc.patch b/lang/rust/patches/14-add_powerpc.patch
new file mode 100644
index 0000000..5ad20d4
--- /dev/null
+++ b/lang/rust/patches/14-add_powerpc.patch
@@ -0,0 +1,29 @@
+--- a/compiler/rustc_target/src/spec/mod.rs
++++ b/compiler/rustc_target/src/spec/mod.rs
+@@ -1034,6 +1034,7 @@ supported_targets! {
+ ("arm-openwrt-linux-muslgnueabihf", arm_openwrt_linux_muslgnueabihf),
+ ("armv5tej-openwrt-linux-muslgnueabi", armv5tej_openwrt_linux_muslgnueabi),
+ ("armv6k-openwrt-linux-muslgnueabi", armv6k_openwrt_linux_muslgnueabi),
++ ("powerpc-openwrt-linux-musl", powerpc_openwrt_linux_musl),
+ }
+
+ /// Warnings encountered when parsing the target `json`.
+--- /dev/null
++++ b/compiler/rustc_target/src/spec/powerpc_openwrt_linux_musl.rs
+@@ -0,0 +1,16 @@
++use crate::abi::Endian;
++use crate::spec::{LinkerFlavor, Target, TargetOptions};
++
++pub fn target() -> Target {
++ let mut base = super::linux_musl_base::opts();
++ base.pre_link_args.entry(LinkerFlavor::Gcc).or_default().push("-m32".into());
++ base.max_atomic_width = Some(32);
++
++ Target {
++ llvm_target: "powerpc-unknown-linux-musl".into(),
++ pointer_width: 32,
++ data_layout: "E-m:e-p:32:32-i64:64-n32".into(),
++ arch: "powerpc".into(),
++ options: TargetOptions { endian: Endian::Big, mcount: "_mcount".into(), ..base },
++ }
++}
Powered by cgit, Themed by Ted Yin.