Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 69b3ad1

Browse files
authoredMar 13, 2025
Rollup merge of #138427 - madsmtm:vxworks-llvm-target, r=jieyouxu
Fix RISC-V VxWorks LLVM target triples The targets `riscv32-wrs-vxworks` and `riscv64-wrs-vxworks` uses the plain `$ARCH` LLVM triple, which LLVM normalizes to `$ARCH-unknown-unknown`, we should use `$ARCH-unknown-linux-gnu$ABI` which is consistent with the the other VxWorks targets. Motivation: To make it easier to verify that [`cc-rs`' conversion from `rustc` to Clang/LLVM triples](rust-lang/cc-rs#1431) is correct. Alternative: Pass `$ARCH-unknown-none` in the other VxWorks LLVM triples, I don't know anything about VxWorks, so am unsure which is the most correct option. CC target maintainer `@biabbas.` r? jieyouxu
2 parents 883f00c + 0434013 commit 69b3ad1

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed
 

‎compiler/rustc_target/src/spec/targets/riscv32_wrs_vxworks.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use crate::spec::{StackProbeType, Target, TargetMetadata, TargetOptions, base};
22

33
pub(crate) fn target() -> Target {
44
Target {
5-
llvm_target: "riscv32".into(),
5+
llvm_target: "riscv32-unknown-linux-gnu".into(),
66
metadata: TargetMetadata {
77
description: None,
88
tier: Some(3),

‎compiler/rustc_target/src/spec/targets/riscv64_wrs_vxworks.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use crate::spec::{StackProbeType, Target, TargetMetadata, TargetOptions, base};
22

33
pub(crate) fn target() -> Target {
44
Target {
5-
llvm_target: "riscv64".into(),
5+
llvm_target: "riscv64-unknown-linux-gnu".into(),
66
metadata: TargetMetadata {
77
description: None,
88
tier: Some(3),

0 commit comments

Comments
 (0)
Failed to load comments.