bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Change default Solaris x86 target to x86_64-pc-solaris

Browse source
This commit is contained in:
Jakub Kulik 2021-02-16 15:02:04 +01:00
parent d2731d8e93
commit c615bed387
7 changed files with 28 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

23
compiler/rustc_target/src/spec/mod.rs
View file

@ -736,9 +736,8 @@ supported_targets! {
("armv7r-none-eabi", armv7r_none_eabi),
("armv7r-none-eabihf", armv7r_none_eabihf),
// `x86_64-pc-solaris` is an alias for `x86_64_sun_solaris` for backwards compatibility reasons.
// (See <https://github.com/rust-lang/rust/issues/40531>.)
("x86_64-sun-solaris", "x86_64-pc-solaris", x86_64_sun_solaris),
("x86_64-pc-solaris", x86_64_pc_solaris),
("x86_64-sun-solaris", x86_64_sun_solaris),
("sparcv9-sun-solaris", sparcv9_sun_solaris),
("x86_64-unknown-illumos", x86_64_unknown_illumos),
@ -1986,24 +1985,6 @@ impl TargetTriple {
Ok(TargetTriple::TargetPath(canonicalized_path))
}
/// Creates a target triple from its alias
pub fn from_alias(triple: String) -> Self {
macro_rules! target_aliases {
( $(($alias:literal, $target:literal ),)+ ) => {
match triple.as_str() {
$( $alias => TargetTriple::from_triple($target), )+
_ => TargetTriple::TargetTriple(triple),
}
}
}
target_aliases! {
// `x86_64-pc-solaris` is an alias for `x86_64_sun_solaris` for backwards compatibility reasons.
// (See <https://github.com/rust-lang/rust/issues/40531>.)
("x86_64-pc-solaris", "x86_64-sun-solaris"),
}
}
/// Returns a string triple for this target.
///
/// If this target is a path, the file name (without extension) is returned.