Change related spec files to use the new enum

This commit is contained in:
Lzu Tao 2021-01-05 01:13:27 +00:00
parent fa4d8bc878
commit 8ee804dc2b
25 changed files with 50 additions and 37 deletions

View File

@ -1,5 +1,6 @@
// Targets the Big endian Cortex-R4/R5 processor (ARMv7-R)
use crate::abi::Endian;
use crate::spec::{LinkerFlavor, LldFlavor, PanicStrategy, RelocModel};
use crate::spec::{Target, TargetOptions};
@ -11,7 +12,7 @@ pub fn target() -> Target {
arch: "arm".to_string(),
options: TargetOptions {
endian: "big".to_string(),
endian: Endian::Big,
linker_flavor: LinkerFlavor::Lld(LldFlavor::Ld),
executables: true,
linker: Some("rust-lld".to_owned()),

View File

@ -1,5 +1,6 @@
// Targets the Cortex-R4F/R5F processor (ARMv7-R)
use crate::abi::Endian;
use crate::spec::{LinkerFlavor, LldFlavor, PanicStrategy, RelocModel};
use crate::spec::{Target, TargetOptions};
@ -11,7 +12,7 @@ pub fn target() -> Target {
arch: "arm".to_string(),
options: TargetOptions {
endian: "big".to_string(),
endian: Endian::Big,
linker_flavor: LinkerFlavor::Lld(LldFlavor::Ld),
executables: true,
linker: Some("rust-lld".to_owned()),

View File

@ -1,3 +1,4 @@
use crate::abi::Endian;
use crate::spec::{Target, TargetOptions};
pub fn target() -> Target {
@ -7,7 +8,7 @@ pub fn target() -> Target {
data_layout: "E-m:e-i8:8:32-i16:16:32-i64:64-n32:64-S128".to_string(),
arch: "mips64".to_string(),
options: TargetOptions {
endian: "big".to_string(),
endian: Endian::Big,
// NOTE(mips64r2) matches C toolchain
cpu: "mips64r2".to_string(),
features: "+mips64r2".to_string(),

View File

@ -1,3 +1,4 @@
use crate::abi::Endian;
use crate::spec::{Target, TargetOptions};
pub fn target() -> Target {
@ -11,6 +12,6 @@ pub fn target() -> Target {
pointer_width: 64,
data_layout: "E-m:e-i8:8:32-i16:16:32-i64:64-n32:64-S128".to_string(),
arch: "mips64".to_string(),
options: TargetOptions { endian: "big".to_string(), mcount: "_mcount".to_string(), ..base },
options: TargetOptions { endian: Endian::Big, mcount: "_mcount".to_string(), ..base },
}
}

View File

@ -1,3 +1,4 @@
use crate::abi::Endian;
use crate::spec::{Target, TargetOptions};
pub fn target() -> Target {
@ -7,7 +8,7 @@ pub fn target() -> Target {
data_layout: "E-m:m-p:32:32-i8:8:32-i16:16:32-i64:64-n32-S64".to_string(),
arch: "mips".to_string(),
options: TargetOptions {
endian: "big".to_string(),
endian: Endian::Big,
cpu: "mips32r2".to_string(),
features: "+mips32r2,+fpxx,+nooddspreg".to_string(),
max_atomic_width: Some(32),

View File

@ -1,3 +1,4 @@
use crate::abi::Endian;
use crate::spec::{Target, TargetOptions};
pub fn target() -> Target {
@ -11,6 +12,6 @@ pub fn target() -> Target {
pointer_width: 32,
data_layout: "E-m:m-p:32:32-i8:8:32-i16:16:32-i64:64-n32-S64".to_string(),
arch: "mips".to_string(),
options: TargetOptions { endian: "big".to_string(), mcount: "_mcount".to_string(), ..base },
options: TargetOptions { endian: Endian::Big, mcount: "_mcount".to_string(), ..base },
}
}

View File

@ -1,3 +1,4 @@
use crate::abi::Endian;
use crate::spec::{Target, TargetOptions};
pub fn target() -> Target {
@ -7,7 +8,7 @@ pub fn target() -> Target {
data_layout: "E-m:m-p:32:32-i8:8:32-i16:16:32-i64:64-n32-S64".to_string(),
arch: "mips".to_string(),
options: TargetOptions {
endian: "big".to_string(),
endian: Endian::Big,
cpu: "mips32r2".to_string(),
features: "+mips32r2,+soft-float".to_string(),
max_atomic_width: Some(32),

View File

@ -1,3 +1,4 @@
use crate::abi::Endian;
use crate::spec::{Target, TargetOptions};
pub fn target() -> Target {
@ -7,7 +8,7 @@ pub fn target() -> Target {
data_layout: "E-m:m-p:32:32-i8:8:32-i16:16:32-i64:64-n32-S64".to_string(),
arch: "mips".to_string(),
options: TargetOptions {
endian: "big".to_string(),
endian: Endian::Big,
cpu: "mips32r6".to_string(),
features: "+mips32r6".to_string(),
max_atomic_width: Some(32),

View File

@ -1,3 +1,4 @@
use crate::abi::Endian;
use crate::spec::{Target, TargetOptions};
pub fn target() -> Target {
@ -7,7 +8,7 @@ pub fn target() -> Target {
data_layout: "E-m:e-i8:8:32-i16:16:32-i64:64-n32:64-S128".to_string(),
arch: "mips64".to_string(),
options: TargetOptions {
endian: "big".to_string(),
endian: Endian::Big,
// NOTE(mips64r6) matches C toolchain
cpu: "mips64r6".to_string(),
features: "+mips64r6".to_string(),

View File

@ -1,3 +1,4 @@
use crate::abi::Endian;
use crate::spec::{LinkerFlavor, Target, TargetOptions};
pub fn target() -> Target {
@ -11,6 +12,6 @@ pub fn target() -> Target {
pointer_width: 64,
data_layout: "E-m:e-i64:64-n32:64".to_string(),
arch: "powerpc64".to_string(),
options: TargetOptions { endian: "big".to_string(), mcount: "_mcount".to_string(), ..base },
options: TargetOptions { endian: Endian::Big, mcount: "_mcount".to_string(), ..base },
}
}

View File

@ -1,3 +1,4 @@
use crate::abi::Endian;
use crate::spec::{LinkerFlavor, RelroLevel, Target, TargetOptions};
pub fn target() -> Target {
@ -15,6 +16,6 @@ pub fn target() -> Target {
pointer_width: 64,
data_layout: "E-m:e-i64:64-n32:64".to_string(),
arch: "powerpc64".to_string(),
options: TargetOptions { endian: "big".to_string(), mcount: "_mcount".to_string(), ..base },
options: TargetOptions { endian: Endian::Big, mcount: "_mcount".to_string(), ..base },
}
}

View File

@ -1,3 +1,4 @@
use crate::abi::Endian;
use crate::spec::{LinkerFlavor, Target, TargetOptions};
pub fn target() -> Target {
@ -11,6 +12,6 @@ pub fn target() -> Target {
pointer_width: 64,
data_layout: "E-m:e-i64:64-n32:64".to_string(),
arch: "powerpc64".to_string(),
options: TargetOptions { endian: "big".to_string(), mcount: "_mcount".to_string(), ..base },
options: TargetOptions { endian: Endian::Big, mcount: "_mcount".to_string(), ..base },
}
}

View File

@ -1,3 +1,4 @@
use crate::abi::Endian;
use crate::spec::{LinkerFlavor, Target, TargetOptions};
pub fn target() -> Target {
@ -11,6 +12,6 @@ pub fn target() -> Target {
pointer_width: 64,
data_layout: "E-m:e-i64:64-n32:64".to_string(),
arch: "powerpc64".to_string(),
options: TargetOptions { endian: "big".to_string(), ..base },
options: TargetOptions { endian: Endian::Big, ..base },
}
}

View File

@ -1,3 +1,4 @@
use crate::abi::Endian;
use crate::spec::{LinkerFlavor, Target, TargetOptions};
pub fn target() -> Target {
@ -10,6 +11,6 @@ pub fn target() -> Target {
pointer_width: 32,
data_layout: "E-m:e-p:32:32-i64:64-n32".to_string(),
arch: "powerpc".to_string(),
options: TargetOptions { endian: "big".to_string(), mcount: "_mcount".to_string(), ..base },
options: TargetOptions { endian: Endian::Big, mcount: "_mcount".to_string(), ..base },
}
}

View File

@ -1,3 +1,4 @@
use crate::abi::Endian;
use crate::spec::{LinkerFlavor, Target, TargetOptions};
pub fn target() -> Target {
@ -10,6 +11,6 @@ pub fn target() -> Target {
pointer_width: 32,
data_layout: "E-m:e-p:32:32-i64:64-n32".to_string(),
arch: "powerpc".to_string(),
options: TargetOptions { endian: "big".to_string(), mcount: "_mcount".to_string(), ..base },
options: TargetOptions { endian: Endian::Big, mcount: "_mcount".to_string(), ..base },
}
}

View File

@ -1,3 +1,4 @@
use crate::abi::Endian;
use crate::spec::{LinkerFlavor, Target, TargetOptions};
pub fn target() -> Target {
@ -10,6 +11,6 @@ pub fn target() -> Target {
pointer_width: 32,
data_layout: "E-m:e-p:32:32-i64:64-n32".to_string(),
arch: "powerpc".to_string(),
options: TargetOptions { endian: "big".to_string(), mcount: "_mcount".to_string(), ..base },
options: TargetOptions { endian: Endian::Big, mcount: "_mcount".to_string(), ..base },
}
}

View File

@ -1,3 +1,4 @@
use crate::abi::Endian;
use crate::spec::{LinkerFlavor, Target, TargetOptions};
pub fn target() -> Target {
@ -10,10 +11,6 @@ pub fn target() -> Target {
pointer_width: 32,
data_layout: "E-m:e-p:32:32-i64:64-n32".to_string(),
arch: "powerpc".to_string(),
options: TargetOptions {
endian: "big".to_string(),
mcount: "__mcount".to_string(),
..base
},
options: TargetOptions { endian: Endian::Big, mcount: "__mcount".to_string(), ..base },
}
}

View File

@ -1,3 +1,4 @@
use crate::abi::Endian;
use crate::spec::{LinkerFlavor, Target, TargetOptions};
pub fn target() -> Target {
@ -11,10 +12,6 @@ pub fn target() -> Target {
pointer_width: 32,
data_layout: "E-m:e-p:32:32-i64:64-n32".to_string(),
arch: "powerpc".to_string(),
options: TargetOptions {
endian: "big".to_string(),
features: "+secure-plt".to_string(),
..base
},
options: TargetOptions { endian: Endian::Big, features: "+secure-plt".to_string(), ..base },
}
}

View File

@ -1,3 +1,4 @@
use crate::abi::Endian;
use crate::spec::{LinkerFlavor, Target, TargetOptions};
pub fn target() -> Target {
@ -12,7 +13,7 @@ pub fn target() -> Target {
data_layout: "E-m:e-p:32:32-i64:64-n32".to_string(),
arch: "powerpc".to_string(),
options: TargetOptions {
endian: "big".to_string(),
endian: Endian::Big,
// feature msync would disable instruction 'fsync' which is not supported by fsl_p1p2
features: "+secure-plt,+msync".to_string(),
..base

View File

@ -1,8 +1,9 @@
use crate::abi::Endian;
use crate::spec::Target;
pub fn target() -> Target {
let mut base = super::linux_gnu_base::opts();
base.endian = "big".to_string();
base.endian = Endian::Big;
// z10 is the oldest CPU supported by LLVM
base.cpu = "z10".to_string();
// FIXME: The data_layout string below and the ABI implementation in

View File

@ -1,8 +1,9 @@
use crate::abi::Endian;
use crate::spec::Target;
pub fn target() -> Target {
let mut base = super::linux_gnu_base::opts();
base.endian = "big".to_string();
base.endian = Endian::Big;
base.cpu = "v9".to_string();
base.max_atomic_width = Some(64);

View File

@ -1,3 +1,4 @@
use crate::abi::Endian;
use crate::spec::{LinkerFlavor, Target, TargetOptions};
pub fn target() -> Target {
@ -11,10 +12,6 @@ pub fn target() -> Target {
pointer_width: 64,
data_layout: "E-m:e-i64:64-n32:64-S128".to_string(),
arch: "sparc64".to_string(),
options: TargetOptions {
endian: "big".to_string(),
mcount: "__mcount".to_string(),
..base
},
options: TargetOptions { endian: Endian::Big, mcount: "__mcount".to_string(), ..base },
}
}

View File

@ -1,8 +1,9 @@
use crate::abi::Endian;
use crate::spec::{LinkerFlavor, Target};
pub fn target() -> Target {
let mut base = super::openbsd_base::opts();
base.endian = "big".to_string();
base.endian = Endian::Big;
base.cpu = "v9".to_string();
base.pre_link_args.get_mut(&LinkerFlavor::Gcc).unwrap().push("-m64".to_string());
base.max_atomic_width = Some(64);

View File

@ -1,8 +1,9 @@
use crate::abi::Endian;
use crate::spec::{LinkerFlavor, Target};
pub fn target() -> Target {
let mut base = super::linux_gnu_base::opts();
base.endian = "big".to_string();
base.endian = Endian::Big;
base.cpu = "v9".to_string();
base.max_atomic_width = Some(64);
base.pre_link_args.get_mut(&LinkerFlavor::Gcc).unwrap().push("-mv8plus".to_string());

View File

@ -1,8 +1,9 @@
use crate::abi::Endian;
use crate::spec::{LinkerFlavor, Target};
pub fn target() -> Target {
let mut base = super::solaris_base::opts();
base.endian = "big".to_string();
base.endian = Endian::Big;
base.pre_link_args.insert(LinkerFlavor::Gcc, vec!["-m64".to_string()]);
// llvm calls this "v9"
base.cpu = "v9".to_string();