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:
Nilstrieb 2024-02-20 15:13:54 +01:00 committed by GitHub
commit 5540d817e3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 3 additions and 4 deletions

View File

@ -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(),

View File

@ -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()
}, },
} }

View File

@ -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()
}, },
} }