Skip to content

Commit a4e1bf4

Browse files
committed
compiler: Hermit targets: Sort base fields by declaration
Signed-off-by: Martin Kröning <[email protected]>
1 parent 2676637 commit a4e1bf4

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

compiler/rustc_target/src/spec/aarch64_unknown_hermit.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ pub fn target() -> Target {
88
Target {
99
llvm_target: "aarch64-unknown-hermit".into(),
1010
pointer_width: 64,
11-
data_layout: "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128".into(),
1211
arch: "aarch64".into(),
12+
data_layout: "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128".into(),
1313
options: base,
1414
}
1515
}

compiler/rustc_target/src/spec/hermit_base.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ use crate::spec::{Cc, LinkerFlavor, Lld, PanicStrategy, TargetOptions, TlsModel}
33
pub fn opts() -> TargetOptions {
44
TargetOptions {
55
os: "hermit".into(),
6-
linker_flavor: LinkerFlavor::Gnu(Cc::No, Lld::Yes),
76
linker: Some("rust-lld".into()),
8-
has_thread_local: true,
9-
panic_strategy: PanicStrategy::Abort,
7+
linker_flavor: LinkerFlavor::Gnu(Cc::No, Lld::Yes),
8+
tls_model: TlsModel::InitialExec,
109
position_independent_executables: true,
1110
static_position_independent_executables: true,
12-
tls_model: TlsModel::InitialExec,
11+
has_thread_local: true,
12+
panic_strategy: PanicStrategy::Abort,
1313
..Default::default()
1414
}
1515
}

compiler/rustc_target/src/spec/x86_64_unknown_hermit.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ pub fn target() -> Target {
1111
Target {
1212
llvm_target: "x86_64-unknown-hermit".into(),
1313
pointer_width: 64,
14+
arch: "x86_64".into(),
1415
data_layout: "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
1516
.into(),
16-
arch: "x86_64".into(),
1717
options: base,
1818
}
1919
}

0 commit comments

Comments
 (0)