Skip to content

Commit 5119a84

Browse files
committed
Add Vxworks riscv 32 and risc 64 targets
1 parent df7f778 commit 5119a84

File tree

6 files changed

+53
-0
lines changed

6 files changed

+53
-0
lines changed

compiler/rustc_target/src/spec/mod.rs

Lines changed: 2 additions & 0 deletions
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),
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
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.max_atomic_width = Some(64);
6+
base.add_pre_link_args(LinkerFlavor::Gnu(Cc::Yes, Lld::No), &["-m32"]);
7+
base.stack_probes = StackProbeType::Inline;
8+
Target {
9+
llvm_target: "riscv32".into(),
10+
metadata: crate::spec::TargetMetadata {
11+
description: None,
12+
tier: Some(3),
13+
host_tools: Some(false),
14+
std: Some(true),
15+
},
16+
pointer_width: 32,
17+
data_layout: "e-m:e-p:32:32-i64:64-n32-S128".into(),
18+
arch: "risv32".into(),
19+
options: base,
20+
}
21+
}
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
use crate::spec::{base, StackProbeType, Target};
2+
pub(crate) fn target() -> Target {
3+
let mut base = base::vxworks::opts();
4+
base.cpu = "generic-rv64".into();
5+
base.max_atomic_width = Some(64);
6+
base.stack_probes = StackProbeType::Inline;
7+
Target {
8+
llvm_target: "riscv64".into(),
9+
metadata: crate::spec::TargetMetadata {
10+
description: None,
11+
tier: Some(3),
12+
host_tools: Some(false),
13+
std: Some(false),
14+
},
15+
pointer_width: 64,
16+
data_layout: "e-m:e-p:64:64-i64:64-i128:128-n32:64-S128".into(),
17+
arch: "risv64".into(),
18+
options: base,
19+
}
20+
}

src/doc/rustc/src/platform-support.md

Lines changed: 2 additions & 0 deletions
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+

src/doc/rustc/src/platform-support/vxworks.md

Lines changed: 2 additions & 0 deletions
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

tests/assembly/targets/targets-elf.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -615,6 +615,9 @@
615615
//@ revisions: thumbv8m_main_nuttx_eabihf
616616
//@ [thumbv8m_main_nuttx_eabihf] compile-flags: --target thumbv8m.main-nuttx-eabihf
617617
//@ [thumbv8m_main_nuttx_eabihf] needs-llvm-components: arm
618+
//@ revisions: riscv32_wrs_vxworks
619+
//@ [riscv32_wrs_vxworks] compile-flags: --target riscv32-wrs-vxworks
620+
//@ [riscv32_wrs_vxworks] needs-llvm-components: riscv
618621
//@ revisions: riscv32imc_unknown_nuttx_elf
619622
//@ [riscv32imc_unknown_nuttx_elf] compile-flags: --target riscv32imc-unknown-nuttx-elf
620623
//@ [riscv32imc_unknown_nuttx_elf] needs-llvm-components: riscv
@@ -624,6 +627,9 @@
624627
//@ revisions: riscv32imafc_unknown_nuttx_elf
625628
//@ [riscv32imafc_unknown_nuttx_elf] compile-flags: --target riscv32imafc-unknown-nuttx-elf
626629
//@ [riscv32imafc_unknown_nuttx_elf] needs-llvm-components: riscv
630+
//@ revisions: riscv64_wrs_vxworks
631+
//@ [riscv64_wrs_vxworks] compile-flags: --target riscv64-wrs-vxworks
632+
//@ [riscv64_wrs_vxworks] needs-llvm-components: riscv
627633
//@ revisions: riscv64imac_unknown_nuttx_elf
628634
//@ [riscv64imac_unknown_nuttx_elf] compile-flags: --target riscv64imac-unknown-nuttx-elf
629635
//@ [riscv64imac_unknown_nuttx_elf] needs-llvm-components: riscv

0 commit comments

Comments
 (0)