diff options
| author | Martin Kröning <martin.kroening@eonerc.rwth-aachen.de> | 2023-07-22 13:45:50 +0200 |
|---|---|---|
| committer | Martin Kröning <martin.kroening@eonerc.rwth-aachen.de> | 2023-07-24 10:36:05 +0200 |
| commit | a4e1bf416d7dc2e6ed156ed09f7f3294c8eec48a (patch) | |
| tree | 6be18f29771949806cd75b7452469d1751b09127 | |
| parent | 2676637666a221bc4d4876245c607141e7840e02 (diff) | |
| download | rust-a4e1bf416d7dc2e6ed156ed09f7f3294c8eec48a.tar.gz rust-a4e1bf416d7dc2e6ed156ed09f7f3294c8eec48a.zip | |
compiler: Hermit targets: Sort base fields by declaration
Signed-off-by: Martin Kröning <martin.kroening@eonerc.rwth-aachen.de>
| -rw-r--r-- | compiler/rustc_target/src/spec/aarch64_unknown_hermit.rs | 2 | ||||
| -rw-r--r-- | compiler/rustc_target/src/spec/hermit_base.rs | 8 | ||||
| -rw-r--r-- | compiler/rustc_target/src/spec/x86_64_unknown_hermit.rs | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/compiler/rustc_target/src/spec/aarch64_unknown_hermit.rs b/compiler/rustc_target/src/spec/aarch64_unknown_hermit.rs index 87e8d627026..2dba928f0bb 100644 --- a/compiler/rustc_target/src/spec/aarch64_unknown_hermit.rs +++ b/compiler/rustc_target/src/spec/aarch64_unknown_hermit.rs @@ -8,8 +8,8 @@ pub fn target() -> Target { Target { llvm_target: "aarch64-unknown-hermit".into(), pointer_width: 64, - data_layout: "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128".into(), arch: "aarch64".into(), + data_layout: "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128".into(), options: base, } } diff --git a/compiler/rustc_target/src/spec/hermit_base.rs b/compiler/rustc_target/src/spec/hermit_base.rs index b373a1630ec..c6e98fc1a11 100644 --- a/compiler/rustc_target/src/spec/hermit_base.rs +++ b/compiler/rustc_target/src/spec/hermit_base.rs @@ -3,13 +3,13 @@ use crate::spec::{Cc, LinkerFlavor, Lld, PanicStrategy, TargetOptions, TlsModel} pub fn opts() -> TargetOptions { TargetOptions { os: "hermit".into(), - linker_flavor: LinkerFlavor::Gnu(Cc::No, Lld::Yes), linker: Some("rust-lld".into()), - has_thread_local: true, - panic_strategy: PanicStrategy::Abort, + linker_flavor: LinkerFlavor::Gnu(Cc::No, Lld::Yes), + tls_model: TlsModel::InitialExec, position_independent_executables: true, static_position_independent_executables: true, - tls_model: TlsModel::InitialExec, + has_thread_local: true, + panic_strategy: PanicStrategy::Abort, ..Default::default() } } diff --git a/compiler/rustc_target/src/spec/x86_64_unknown_hermit.rs b/compiler/rustc_target/src/spec/x86_64_unknown_hermit.rs index 74ef2527c36..84692d63d07 100644 --- a/compiler/rustc_target/src/spec/x86_64_unknown_hermit.rs +++ b/compiler/rustc_target/src/spec/x86_64_unknown_hermit.rs @@ -11,9 +11,9 @@ pub fn target() -> Target { Target { llvm_target: "x86_64-unknown-hermit".into(), pointer_width: 64, + arch: "x86_64".into(), data_layout: "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" .into(), - arch: "x86_64".into(), options: base, } } |