Skip to content

Commit 71ed0b9

Browse files
authored
Rollup merge of rust-lang#121291 - heiher:revert-medium-cmodel, r=Nilstrieb
target: Revert default to the medium code model on LoongArch targets This reverts commit 35dad14. Fixes rust-lang#121289
2 parents d86f0c1 + 9c32a7d commit 71ed0b9

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

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

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

33
pub fn target() -> Target {
44
Target {
@@ -7,7 +7,6 @@ pub fn target() -> Target {
77
data_layout: "e-m:e-p:64:64-i64:64-i128:128-n64-S128".into(),
88
arch: "loongarch64".into(),
99
options: TargetOptions {
10-
code_model: Some(CodeModel::Medium),
1110
cpu: "generic".into(),
1211
features: "+f,+d".into(),
1312
llvm_abiname: "lp64d".into(),

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ pub fn target() -> Target {
1616
max_atomic_width: Some(64),
1717
relocation_model: RelocModel::Static,
1818
panic_strategy: PanicStrategy::Abort,
19-
code_model: Some(CodeModel::Medium),
19+
code_model: Some(CodeModel::Small),
2020
..Default::default()
2121
},
2222
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ pub fn target() -> Target {
1717
max_atomic_width: Some(64),
1818
relocation_model: RelocModel::Static,
1919
panic_strategy: PanicStrategy::Abort,
20-
code_model: Some(CodeModel::Medium),
20+
code_model: Some(CodeModel::Small),
2121
..Default::default()
2222
},
2323
}

0 commit comments

Comments
 (0)