diff options
Diffstat (limited to 'compiler/rustc_target/src/spec/mod.rs')
| -rw-r--r-- | compiler/rustc_target/src/spec/mod.rs | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/compiler/rustc_target/src/spec/mod.rs b/compiler/rustc_target/src/spec/mod.rs index b53d851e051..039e9a8b274 100644 --- a/compiler/rustc_target/src/spec/mod.rs +++ b/compiler/rustc_target/src/spec/mod.rs @@ -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. |