Skip to content

Commit 95f9a73

Browse files
committed
Add Vxworks-riscv targets
1 parent df7f778 commit 95f9a73

File tree

6 files changed

+60
-0
lines changed

6 files changed

+60
-0
lines changed

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,24 @@
1+
use crate::spec::{base, StackProbeType, Target, TargetOptions};
2+
3+
pub(crate) fn target() -> Target {
4+
Target {
5+
llvm_target: "riscv32".into(),
6+
metadata: crate::spec::TargetMetadata {
7+
description: None,
8+
tier: Some(3),
9+
host_tools: Some(false),
10+
std: None, // ?
11+
},
12+
pointer_width: 32,
13+
data_layout: "e-m:e-p:32:32-i64:64-n32-S128".into(),
14+
arch: "riscv32".into(),
15+
options: TargetOptions {
16+
cpu: "generic-rv32".into(),
17+
llvm_abiname: "ilp32d".into(),
18+
max_atomic_width: Some(32),
19+
features: "+m,+a,+f,+d,+c,+zicsr".into(),
20+
stack_probes: StackProbeType::Inline,
21+
..base::vxworks::opts()
22+
},
23+
}
24+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
use crate::spec::{base, StackProbeType, Target, TargetOptions};
2+
3+
pub(crate) fn target() -> Target {
4+
Target {
5+
llvm_target: "riscv64".into(),
6+
metadata: crate::spec::TargetMetadata {
7+
description: None,
8+
tier: Some(3),
9+
host_tools: Some(false),
10+
std: None, // ?
11+
},
12+
pointer_width: 64,
13+
data_layout: "e-m:e-p:64:64-i64:64-i128:128-n32:64-S128".into(),
14+
arch: "riscv64".into(),
15+
options: TargetOptions {
16+
cpu: "generic-rv64".into(),
17+
llvm_abiname: "lp64d".into(),
18+
max_atomic_width: Some(64),
19+
features: "+m,+a,+f,+d,+c,+zicsr".into(),
20+
stack_probes: StackProbeType::Inline,
21+
..base::vxworks::opts()
22+
},
23+
}
24+
}

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+

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

tests/assembly/targets/targets-elf.rs

+6
Original file line numberDiff line numberDiff line change
@@ -372,6 +372,9 @@
372372
//@ revisions: powerpc_wrs_vxworks_spe
373373
//@ [powerpc_wrs_vxworks_spe] compile-flags: --target powerpc-wrs-vxworks-spe
374374
//@ [powerpc_wrs_vxworks_spe] needs-llvm-components: powerpc
375+
//@ revisions: riscv32_wrs_vxworks
376+
//@ [riscv32_wrs_vxworks] compile-flags: --target riscv32-wrs-vxworks
377+
//@ [riscv32_wrs_vxworks] needs-llvm-components: riscv
375378
//@ revisions: riscv32gc_unknown_linux_gnu
376379
//@ [riscv32gc_unknown_linux_gnu] compile-flags: --target riscv32gc-unknown-linux-gnu
377380
//@ [riscv32gc_unknown_linux_gnu] needs-llvm-components: riscv
@@ -414,6 +417,9 @@
414417
//@ revisions: riscv64_linux_android
415418
//@ [riscv64_linux_android] compile-flags: --target riscv64-linux-android
416419
//@ [riscv64_linux_android] needs-llvm-components: riscv
420+
//@ revisions: riscv64_wrs_vxworks
421+
//@ [riscv64_wrs_vxworks] compile-flags: --target riscv64-wrs-vxworks
422+
//@ [riscv64_wrs_vxworks] needs-llvm-components: riscv
417423
//@ revisions: riscv64gc_unknown_freebsd
418424
//@ [riscv64gc_unknown_freebsd] compile-flags: --target riscv64gc-unknown-freebsd
419425
//@ [riscv64gc_unknown_freebsd] needs-llvm-components: riscv

0 commit comments

Comments
 (0)