about summary refs log tree commit diff
path: root/compiler/rustc_target
diff options
context:
space:
mode:
authorDavid Koloski <dkoloski@google.com>2023-01-03 15:59:21 -0500
committerDavid Koloski <dkoloski@google.com>2023-01-05 09:34:22 -0500
commitf6ef0397756b39d16ee0b97c4ffcb3185ca2a9ec (patch)
tree25028425a788eda2abeb0b948983599706040b38 /compiler/rustc_target
parente94fab69d020d75517cb55fafacb2d270ad6e0ac (diff)
downloadrust-f6ef0397756b39d16ee0b97c4ffcb3185ca2a9ec.tar.gz
rust-f6ef0397756b39d16ee0b97c4ffcb3185ca2a9ec.zip
Add vendor to Fuchsia's target triple
Historically, Rust's Fuchsia targets have been labeled x86_64-fuchsia
and aarch64-fuchsia. However, they should technically contain vendor
information. This CL changes Fuchsia's target triples to include the
"unknown" vendor since Clang now does normalization and handles all
triple spellings.

This was previously attempted in #90510, which was closed due to
inactivity.
Diffstat (limited to 'compiler/rustc_target')
-rw-r--r--compiler/rustc_target/src/spec/aarch64_unknown_fuchsia.rs (renamed from compiler/rustc_target/src/spec/aarch64_fuchsia.rs)2
-rw-r--r--compiler/rustc_target/src/spec/mod.rs4
-rw-r--r--compiler/rustc_target/src/spec/x86_64_unknown_fuchsia.rs (renamed from compiler/rustc_target/src/spec/x86_64_fuchsia.rs)2
3 files changed, 4 insertions, 4 deletions
diff --git a/compiler/rustc_target/src/spec/aarch64_fuchsia.rs b/compiler/rustc_target/src/spec/aarch64_unknown_fuchsia.rs
index 4634433c4a9..da493f0c260 100644
--- a/compiler/rustc_target/src/spec/aarch64_fuchsia.rs
+++ b/compiler/rustc_target/src/spec/aarch64_unknown_fuchsia.rs
@@ -2,7 +2,7 @@ use crate::spec::{SanitizerSet, Target, TargetOptions};
 
 pub fn target() -> Target {
     Target {
-        llvm_target: "aarch64-fuchsia".into(),
+        llvm_target: "aarch64-unknown-fuchsia".into(),
         pointer_width: 64,
         data_layout: "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128".into(),
         arch: "aarch64".into(),
diff --git a/compiler/rustc_target/src/spec/mod.rs b/compiler/rustc_target/src/spec/mod.rs
index b7ec1612e8e..dd56037a272 100644
--- a/compiler/rustc_target/src/spec/mod.rs
+++ b/compiler/rustc_target/src/spec/mod.rs
@@ -1109,8 +1109,8 @@ supported_targets! {
     ("x86_64-apple-darwin", x86_64_apple_darwin),
     ("i686-apple-darwin", i686_apple_darwin),
 
-    ("aarch64-fuchsia", aarch64_fuchsia),
-    ("x86_64-fuchsia", x86_64_fuchsia),
+    ("aarch64-unknown-fuchsia", aarch64_unknown_fuchsia),
+    ("x86_64-unknown-fuchsia", x86_64_unknown_fuchsia),
 
     ("avr-unknown-gnu-atmega328", avr_unknown_gnu_atmega328),
 
diff --git a/compiler/rustc_target/src/spec/x86_64_fuchsia.rs b/compiler/rustc_target/src/spec/x86_64_unknown_fuchsia.rs
index 532dd6d0742..a3231d19f4c 100644
--- a/compiler/rustc_target/src/spec/x86_64_fuchsia.rs
+++ b/compiler/rustc_target/src/spec/x86_64_unknown_fuchsia.rs
@@ -8,7 +8,7 @@ pub fn target() -> Target {
     base.supported_sanitizers = SanitizerSet::ADDRESS | SanitizerSet::CFI;
 
     Target {
-        llvm_target: "x86_64-fuchsia".into(),
+        llvm_target: "x86_64-unknown-fuchsia".into(),
         pointer_width: 64,
         data_layout: "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
             .into(),