Skip to content

Commit 8c5fcc7

Browse files
petrhosekpetrhosek
committed
Switch to normalized triples for Fuchsia
This is a revert of e950d22 which is no longer needed since Clang now does normalization and handles all triple spellings.
1 parent 18bc4be commit 8c5fcc7

File tree

10 files changed

+37
-37
lines changed

10 files changed

+37
-37
lines changed

‎compiler/rustc_target/src/spec/aarch64_fuchsia.rs renamed to ‎compiler/rustc_target/src/spec/aarch64_unknown_fuchsia.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use crate::spec::{SanitizerSet, Target, TargetOptions};
22

33
pub fn target() -> Target {
44
Target {
5-
llvm_target: "aarch64-fuchsia".to_string(),
5+
llvm_target: "aarch64-unknown-fuchsia".to_string(),
66
pointer_width: 64,
77
data_layout: "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128".to_string(),
88
arch: "aarch64".to_string(),

‎compiler/rustc_target/src/spec/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -838,8 +838,8 @@ supported_targets! {
838838
("x86_64-apple-darwin", x86_64_apple_darwin),
839839
("i686-apple-darwin", i686_apple_darwin),
840840

841-
("aarch64-fuchsia", aarch64_fuchsia),
842-
("x86_64-fuchsia", x86_64_fuchsia),
841+
("aarch64-unknown-fuchsia", aarch64_unknown_fuchsia),
842+
("x86_64-unknown-fuchsia", x86_64_unknown_fuchsia),
843843

844844
("avr-unknown-gnu-atmega328", avr_unknown_gnu_atmega328),
845845

‎compiler/rustc_target/src/spec/x86_64_fuchsia.rs renamed to ‎compiler/rustc_target/src/spec/x86_64_unknown_fuchsia.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ pub fn target() -> Target {
99
base.supported_sanitizers = SanitizerSet::ADDRESS | SanitizerSet::CFI;
1010

1111
Target {
12-
llvm_target: "x86_64-fuchsia".to_string(),
12+
llvm_target: "x86_64-unknown-fuchsia".to_string(),
1313
pointer_width: 64,
1414
data_layout: "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
1515
.to_string(),

‎src/bootstrap/native.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -835,12 +835,12 @@ fn supported_sanitizers(
835835

836836
match &*target.triple {
837837
"aarch64-apple-darwin" => darwin_libs("osx", &["asan", "lsan", "tsan"]),
838-
"aarch64-fuchsia" => common_libs("fuchsia", "aarch64", &["asan"]),
838+
"aarch64-unknown-fuchsia" => common_libs("fuchsia", "aarch64", &["asan"]),
839839
"aarch64-unknown-linux-gnu" => {
840840
common_libs("linux", "aarch64", &["asan", "lsan", "msan", "tsan", "hwasan"])
841841
}
842842
"x86_64-apple-darwin" => darwin_libs("osx", &["asan", "lsan", "tsan"]),
843-
"x86_64-fuchsia" => common_libs("fuchsia", "x86_64", &["asan"]),
843+
"x86_64-unknown-fuchsia" => common_libs("fuchsia", "x86_64", &["asan"]),
844844
"x86_64-unknown-freebsd" => common_libs("freebsd", "x86_64", &["asan", "msan", "tsan"]),
845845
"x86_64-unknown-netbsd" => {
846846
common_libs("netbsd", "x86_64", &["asan", "lsan", "msan", "tsan"])

‎src/ci/docker/host-x86_64/dist-various-2/Dockerfile

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@ RUN apt-key adv --batch --yes --keyserver keyserver.ubuntu.com --recv-keys 74DA7
3030
RUN add-apt-repository -y 'deb https://apt.dilos.org/dilos dilos2 main'
3131

3232
ENV \
33-
AR_x86_64_fuchsia=x86_64-fuchsia-ar \
34-
CC_x86_64_fuchsia=x86_64-fuchsia-clang \
35-
CXX_x86_64_fuchsia=x86_64-fuchsia-clang++ \
36-
AR_aarch64_fuchsia=aarch64-fuchsia-ar \
37-
CC_aarch64_fuchsia=aarch64-fuchsia-clang \
38-
CXX_aarch64_fuchsia=aarch64-fuchsia-clang++ \
33+
AR_x86_64_unknown_fuchsia=x86_64-unknown-fuchsia-ar \
34+
CC_x86_64_unknown_fuchsia=x86_64-unknown-fuchsia-clang \
35+
CXX_x86_64_unknown_fuchsia=x86_64-unknown-fuchsia-clang++ \
36+
AR_aarch64_unknown_fuchsia=aarch64-unknown-fuchsia-ar \
37+
CC_aarch64_unknown_fuchsia=aarch64-unknown-fuchsia-clang \
38+
CXX_aarch64_unknown_fuchsia=aarch64-unknown-fuchsia-clang++ \
3939
AR_sparcv9_sun_solaris=sparcv9-sun-solaris2.10-ar \
4040
CC_sparcv9_sun_solaris=sparcv9-sun-solaris2.10-gcc \
4141
CXX_sparcv9_sun_solaris=sparcv9-sun-solaris2.10-g++ \
@@ -87,19 +87,19 @@ RUN /tmp/freebsd-toolchain.sh i686
8787
COPY scripts/sccache.sh /scripts/
8888
RUN sh /scripts/sccache.sh
8989

90-
ENV CARGO_TARGET_X86_64_FUCHSIA_AR /usr/local/bin/llvm-ar
91-
ENV CARGO_TARGET_X86_64_FUCHSIA_RUSTFLAGS \
92-
-C link-arg=--sysroot=/usr/local/x86_64-fuchsia \
93-
-C link-arg=-L/usr/local/x86_64-fuchsia/lib \
94-
-C link-arg=-L/usr/local/lib/x86_64-fuchsia/lib
95-
ENV CARGO_TARGET_AARCH64_FUCHSIA_AR /usr/local/bin/llvm-ar
96-
ENV CARGO_TARGET_AARCH64_FUCHSIA_RUSTFLAGS \
97-
-C link-arg=--sysroot=/usr/local/aarch64-fuchsia \
98-
-C link-arg=-L/usr/local/aarch64-fuchsia/lib \
99-
-C link-arg=-L/usr/local/lib/aarch64-fuchsia/lib
90+
ENV CARGO_TARGET_X86_64_UNKNOWN_FUCHSIA_AR /usr/local/bin/llvm-ar
91+
ENV CARGO_TARGET_X86_64_UNKNOWN_FUCHSIA_RUSTFLAGS \
92+
-C link-arg=--sysroot=/usr/local/x86_64-unknown-fuchsia \
93+
-C link-arg=-L/usr/local/x86_64-unknown-fuchsia/lib \
94+
-C link-arg=-L/usr/local/lib/x86_64-unknown-fuchsia/lib
95+
ENV CARGO_TARGET_AARCH64_UNKNOWN_FUCHSIA_AR /usr/local/bin/llvm-ar
96+
ENV CARGO_TARGET_AARCH64_UNKNOWN_FUCHSIA_RUSTFLAGS \
97+
-C link-arg=--sysroot=/usr/local/aarch64-unknown-fuchsia \
98+
-C link-arg=-L/usr/local/aarch64-unknown-fuchsia/lib \
99+
-C link-arg=-L/usr/local/lib/aarch64-unknown-fuchsia/lib
100100

101-
ENV TARGETS=x86_64-fuchsia
102-
ENV TARGETS=$TARGETS,aarch64-fuchsia
101+
ENV TARGETS=x86_64-unknown-fuchsia
102+
ENV TARGETS=$TARGETS,aarch64-unknown-fuchsia
103103
ENV TARGETS=$TARGETS,wasm32-unknown-unknown
104104
ENV TARGETS=$TARGETS,wasm32-wasi
105105
ENV TARGETS=$TARGETS,sparcv9-sun-solaris

‎src/ci/docker/host-x86_64/dist-various-2/build-fuchsia-toolchain.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ build() {
2828
esac
2929

3030
hide_output make -j$(getconf _NPROCESSORS_ONLN) $tgt
31-
dst=/usr/local/${arch}-fuchsia
31+
dst=/usr/local/${arch}-unknown-fuchsia
3232
mkdir -p $dst
3333
cp -a build-${tgt}/sysroot/include $dst/
3434
cp -a build-${tgt}/sysroot/lib $dst/
@@ -44,11 +44,11 @@ rm -rf zircon
4444

4545
for arch in x86_64 aarch64; do
4646
for tool in clang clang++; do
47-
cat >/usr/local/bin/${arch}-fuchsia-${tool} <<EOF
47+
cat >/usr/local/bin/${arch}-unknown-fuchsia-${tool} <<EOF
4848
#!/bin/sh
49-
${tool} --target=${arch}-fuchsia --sysroot=/usr/local/${arch}-fuchsia "\$@"
49+
${tool} --target=${arch}-unknown-fuchsia --sysroot=/usr/local/${arch}-unknown-fuchsia "\$@"
5050
EOF
51-
chmod +x /usr/local/bin/${arch}-fuchsia-${tool}
51+
chmod +x /usr/local/bin/${arch}-unknown-fuchsia-${tool}
5252
done
53-
ln -s /usr/local/bin/llvm-ar /usr/local/bin/${arch}-fuchsia-ar
53+
ln -s /usr/local/bin/llvm-ar /usr/local/bin/${arch}-unknown-fuchsia-ar
5454
done

‎src/doc/rustc/src/platform-support.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ target | std | notes
120120
-------|:---:|-------
121121
`aarch64-apple-ios` | ✓ | ARM64 iOS
122122
[`aarch64-apple-ios-sim`](platform-support/aarch64-apple-ios-sim.md) | ✓ | Apple iOS Simulator on ARM64
123-
`aarch64-fuchsia` | ✓ | ARM64 Fuchsia
123+
`aarch64-unknown-fuchsia` | ✓ | ARM64 Fuchsia
124124
`aarch64-linux-android` | ✓ | ARM64 Android
125125
`aarch64-unknown-none-softfloat` | * | Bare ARM64, softfloat
126126
`aarch64-unknown-none` | * | Bare ARM64, hardfloat
@@ -171,7 +171,7 @@ target | std | notes
171171
`wasm32-wasi` | ✓ | WebAssembly with WASI
172172
`x86_64-apple-ios` | ✓ | 64-bit x86 iOS
173173
`x86_64-fortanix-unknown-sgx` | ✓ | [Fortanix ABI] for 64-bit Intel SGX
174-
`x86_64-fuchsia` | ✓ | 64-bit Fuchsia
174+
`x86_64-unknown-fuchsia` | ✓ | 64-bit Fuchsia
175175
`x86_64-linux-android` | ✓ | 64-bit x86 Android
176176
`x86_64-pc-solaris` | ✓ | 64-bit Solaris 10/11, illumos
177177
`x86_64-unknown-linux-gnux32` | ✓ | 64-bit Linux (x32 ABI) (kernel 4.15, glibc 2.27)

‎src/doc/unstable-book/src/compiler-flags/sanitizer.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@ with runtime flag `ASAN_OPTIONS=detect_leaks=1` on macOS.
4040
AddressSanitizer is supported on the following targets:
4141

4242
* `aarch64-apple-darwin`
43-
* `aarch64-fuchsia`
43+
* `aarch64-unknown-fuchsia`
4444
* `aarch64-unknown-linux-gnu`
4545
* `x86_64-apple-darwin`
46-
* `x86_64-fuchsia`
46+
* `x86_64-unknown-fuchsia`
4747
* `x86_64-unknown-freebsd`
4848
* `x86_64-unknown-linux-gnu`
4949

‎src/tools/build-manifest/src/main.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ static TARGETS: &[&str] = &[
5555
"aarch64-apple-darwin",
5656
"aarch64-apple-ios",
5757
"aarch64-apple-ios-sim",
58-
"aarch64-fuchsia",
58+
"aarch64-unknown-fuchsia",
5959
"aarch64-linux-android",
6060
"aarch64-pc-windows-msvc",
6161
"aarch64-unknown-hermit",
@@ -139,7 +139,7 @@ static TARGETS: &[&str] = &[
139139
"x86_64-apple-darwin",
140140
"x86_64-apple-ios",
141141
"x86_64-fortanix-unknown-sgx",
142-
"x86_64-fuchsia",
142+
"x86_64-unknown-fuchsia",
143143
"x86_64-linux-android",
144144
"x86_64-pc-windows-gnu",
145145
"x86_64-pc-windows-msvc",

‎src/tools/compiletest/src/util.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,10 @@ const ARCH_TABLE: &[(&str, &str)] = &[
8787

8888
pub const ASAN_SUPPORTED_TARGETS: &[&str] = &[
8989
"aarch64-apple-darwin",
90-
"aarch64-fuchsia",
90+
"aarch64-unknown-fuchsia",
9191
"aarch64-unknown-linux-gnu",
9292
"x86_64-apple-darwin",
93-
"x86_64-fuchsia",
93+
"x86_64-unknown-fuchsia",
9494
"x86_64-unknown-freebsd",
9595
"x86_64-unknown-linux-gnu",
9696
];

0 commit comments

Comments
 (0)