Skip to content

Commit daed10e

Browse files
committed
Vxworks riscv targets added
1 parent df7f778 commit daed10e

File tree

5 files changed

+51
-0
lines changed

5 files changed

+51
-0
lines changed

Diff for: compiler/rustc_target/src/spec/mod.rs

+2
Original file line numberDiff line numberDiff line change
@@ -1842,6 +1842,8 @@ supported_targets! {
18421842
("powerpc-wrs-vxworks", powerpc_wrs_vxworks),
18431843
("powerpc-wrs-vxworks-spe", powerpc_wrs_vxworks_spe),
18441844
("powerpc64-wrs-vxworks", powerpc64_wrs_vxworks),
1845+
("riscv32-wrs-vxworks", riscv32_wrs_vxworks),
1846+
("riscv64-wrs-vxworks", riscv64_wrs_vxworks),
18451847

18461848
("aarch64-kmc-solid_asp3", aarch64_kmc_solid_asp3),
18471849
("armv7a-kmc-solid_asp3-eabi", armv7a_kmc_solid_asp3_eabi),
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
use crate::spec::{base, Cc, LinkerFlavor, Lld, StackProbeType, Target};
2+
pub(crate) fn target() -> Target {
3+
let mut base = base::vxworks::opts();
4+
base.cpu = "generic-rv32".into();
5+
base.plt_by_default = false;
6+
base.max_atomic_width = Some(64);
7+
base.add_pre_link_args(LinkerFlavor::Gnu(Cc::Yes, Lld::No), &["-m32"]);
8+
base.stack_probes = StackProbeType::Inline;
9+
Target {
10+
llvm_target: "riscv32".into(),
11+
metadata: crate::spec::TargetMetadata {
12+
description: None,
13+
tier: Some(3),
14+
host_tools: Some(false),
15+
std: None,
16+
},
17+
pointer_width: 32,
18+
data_layout: "e-m:e-p:32:32-i64:64-n32-S128".into(),
19+
arch: "riscv32".into(),
20+
options: base,
21+
}
22+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
use crate::spec::{base, Cc, LinkerFlavor, Lld, StackProbeType, Target};
2+
3+
pub(crate) fn target() -> Target {
4+
let mut base = base::vxworks::opts();
5+
base.cpu = "generic-rv64".into();
6+
base.plt_by_default = false;
7+
base.max_atomic_width = Some(64);
8+
base.add_pre_link_args(LinkerFlavor::Gnu(Cc::Yes, Lld::No), &["-m64"]);
9+
base.stack_probes = StackProbeType::Inline;
10+
Target {
11+
llvm_target: "riscv64".into(),
12+
metadata: crate::spec::TargetMetadata {
13+
description: None,
14+
tier: Some(3),
15+
host_tools: Some(false),
16+
std: None,
17+
},
18+
pointer_width: 64,
19+
data_layout: "e-m:e-p:64:64-i64:64-i128:128-n32:64-S128".into(),
20+
arch: "riscv64".into(),
21+
options: base,
22+
}
23+
}

Diff for: src/doc/rustc/src/platform-support.md

+2
Original file line numberDiff line numberDiff line change
@@ -358,12 +358,14 @@ target | std | host | notes
358358
[`riscv32imc-esp-espidf`](platform-support/esp-idf.md) | ✓ | | RISC-V ESP-IDF
359359
[`riscv32imac-esp-espidf`](platform-support/esp-idf.md) | ✓ | | RISC-V ESP-IDF
360360
[`riscv32imafc-esp-espidf`](platform-support/esp-idf.md) | ✓ | | RISC-V ESP-IDF
361+
[`riscv32-wrs-vxworks`](platform-support/vxworks.md) | ? | |
361362
[`riscv64gc-unknown-hermit`](platform-support/hermit.md) | ✓ | | RISC-V Hermit
362363
`riscv64gc-unknown-freebsd` | | | RISC-V FreeBSD
363364
`riscv64gc-unknown-fuchsia` | | | RISC-V Fuchsia
364365
[`riscv64gc-unknown-netbsd`](platform-support/netbsd.md) | ✓ | ✓ | RISC-V NetBSD
365366
[`riscv64gc-unknown-openbsd`](platform-support/openbsd.md) | ✓ | ✓ | OpenBSD/riscv64
366367
[`riscv64-linux-android`](platform-support/android.md) | | | RISC-V 64-bit Android
368+
[`riscv64-wrs-vxworks`](platform-support/vxworks.md) | ? | |
367369
`s390x-unknown-linux-musl` | | | S390x Linux (kernel 3.2, musl 1.2.3)
368370
`sparc-unknown-linux-gnu` | ✓ | | 32-bit SPARC Linux
369371
[`sparc-unknown-none-elf`](./platform-support/sparc-unknown-none-elf.md) | * | | Bare 32-bit SPARC V7+

Diff for: src/doc/rustc/src/platform-support/vxworks.md

+2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ Target triplets available:
1414
- `powerpc-wrs-vxworks`
1515
- `powerpc64-wrs-vxworks`
1616
- `powerpc-wrs-vxworks-spe`
17+
- `riscv32-wrs-vxworks`
18+
- `riscv64-wrs-vxworks`
1719

1820
## Target maintainers
1921

0 commit comments

Comments
 (0)