Skip to content

Commit fa8878b

Browse files
authored
Rollup merge of #118091 - psumbera:solaris-target, r=compiler-errors
Remove now deprecated target x86_64-sun-solaris.
2 parents 61e06fe + 8a77060 commit fa8878b

File tree

6 files changed

+3
-32
lines changed

6 files changed

+3
-32
lines changed

compiler/rustc_target/src/spec/mod.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1587,7 +1587,6 @@ supported_targets! {
15871587
("armv7r-none-eabihf", armv7r_none_eabihf),
15881588

15891589
("x86_64-pc-solaris", x86_64_pc_solaris),
1590-
("x86_64-sun-solaris", x86_64_sun_solaris),
15911590
("sparcv9-sun-solaris", sparcv9_sun_solaris),
15921591

15931592
("x86_64-unknown-illumos", x86_64_unknown_illumos),

compiler/rustc_target/src/spec/targets/x86_64_sun_solaris.rs

-20
This file was deleted.

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

-6
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,6 @@ ENV \
4848
AR_x86_64_pc_solaris=x86_64-pc-solaris2.10-ar \
4949
CC_x86_64_pc_solaris=x86_64-pc-solaris2.10-gcc \
5050
CXX_x86_64_pc_solaris=x86_64-pc-solaris2.10-g++ \
51-
AR_x86_64_sun_solaris=x86_64-sun-solaris2.10-ar \
52-
CC_x86_64_sun_solaris=x86_64-sun-solaris2.10-gcc \
53-
CXX_x86_64_sun_solaris=x86_64-sun-solaris2.10-g++ \
5451
CC_armv7_unknown_linux_gnueabi=arm-linux-gnueabi-gcc-9 \
5552
CXX_armv7_unknown_linux_gnueabi=arm-linux-gnueabi-g++-9 \
5653
AR_x86_64_fortanix_unknown_sgx=ar \
@@ -84,8 +81,6 @@ COPY host-x86_64/dist-various-2/build-fuchsia-toolchain.sh /tmp/
8481
RUN /tmp/build-fuchsia-toolchain.sh
8582
COPY host-x86_64/dist-various-2/build-solaris-toolchain.sh /tmp/
8683
RUN /tmp/build-solaris-toolchain.sh x86_64 amd64 solaris-i386 pc
87-
# Build deprecated target 'x86_64-sun-solaris2.10' until removed
88-
RUN /tmp/build-solaris-toolchain.sh x86_64 amd64 solaris-i386 sun
8984
RUN /tmp/build-solaris-toolchain.sh sparcv9 sparcv9 solaris-sparc sun
9085
COPY host-x86_64/dist-various-2/build-x86_64-fortanix-unknown-sgx-toolchain.sh /tmp/
9186
RUN /tmp/build-x86_64-fortanix-unknown-sgx-toolchain.sh
@@ -120,7 +115,6 @@ ENV TARGETS=$TARGETS,wasm32-wasi
120115
ENV TARGETS=$TARGETS,wasm32-wasi-preview1-threads
121116
ENV TARGETS=$TARGETS,sparcv9-sun-solaris
122117
ENV TARGETS=$TARGETS,x86_64-pc-solaris
123-
ENV TARGETS=$TARGETS,x86_64-sun-solaris
124118
ENV TARGETS=$TARGETS,x86_64-unknown-linux-gnux32
125119
ENV TARGETS=$TARGETS,x86_64-fortanix-unknown-sgx
126120
ENV TARGETS=$TARGETS,nvptx64-nvidia-cuda

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

+2-3
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ target | std | notes
165165
`riscv64gc-unknown-none-elf` | * | Bare RISC-V (RV64IMAFDC ISA)
166166
`riscv64imac-unknown-none-elf` | * | Bare RISC-V (RV64IMAC ISA)
167167
`sparc64-unknown-linux-gnu` | ✓ | SPARC Linux (kernel 4.4, glibc 2.23)
168-
`sparcv9-sun-solaris` | ✓ | SPARC Solaris 10/11, illumos
168+
`sparcv9-sun-solaris` | ✓ | SPARC Solaris 11, illumos
169169
`thumbv6m-none-eabi` | * | Bare ARMv6-M
170170
`thumbv7em-none-eabi` | * | Bare ARMv7E-M
171171
`thumbv7em-none-eabihf` | * | Bare ARMV7E-M, hardfloat
@@ -184,7 +184,7 @@ target | std | notes
184184
`x86_64-fuchsia` | ✓ | Alias for `x86_64-unknown-fuchsia`
185185
[`x86_64-unknown-fuchsia`](platform-support/fuchsia.md) | ✓ | 64-bit x86 Fuchsia
186186
[`x86_64-linux-android`](platform-support/android.md) | ✓ | 64-bit x86 Android
187-
`x86_64-pc-solaris` | ✓ | 64-bit Solaris 10/11, illumos
187+
`x86_64-pc-solaris` | ✓ | 64-bit Solaris 11, illumos
188188
`x86_64-unknown-linux-gnux32` | ✓ | 64-bit Linux (x32 ABI) (kernel 4.15, glibc 2.27)
189189
[`x86_64-unknown-none`](platform-support/x86_64-unknown-none.md) | * | Freestanding/bare-metal x86_64, softfloat
190190
`x86_64-unknown-redox` | ✓ | Redox OS
@@ -342,7 +342,6 @@ target | std | host | notes
342342
[`x86_64-pc-nto-qnx710`](platform-support/nto-qnx.md) | ✓ | | x86 64-bit QNX Neutrino 7.1 RTOS |
343343
[`x86_64-pc-windows-gnullvm`](platform-support/pc-windows-gnullvm.md) | ✓ | ✓ |
344344
`x86_64-pc-windows-msvc` | * | | 64-bit Windows XP support
345-
`x86_64-sun-solaris` | ? | | Deprecated target for 64-bit Solaris 10/11, illumos
346345
[`x86_64-unikraft-linux-musl`](platform-support/unikraft-linux-musl.md) | ✓ | | 64-bit Unikraft with musl
347346
`x86_64-unknown-dragonfly` | ✓ | ✓ | 64-bit DragonFlyBSD
348347
`x86_64-unknown-haiku` | ✓ | ✓ | 64-bit Haiku

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

-1
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,6 @@ static TARGETS: &[&str] = &[
151151
"x86_64-linux-android",
152152
"x86_64-pc-windows-gnu",
153153
"x86_64-pc-windows-msvc",
154-
"x86_64-sun-solaris",
155154
"x86_64-pc-solaris",
156155
"x86_64-unikraft-linux-musl",
157156
"x86_64-unknown-freebsd",

tests/assembly/stack-protector/stack-protector-target-support.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@
161161
// [r77] needs-llvm-components: x86
162162
// [r78] compile-flags:--target x86_64-linux-android
163163
// [r78] needs-llvm-components: x86
164-
// [r79] compile-flags:--target x86_64-sun-solaris
164+
// [r79] compile-flags:--target x86_64-pc-solaris
165165
// [r79] needs-llvm-components: x86
166166
// [r80] compile-flags:--target x86_64-unknown-freebsd
167167
// [r80] needs-llvm-components: x86

0 commit comments

Comments
 (0)