Skip to content

Commit e04fb06

Browse files
committed
rustc_target: Sync with stdarch (important parts)
Of RISC-V features defined in stdarch, this commit adds extensions satisfying following criteria: * Formerly a part of the "I" extension and splitted thereafter (now ratified as "I" + "Zifencei" + "Zicsr" + "Zicntr" + "Zihpm") or * Dicoverable from newer versions of the Linux kernel ("Zihintpause"). This is based on the latest ratified ISA Manuals (version 20240411). Additional (1): One of those, "Zicsr", is a dependency of many other ISA extensions and this commit adds correct dependencies to "Zicsr" except "V" (due to an ongoing PR). Additional (2): In RISC-V, "G" is an abbreviation of following extensions: * "I" * "M" * "A" * "F" * "D" * "Zicsr" (although implied by "F") * "Zifencei" and all targets with either "riscv32gc" or "riscv64gc" are updated accordingly.
1 parent 7290b04 commit e04fb06

13 files changed

+24
-14
lines changed

compiler/rustc_target/src/spec/targets/riscv32gc_unknown_linux_gnu.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ pub(crate) fn target() -> Target {
1717
options: TargetOptions {
1818
code_model: Some(CodeModel::Medium),
1919
cpu: "generic-rv32".into(),
20-
features: "+m,+a,+f,+d,+c".into(),
20+
features: "+m,+a,+f,+d,+c,+zicsr,+zifencei".into(),
2121
llvm_abiname: "ilp32d".into(),
2222
max_atomic_width: Some(32),
2323
supported_split_debuginfo: Cow::Borrowed(&[SplitDebuginfo::Off]),

compiler/rustc_target/src/spec/targets/riscv32gc_unknown_linux_musl.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ pub(crate) fn target() -> Target {
1919
options: TargetOptions {
2020
code_model: Some(CodeModel::Medium),
2121
cpu: "generic-rv32".into(),
22-
features: "+m,+a,+f,+d,+c".into(),
22+
features: "+m,+a,+f,+d,+c,+zicsr,+zifencei".into(),
2323
llvm_abiname: "ilp32d".into(),
2424
max_atomic_width: Some(32),
2525
supported_split_debuginfo: Cow::Borrowed(&[SplitDebuginfo::Off]),

compiler/rustc_target/src/spec/targets/riscv64gc_unknown_freebsd.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ pub(crate) fn target() -> Target {
1515
options: TargetOptions {
1616
code_model: Some(CodeModel::Medium),
1717
cpu: "generic-rv64".into(),
18-
features: "+m,+a,+f,+d,+c".into(),
18+
features: "+m,+a,+f,+d,+c,+zicsr,+zifencei".into(),
1919
llvm_abiname: "lp64d".into(),
2020
max_atomic_width: Some(64),
2121
..base::freebsd::opts()

compiler/rustc_target/src/spec/targets/riscv64gc_unknown_fuchsia.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ pub(crate) fn target() -> Target {
44
let mut base = base::fuchsia::opts();
55
base.code_model = Some(CodeModel::Medium);
66
base.cpu = "generic-rv64".into();
7-
base.features = "+m,+a,+f,+d,+c".into();
7+
base.features = "+m,+a,+f,+d,+c,+zicsr,+zifencei".into();
88
base.llvm_abiname = "lp64d".into();
99
base.max_atomic_width = Some(64);
1010
base.stack_probes = StackProbeType::Inline;

compiler/rustc_target/src/spec/targets/riscv64gc_unknown_hermit.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ pub(crate) fn target() -> Target {
1414
data_layout: "e-m:e-p:64:64-i64:64-i128:128-n32:64-S128".into(),
1515
options: TargetOptions {
1616
cpu: "generic-rv64".into(),
17-
features: "+m,+a,+f,+d,+c".into(),
17+
features: "+m,+a,+f,+d,+c,+zicsr,+zifencei".into(),
1818
relocation_model: RelocModel::Pic,
1919
code_model: Some(CodeModel::Medium),
2020
tls_model: TlsModel::LocalExec,

compiler/rustc_target/src/spec/targets/riscv64gc_unknown_linux_gnu.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ pub(crate) fn target() -> Target {
1717
options: TargetOptions {
1818
code_model: Some(CodeModel::Medium),
1919
cpu: "generic-rv64".into(),
20-
features: "+m,+a,+f,+d,+c".into(),
20+
features: "+m,+a,+f,+d,+c,+zicsr,+zifencei".into(),
2121
llvm_abiname: "lp64d".into(),
2222
max_atomic_width: Some(64),
2323
supported_split_debuginfo: Cow::Borrowed(&[SplitDebuginfo::Off]),

compiler/rustc_target/src/spec/targets/riscv64gc_unknown_linux_musl.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ pub(crate) fn target() -> Target {
1717
options: TargetOptions {
1818
code_model: Some(CodeModel::Medium),
1919
cpu: "generic-rv64".into(),
20-
features: "+m,+a,+f,+d,+c".into(),
20+
features: "+m,+a,+f,+d,+c,+zicsr,+zifencei".into(),
2121
llvm_abiname: "lp64d".into(),
2222
max_atomic_width: Some(64),
2323
supported_split_debuginfo: Cow::Borrowed(&[SplitDebuginfo::Off]),

compiler/rustc_target/src/spec/targets/riscv64gc_unknown_netbsd.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ pub(crate) fn target() -> Target {
1515
options: TargetOptions {
1616
code_model: Some(CodeModel::Medium),
1717
cpu: "generic-rv64".into(),
18-
features: "+m,+a,+f,+d,+c".into(),
18+
features: "+m,+a,+f,+d,+c,+zicsr,+zifencei".into(),
1919
llvm_abiname: "lp64d".into(),
2020
max_atomic_width: Some(64),
2121
mcount: "__mcount".into(),

compiler/rustc_target/src/spec/targets/riscv64gc_unknown_none_elf.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ pub(crate) fn target() -> Target {
2222
llvm_abiname: "lp64d".into(),
2323
cpu: "generic-rv64".into(),
2424
max_atomic_width: Some(64),
25-
features: "+m,+a,+f,+d,+c".into(),
25+
features: "+m,+a,+f,+d,+c,+zicsr,+zifencei".into(),
2626
panic_strategy: PanicStrategy::Abort,
2727
relocation_model: RelocModel::Static,
2828
code_model: Some(CodeModel::Medium),

compiler/rustc_target/src/spec/targets/riscv64gc_unknown_nuttx_elf.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ pub(crate) fn target() -> Target {
2424
llvm_abiname: "lp64d".into(),
2525
cpu: "generic-rv64".into(),
2626
max_atomic_width: Some(64),
27-
features: "+m,+a,+f,+d,+c".into(),
27+
features: "+m,+a,+f,+d,+c,+zicsr,+zifencei".into(),
2828
panic_strategy: PanicStrategy::Abort,
2929
relocation_model: RelocModel::Static,
3030
code_model: Some(CodeModel::Medium),

0 commit comments

Comments
 (0)