Skip to content

Commit e950d22

Browse files
committed
Omit the vendor component in Fuchsia triple
Previously, using unknown as the vendor value would lead to the same result, but with the multiarch runtimes support in Clang, the target is now used to locate the runtime libraries and so the format is important. The denormalized format with omitted vendor component is the format we use with Clang and should be using for Rust as well.
1 parent fefe816 commit e950d22

File tree

7 files changed

+22
-22
lines changed

7 files changed

+22
-22
lines changed

src/ci/docker/dist-various-2/Dockerfile

+8-8
Original file line numberDiff line numberDiff line change
@@ -34,21 +34,21 @@ COPY scripts/sccache.sh /scripts/
3434
RUN sh /scripts/sccache.sh
3535

3636
ENV \
37-
AR_x86_64_unknown_fuchsia=x86_64-unknown-fuchsia-ar \
38-
CC_x86_64_unknown_fuchsia=x86_64-unknown-fuchsia-clang \
39-
CXX_x86_64_unknown_fuchsia=x86_64-unknown-fuchsia-clang++ \
40-
AR_aarch64_unknown_fuchsia=aarch64-unknown-fuchsia-ar \
41-
CC_aarch64_unknown_fuchsia=aarch64-unknown-fuchsia-clang \
42-
CXX_aarch64_unknown_fuchsia=aarch64-unknown-fuchsia-clang++ \
37+
AR_x86_64_fuchsia=x86_64-fuchsia-ar \
38+
CC_x86_64_fuchsia=x86_64-fuchsia-clang \
39+
CXX_x86_64_fuchsia=x86_64-fuchsia-clang++ \
40+
AR_aarch64_fuchsia=aarch64-fuchsia-ar \
41+
CC_aarch64_fuchsia=aarch64-fuchsia-clang \
42+
CXX_aarch64_fuchsia=aarch64-fuchsia-clang++ \
4343
AR_sparcv9_sun_solaris=sparcv9-sun-solaris2.10-ar \
4444
CC_sparcv9_sun_solaris=sparcv9-sun-solaris2.10-gcc \
4545
CXX_sparcv9_sun_solaris=sparcv9-sun-solaris2.10-g++ \
4646
AR_x86_64_sun_solaris=x86_64-sun-solaris2.10-ar \
4747
CC_x86_64_sun_solaris=x86_64-sun-solaris2.10-gcc \
4848
CXX_x86_64_sun_solaris=x86_64-sun-solaris2.10-g++
4949

50-
ENV TARGETS=x86_64-unknown-fuchsia
51-
ENV TARGETS=$TARGETS,aarch64-unknown-fuchsia
50+
ENV TARGETS=x86_64-fuchsia
51+
ENV TARGETS=$TARGETS,aarch64-fuchsia
5252
ENV TARGETS=$TARGETS,sparcv9-sun-solaris
5353
ENV TARGETS=$TARGETS,wasm32-unknown-unknown
5454
ENV TARGETS=$TARGETS,x86_64-sun-solaris

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ build() {
3939
esac
4040

4141
hide_output make -j$(getconf _NPROCESSORS_ONLN) $tgt
42-
dst=/usr/local/${arch}-unknown-fuchsia
42+
dst=/usr/local/${arch}-fuchsia
4343
mkdir -p $dst
4444
cp -a build-${tgt}/sysroot/include $dst/
4545
cp -a build-${tgt}/sysroot/lib $dst/
@@ -55,11 +55,11 @@ rm -rf zircon
5555

5656
for arch in x86_64 aarch64; do
5757
for tool in clang clang++; do
58-
cat >/usr/local/bin/${arch}-unknown-fuchsia-${tool} <<EOF
58+
cat >/usr/local/bin/${arch}-fuchsia-${tool} <<EOF
5959
#!/bin/sh
60-
${tool} --target=${arch}-unknown-fuchsia --sysroot=/usr/local/${arch}-unknown-fuchsia "\$@"
60+
${tool} --target=${arch}-fuchsia --sysroot=/usr/local/${arch}-fuchsia "\$@"
6161
EOF
62-
chmod +x /usr/local/bin/${arch}-unknown-fuchsia-${tool}
62+
chmod +x /usr/local/bin/${arch}-fuchsia-${tool}
6363
done
64-
ln -s /usr/local/bin/llvm-ar /usr/local/bin/${arch}-unknown-fuchsia-ar
64+
ln -s /usr/local/bin/llvm-ar /usr/local/bin/${arch}-fuchsia-ar
6565
done

src/librustc_target/spec/aarch64_unknown_fuchsia.rs renamed to src/librustc_target/spec/aarch64_fuchsia.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@ pub fn target() -> TargetResult {
1515
base.max_atomic_width = Some(128);
1616

1717
Ok(Target {
18-
llvm_target: "aarch64-unknown-fuchsia".to_string(),
18+
llvm_target: "aarch64-fuchsia".to_string(),
1919
target_endian: "little".to_string(),
2020
target_pointer_width: "64".to_string(),
2121
target_c_int_width: "32".to_string(),
2222
data_layout: "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128".to_string(),
2323
arch: "aarch64".to_string(),
2424
target_os: "fuchsia".to_string(),
2525
target_env: "".to_string(),
26-
target_vendor: "unknown".to_string(),
26+
target_vendor: "".to_string(),
2727
linker_flavor: LinkerFlavor::Gcc,
2828
options: TargetOptions {
2929
abi_blacklist: super::arm_base::abi_blacklist(),

src/librustc_target/spec/fuchsia_base.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ pub fn opts() -> TargetOptions {
3333
executables: true,
3434
target_family: Some("unix".to_string()),
3535
linker_is_gnu: true,
36-
has_rpath: true,
36+
has_rpath: false,
3737
pre_link_args: args,
3838
position_independent_executables: true,
3939
has_elf_tls: true,

src/librustc_target/spec/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -332,8 +332,8 @@ supported_targets! {
332332
("x86_64-apple-darwin", x86_64_apple_darwin),
333333
("i686-apple-darwin", i686_apple_darwin),
334334

335-
("aarch64-unknown-fuchsia", aarch64_unknown_fuchsia),
336-
("x86_64-unknown-fuchsia", x86_64_unknown_fuchsia),
335+
("aarch64-fuchsia", aarch64_fuchsia),
336+
("x86_64-fuchsia", x86_64_fuchsia),
337337

338338
("x86_64-unknown-l4re-uclibc", x86_64_unknown_l4re_uclibc),
339339

src/librustc_target/spec/x86_64_unknown_fuchsia.rs renamed to src/librustc_target/spec/x86_64_fuchsia.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ pub fn target() -> TargetResult {
1818
base.stack_probes = true;
1919

2020
Ok(Target {
21-
llvm_target: "x86_64-unknown-fuchsia".to_string(),
21+
llvm_target: "x86_64-fuchsia".to_string(),
2222
target_endian: "little".to_string(),
2323
target_pointer_width: "64".to_string(),
2424
target_c_int_width: "32".to_string(),
2525
data_layout: "e-m:e-i64:64-f80:128-n8:16:32:64-S128".to_string(),
2626
arch: "x86_64".to_string(),
2727
target_os: "fuchsia".to_string(),
2828
target_env: "".to_string(),
29-
target_vendor: "unknown".to_string(),
29+
target_vendor: "".to_string(),
3030
linker_flavor: LinkerFlavor::Gcc,
3131
options: base,
3232
})

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ static HOSTS: &'static [&'static str] = &[
4646

4747
static TARGETS: &'static [&'static str] = &[
4848
"aarch64-apple-ios",
49+
"aarch64-fuchsia",
4950
"aarch64-linux-android",
5051
"aarch64-unknown-cloudabi",
51-
"aarch64-unknown-fuchsia",
5252
"aarch64-unknown-linux-gnu",
5353
"aarch64-unknown-linux-musl",
5454
"arm-linux-androideabi",
@@ -101,14 +101,14 @@ static TARGETS: &'static [&'static str] = &[
101101
"wasm32-unknown-unknown",
102102
"x86_64-apple-darwin",
103103
"x86_64-apple-ios",
104+
"x86_64-fuchsia",
104105
"x86_64-linux-android",
105106
"x86_64-pc-windows-gnu",
106107
"x86_64-pc-windows-msvc",
107108
"x86_64-rumprun-netbsd",
108109
"x86_64-sun-solaris",
109110
"x86_64-unknown-cloudabi",
110111
"x86_64-unknown-freebsd",
111-
"x86_64-unknown-fuchsia",
112112
"x86_64-unknown-linux-gnu",
113113
"x86_64-unknown-linux-gnux32",
114114
"x86_64-unknown-linux-musl",

0 commit comments

Comments
 (0)