mirror of
https://github.com/rust-lang/rust.git
synced 2024-11-22 06:44:35 +00:00
Rollup merge of #121291 - heiher:revert-medium-cmodel, r=Nilstrieb
target: Revert default to the medium code model on LoongArch targets
This reverts commit 35dad14dfb
.
Fixes #121289
This commit is contained in:
commit
5540d817e3
@ -1,4 +1,4 @@
|
|||||||
use crate::spec::{base, CodeModel, Target, TargetOptions};
|
use crate::spec::{base, Target, TargetOptions};
|
||||||
|
|
||||||
pub fn target() -> Target {
|
pub fn target() -> Target {
|
||||||
Target {
|
Target {
|
||||||
@ -7,7 +7,6 @@ pub fn target() -> Target {
|
|||||||
data_layout: "e-m:e-p:64:64-i64:64-i128:128-n64-S128".into(),
|
data_layout: "e-m:e-p:64:64-i64:64-i128:128-n64-S128".into(),
|
||||||
arch: "loongarch64".into(),
|
arch: "loongarch64".into(),
|
||||||
options: TargetOptions {
|
options: TargetOptions {
|
||||||
code_model: Some(CodeModel::Medium),
|
|
||||||
cpu: "generic".into(),
|
cpu: "generic".into(),
|
||||||
features: "+f,+d".into(),
|
features: "+f,+d".into(),
|
||||||
llvm_abiname: "lp64d".into(),
|
llvm_abiname: "lp64d".into(),
|
||||||
|
@ -16,7 +16,7 @@ pub fn target() -> Target {
|
|||||||
max_atomic_width: Some(64),
|
max_atomic_width: Some(64),
|
||||||
relocation_model: RelocModel::Static,
|
relocation_model: RelocModel::Static,
|
||||||
panic_strategy: PanicStrategy::Abort,
|
panic_strategy: PanicStrategy::Abort,
|
||||||
code_model: Some(CodeModel::Medium),
|
code_model: Some(CodeModel::Small),
|
||||||
..Default::default()
|
..Default::default()
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
@ -17,7 +17,7 @@ pub fn target() -> Target {
|
|||||||
max_atomic_width: Some(64),
|
max_atomic_width: Some(64),
|
||||||
relocation_model: RelocModel::Static,
|
relocation_model: RelocModel::Static,
|
||||||
panic_strategy: PanicStrategy::Abort,
|
panic_strategy: PanicStrategy::Abort,
|
||||||
code_model: Some(CodeModel::Medium),
|
code_model: Some(CodeModel::Small),
|
||||||
..Default::default()
|
..Default::default()
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user