Skip to content

Commit 8ee804d

Browse files
tesujitesuji
committed
Change related spec files to use the new enum
1 parent fa4d8bc commit 8ee804d

25 files changed

+50
-37
lines changed

Diff for: ‎compiler/rustc_target/src/spec/armebv7r_none_eabi.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// Targets the Big endian Cortex-R4/R5 processor (ARMv7-R)
22

3+
use crate::abi::Endian;
34
use crate::spec::{LinkerFlavor, LldFlavor, PanicStrategy, RelocModel};
45
use crate::spec::{Target, TargetOptions};
56

@@ -11,7 +12,7 @@ pub fn target() -> Target {
1112
arch: "arm".to_string(),
1213

1314
options: TargetOptions {
14-
endian: "big".to_string(),
15+
endian: Endian::Big,
1516
linker_flavor: LinkerFlavor::Lld(LldFlavor::Ld),
1617
executables: true,
1718
linker: Some("rust-lld".to_owned()),

Diff for: ‎compiler/rustc_target/src/spec/armebv7r_none_eabihf.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// Targets the Cortex-R4F/R5F processor (ARMv7-R)
22

3+
use crate::abi::Endian;
34
use crate::spec::{LinkerFlavor, LldFlavor, PanicStrategy, RelocModel};
45
use crate::spec::{Target, TargetOptions};
56

@@ -11,7 +12,7 @@ pub fn target() -> Target {
1112
arch: "arm".to_string(),
1213

1314
options: TargetOptions {
14-
endian: "big".to_string(),
15+
endian: Endian::Big,
1516
linker_flavor: LinkerFlavor::Lld(LldFlavor::Ld),
1617
executables: true,
1718
linker: Some("rust-lld".to_owned()),

Diff for: ‎compiler/rustc_target/src/spec/mips64_unknown_linux_gnuabi64.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
use crate::abi::Endian;
12
use crate::spec::{Target, TargetOptions};
23

34
pub fn target() -> Target {
@@ -7,7 +8,7 @@ pub fn target() -> Target {
78
data_layout: "E-m:e-i8:8:32-i16:16:32-i64:64-n32:64-S128".to_string(),
89
arch: "mips64".to_string(),
910
options: TargetOptions {
10-
endian: "big".to_string(),
11+
endian: Endian::Big,
1112
// NOTE(mips64r2) matches C toolchain
1213
cpu: "mips64r2".to_string(),
1314
features: "+mips64r2".to_string(),

Diff for: ‎compiler/rustc_target/src/spec/mips64_unknown_linux_muslabi64.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
use crate::abi::Endian;
12
use crate::spec::{Target, TargetOptions};
23

34
pub fn target() -> Target {
@@ -11,6 +12,6 @@ pub fn target() -> Target {
1112
pointer_width: 64,
1213
data_layout: "E-m:e-i8:8:32-i16:16:32-i64:64-n32:64-S128".to_string(),
1314
arch: "mips64".to_string(),
14-
options: TargetOptions { endian: "big".to_string(), mcount: "_mcount".to_string(), ..base },
15+
options: TargetOptions { endian: Endian::Big, mcount: "_mcount".to_string(), ..base },
1516
}
1617
}

Diff for: ‎compiler/rustc_target/src/spec/mips_unknown_linux_gnu.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
use crate::abi::Endian;
12
use crate::spec::{Target, TargetOptions};
23

34
pub fn target() -> Target {
@@ -7,7 +8,7 @@ pub fn target() -> Target {
78
data_layout: "E-m:m-p:32:32-i8:8:32-i16:16:32-i64:64-n32-S64".to_string(),
89
arch: "mips".to_string(),
910
options: TargetOptions {
10-
endian: "big".to_string(),
11+
endian: Endian::Big,
1112
cpu: "mips32r2".to_string(),
1213
features: "+mips32r2,+fpxx,+nooddspreg".to_string(),
1314
max_atomic_width: Some(32),

Diff for: ‎compiler/rustc_target/src/spec/mips_unknown_linux_musl.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
use crate::abi::Endian;
12
use crate::spec::{Target, TargetOptions};
23

34
pub fn target() -> Target {
@@ -11,6 +12,6 @@ pub fn target() -> Target {
1112
pointer_width: 32,
1213
data_layout: "E-m:m-p:32:32-i8:8:32-i16:16:32-i64:64-n32-S64".to_string(),
1314
arch: "mips".to_string(),
14-
options: TargetOptions { endian: "big".to_string(), mcount: "_mcount".to_string(), ..base },
15+
options: TargetOptions { endian: Endian::Big, mcount: "_mcount".to_string(), ..base },
1516
}
1617
}

Diff for: ‎compiler/rustc_target/src/spec/mips_unknown_linux_uclibc.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
use crate::abi::Endian;
12
use crate::spec::{Target, TargetOptions};
23

34
pub fn target() -> Target {
@@ -7,7 +8,7 @@ pub fn target() -> Target {
78
data_layout: "E-m:m-p:32:32-i8:8:32-i16:16:32-i64:64-n32-S64".to_string(),
89
arch: "mips".to_string(),
910
options: TargetOptions {
10-
endian: "big".to_string(),
11+
endian: Endian::Big,
1112
cpu: "mips32r2".to_string(),
1213
features: "+mips32r2,+soft-float".to_string(),
1314
max_atomic_width: Some(32),

Diff for: ‎compiler/rustc_target/src/spec/mipsisa32r6_unknown_linux_gnu.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
use crate::abi::Endian;
12
use crate::spec::{Target, TargetOptions};
23

34
pub fn target() -> Target {
@@ -7,7 +8,7 @@ pub fn target() -> Target {
78
data_layout: "E-m:m-p:32:32-i8:8:32-i16:16:32-i64:64-n32-S64".to_string(),
89
arch: "mips".to_string(),
910
options: TargetOptions {
10-
endian: "big".to_string(),
11+
endian: Endian::Big,
1112
cpu: "mips32r6".to_string(),
1213
features: "+mips32r6".to_string(),
1314
max_atomic_width: Some(32),

Diff for: ‎compiler/rustc_target/src/spec/mipsisa64r6_unknown_linux_gnuabi64.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
use crate::abi::Endian;
12
use crate::spec::{Target, TargetOptions};
23

34
pub fn target() -> Target {
@@ -7,7 +8,7 @@ pub fn target() -> Target {
78
data_layout: "E-m:e-i8:8:32-i16:16:32-i64:64-n32:64-S128".to_string(),
89
arch: "mips64".to_string(),
910
options: TargetOptions {
10-
endian: "big".to_string(),
11+
endian: Endian::Big,
1112
// NOTE(mips64r6) matches C toolchain
1213
cpu: "mips64r6".to_string(),
1314
features: "+mips64r6".to_string(),

Diff for: ‎compiler/rustc_target/src/spec/powerpc64_unknown_freebsd.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
use crate::abi::Endian;
12
use crate::spec::{LinkerFlavor, Target, TargetOptions};
23

34
pub fn target() -> Target {
@@ -11,6 +12,6 @@ pub fn target() -> Target {
1112
pointer_width: 64,
1213
data_layout: "E-m:e-i64:64-n32:64".to_string(),
1314
arch: "powerpc64".to_string(),
14-
options: TargetOptions { endian: "big".to_string(), mcount: "_mcount".to_string(), ..base },
15+
options: TargetOptions { endian: Endian::Big, mcount: "_mcount".to_string(), ..base },
1516
}
1617
}

Diff for: ‎compiler/rustc_target/src/spec/powerpc64_unknown_linux_gnu.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
use crate::abi::Endian;
12
use crate::spec::{LinkerFlavor, RelroLevel, Target, TargetOptions};
23

34
pub fn target() -> Target {
@@ -15,6 +16,6 @@ pub fn target() -> Target {
1516
pointer_width: 64,
1617
data_layout: "E-m:e-i64:64-n32:64".to_string(),
1718
arch: "powerpc64".to_string(),
18-
options: TargetOptions { endian: "big".to_string(), mcount: "_mcount".to_string(), ..base },
19+
options: TargetOptions { endian: Endian::Big, mcount: "_mcount".to_string(), ..base },
1920
}
2021
}

Diff for: ‎compiler/rustc_target/src/spec/powerpc64_unknown_linux_musl.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
use crate::abi::Endian;
12
use crate::spec::{LinkerFlavor, Target, TargetOptions};
23

34
pub fn target() -> Target {
@@ -11,6 +12,6 @@ pub fn target() -> Target {
1112
pointer_width: 64,
1213
data_layout: "E-m:e-i64:64-n32:64".to_string(),
1314
arch: "powerpc64".to_string(),
14-
options: TargetOptions { endian: "big".to_string(), mcount: "_mcount".to_string(), ..base },
15+
options: TargetOptions { endian: Endian::Big, mcount: "_mcount".to_string(), ..base },
1516
}
1617
}

Diff for: ‎compiler/rustc_target/src/spec/powerpc64_wrs_vxworks.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
use crate::abi::Endian;
12
use crate::spec::{LinkerFlavor, Target, TargetOptions};
23

34
pub fn target() -> Target {
@@ -11,6 +12,6 @@ pub fn target() -> Target {
1112
pointer_width: 64,
1213
data_layout: "E-m:e-i64:64-n32:64".to_string(),
1314
arch: "powerpc64".to_string(),
14-
options: TargetOptions { endian: "big".to_string(), ..base },
15+
options: TargetOptions { endian: Endian::Big, ..base },
1516
}
1617
}

Diff for: ‎compiler/rustc_target/src/spec/powerpc_unknown_linux_gnu.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
use crate::abi::Endian;
12
use crate::spec::{LinkerFlavor, Target, TargetOptions};
23

34
pub fn target() -> Target {
@@ -10,6 +11,6 @@ pub fn target() -> Target {
1011
pointer_width: 32,
1112
data_layout: "E-m:e-p:32:32-i64:64-n32".to_string(),
1213
arch: "powerpc".to_string(),
13-
options: TargetOptions { endian: "big".to_string(), mcount: "_mcount".to_string(), ..base },
14+
options: TargetOptions { endian: Endian::Big, mcount: "_mcount".to_string(), ..base },
1415
}
1516
}

Diff for: ‎compiler/rustc_target/src/spec/powerpc_unknown_linux_gnuspe.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
use crate::abi::Endian;
12
use crate::spec::{LinkerFlavor, Target, TargetOptions};
23

34
pub fn target() -> Target {
@@ -10,6 +11,6 @@ pub fn target() -> Target {
1011
pointer_width: 32,
1112
data_layout: "E-m:e-p:32:32-i64:64-n32".to_string(),
1213
arch: "powerpc".to_string(),
13-
options: TargetOptions { endian: "big".to_string(), mcount: "_mcount".to_string(), ..base },
14+
options: TargetOptions { endian: Endian::Big, mcount: "_mcount".to_string(), ..base },
1415
}
1516
}

Diff for: ‎compiler/rustc_target/src/spec/powerpc_unknown_linux_musl.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
use crate::abi::Endian;
12
use crate::spec::{LinkerFlavor, Target, TargetOptions};
23

34
pub fn target() -> Target {
@@ -10,6 +11,6 @@ pub fn target() -> Target {
1011
pointer_width: 32,
1112
data_layout: "E-m:e-p:32:32-i64:64-n32".to_string(),
1213
arch: "powerpc".to_string(),
13-
options: TargetOptions { endian: "big".to_string(), mcount: "_mcount".to_string(), ..base },
14+
options: TargetOptions { endian: Endian::Big, mcount: "_mcount".to_string(), ..base },
1415
}
1516
}

Diff for: ‎compiler/rustc_target/src/spec/powerpc_unknown_netbsd.rs

+2-5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
use crate::abi::Endian;
12
use crate::spec::{LinkerFlavor, Target, TargetOptions};
23

34
pub fn target() -> Target {
@@ -10,10 +11,6 @@ pub fn target() -> Target {
1011
pointer_width: 32,
1112
data_layout: "E-m:e-p:32:32-i64:64-n32".to_string(),
1213
arch: "powerpc".to_string(),
13-
options: TargetOptions {
14-
endian: "big".to_string(),
15-
mcount: "__mcount".to_string(),
16-
..base
17-
},
14+
options: TargetOptions { endian: Endian::Big, mcount: "__mcount".to_string(), ..base },
1815
}
1916
}

Diff for: ‎compiler/rustc_target/src/spec/powerpc_wrs_vxworks.rs

+2-5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
use crate::abi::Endian;
12
use crate::spec::{LinkerFlavor, Target, TargetOptions};
23

34
pub fn target() -> Target {
@@ -11,10 +12,6 @@ pub fn target() -> Target {
1112
pointer_width: 32,
1213
data_layout: "E-m:e-p:32:32-i64:64-n32".to_string(),
1314
arch: "powerpc".to_string(),
14-
options: TargetOptions {
15-
endian: "big".to_string(),
16-
features: "+secure-plt".to_string(),
17-
..base
18-
},
15+
options: TargetOptions { endian: Endian::Big, features: "+secure-plt".to_string(), ..base },
1916
}
2017
}

Diff for: ‎compiler/rustc_target/src/spec/powerpc_wrs_vxworks_spe.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
use crate::abi::Endian;
12
use crate::spec::{LinkerFlavor, Target, TargetOptions};
23

34
pub fn target() -> Target {
@@ -12,7 +13,7 @@ pub fn target() -> Target {
1213
data_layout: "E-m:e-p:32:32-i64:64-n32".to_string(),
1314
arch: "powerpc".to_string(),
1415
options: TargetOptions {
15-
endian: "big".to_string(),
16+
endian: Endian::Big,
1617
// feature msync would disable instruction 'fsync' which is not supported by fsl_p1p2
1718
features: "+secure-plt,+msync".to_string(),
1819
..base

Diff for: ‎compiler/rustc_target/src/spec/s390x_unknown_linux_gnu.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1+
use crate::abi::Endian;
12
use crate::spec::Target;
23

34
pub fn target() -> Target {
45
let mut base = super::linux_gnu_base::opts();
5-
base.endian = "big".to_string();
6+
base.endian = Endian::Big;
67
// z10 is the oldest CPU supported by LLVM
78
base.cpu = "z10".to_string();
89
// FIXME: The data_layout string below and the ABI implementation in

Diff for: ‎compiler/rustc_target/src/spec/sparc64_unknown_linux_gnu.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1+
use crate::abi::Endian;
12
use crate::spec::Target;
23

34
pub fn target() -> Target {
45
let mut base = super::linux_gnu_base::opts();
5-
base.endian = "big".to_string();
6+
base.endian = Endian::Big;
67
base.cpu = "v9".to_string();
78
base.max_atomic_width = Some(64);
89

Diff for: ‎compiler/rustc_target/src/spec/sparc64_unknown_netbsd.rs

+2-5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
use crate::abi::Endian;
12
use crate::spec::{LinkerFlavor, Target, TargetOptions};
23

34
pub fn target() -> Target {
@@ -11,10 +12,6 @@ pub fn target() -> Target {
1112
pointer_width: 64,
1213
data_layout: "E-m:e-i64:64-n32:64-S128".to_string(),
1314
arch: "sparc64".to_string(),
14-
options: TargetOptions {
15-
endian: "big".to_string(),
16-
mcount: "__mcount".to_string(),
17-
..base
18-
},
15+
options: TargetOptions { endian: Endian::Big, mcount: "__mcount".to_string(), ..base },
1916
}
2017
}

Diff for: ‎compiler/rustc_target/src/spec/sparc64_unknown_openbsd.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1+
use crate::abi::Endian;
12
use crate::spec::{LinkerFlavor, Target};
23

34
pub fn target() -> Target {
45
let mut base = super::openbsd_base::opts();
5-
base.endian = "big".to_string();
6+
base.endian = Endian::Big;
67
base.cpu = "v9".to_string();
78
base.pre_link_args.get_mut(&LinkerFlavor::Gcc).unwrap().push("-m64".to_string());
89
base.max_atomic_width = Some(64);

Diff for: ‎compiler/rustc_target/src/spec/sparc_unknown_linux_gnu.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1+
use crate::abi::Endian;
12
use crate::spec::{LinkerFlavor, Target};
23

34
pub fn target() -> Target {
45
let mut base = super::linux_gnu_base::opts();
5-
base.endian = "big".to_string();
6+
base.endian = Endian::Big;
67
base.cpu = "v9".to_string();
78
base.max_atomic_width = Some(64);
89
base.pre_link_args.get_mut(&LinkerFlavor::Gcc).unwrap().push("-mv8plus".to_string());

Diff for: ‎compiler/rustc_target/src/spec/sparcv9_sun_solaris.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1+
use crate::abi::Endian;
12
use crate::spec::{LinkerFlavor, Target};
23

34
pub fn target() -> Target {
45
let mut base = super::solaris_base::opts();
5-
base.endian = "big".to_string();
6+
base.endian = Endian::Big;
67
base.pre_link_args.insert(LinkerFlavor::Gcc, vec!["-m64".to_string()]);
78
// llvm calls this "v9"
89
base.cpu = "v9".to_string();

0 commit comments

Comments
 (0)