From 3e47f5f065b2cd15b602881dd631ec110ffae598 Mon Sep 17 00:00:00 2001 From: Tomoaki Kawada Date: Thu, 10 Jun 2021 15:47:53 +0900 Subject: [PATCH 1/2] Add SOLID target support --- src/lib.rs | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/lib.rs b/src/lib.rs index 6802d238d..c5a2b53bb 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1614,6 +1614,10 @@ impl Build { } } + if target.contains("-kmc-solid-") { + cmd.args.push("-finput-charset=utf-8".into()); + } + if self.static_flag.is_none() { let features = self .getenv("CARGO_CFG_TARGET_FEATURE") @@ -1625,7 +1629,7 @@ impl Build { // armv7 targets get to use armv7 instructions if (target.starts_with("armv7") || target.starts_with("thumbv7")) - && target.contains("-linux-") + && (target.contains("-linux-") || target.contains("-kmc-solid-")) { cmd.args.push("-march=armv7-a".into()); } @@ -2166,6 +2170,10 @@ impl Build { } else { "wr-cc".to_string() } + } else if target.starts_with("armv7a-kmc-solid-") { + format!("arm-kmc-eabi-{}", gnu) + } else if target.starts_with("aarch64-kmc-solid-") { + format!("aarch64-kmc-elf-{}", gnu) } else if self.get_host()? != target { let prefix = self.prefix_for_target(&target); match prefix { From e5411dbe6a39282f6b1a7881a7120ee3361218fe Mon Sep 17 00:00:00 2001 From: Tomoaki Kawada Date: Mon, 27 Sep 2021 11:49:17 +0900 Subject: [PATCH 2/2] kmc-solid: Change `target_os` to `solid_asp3` --- src/lib.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index c5a2b53bb..b8dc347c0 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1614,7 +1614,7 @@ impl Build { } } - if target.contains("-kmc-solid-") { + if target.contains("-kmc-solid_") { cmd.args.push("-finput-charset=utf-8".into()); } @@ -1629,7 +1629,7 @@ impl Build { // armv7 targets get to use armv7 instructions if (target.starts_with("armv7") || target.starts_with("thumbv7")) - && (target.contains("-linux-") || target.contains("-kmc-solid-")) + && (target.contains("-linux-") || target.contains("-kmc-solid_")) { cmd.args.push("-march=armv7-a".into()); } @@ -2170,9 +2170,9 @@ impl Build { } else { "wr-cc".to_string() } - } else if target.starts_with("armv7a-kmc-solid-") { + } else if target.starts_with("armv7a-kmc-solid_") { format!("arm-kmc-eabi-{}", gnu) - } else if target.starts_with("aarch64-kmc-solid-") { + } else if target.starts_with("aarch64-kmc-solid_") { format!("aarch64-kmc-elf-{}", gnu) } else if self.get_host()? != target { let prefix = self.prefix_for_target(&target);